Skip to content

Commit

Permalink
Merge pull request #382 from cbdr/rails-5
Browse files Browse the repository at this point in the history
Rails 5 and Gemfile upgrade
  • Loading branch information
Alex Tharp authored Nov 11, 2016
2 parents 2c134b6 + 9e3dd88 commit 8487bcc
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 137 deletions.
36 changes: 18 additions & 18 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ ruby '2.3.1'
gem 'bower-rails', '~> 0.11.0'

# Server
gem 'unicorn', '~> 5.1.0'
gem 'unicorn', '~> 5.2.0'

# Rails
gem 'rails', '~> 4.2.7'
gem 'rails', '~> 5.0.0'

# Cortex-specific
gem 'cortex-exceptions', '~> 0.0.4'
Expand All @@ -18,7 +18,7 @@ gem 'cortex-plugins-demo', git: 'git://github.com/cortex-cms/cortex-plugins-demo
# API
gem 'grape', '~> 0.17'
gem 'grape-entity', '~> 0.5.1'
gem 'grape-swagger', '~> 0.24.0'
gem 'grape-swagger', '~> 0.25.0'

# Authorization
gem 'six', '~> 0.2.0'
Expand All @@ -29,7 +29,7 @@ gem 'rolify', '~> 5.1'
gem 'pundit', '~> 1.1'

# Data
gem 'rails-observers', '~> 0.1.2'
gem 'rails-observers', git: 'git://github.com/rails/rails-observers'
gem 'awesome_nested_set', '~> 3.1'
gem 'paperclip', '~> 5.1.0'
gem 'paperclip-optimizer', '~> 2.0'
Expand All @@ -39,42 +39,42 @@ gem 'bcrypt', '~> 3.1.11'
gem 'grape-kaminari', git: 'git://github.com/toastercup/grape-kaminari', branch: 'set-only-pagination-headers'
gem 'elasticsearch-model', '~> 0.1'
gem 'elasticsearch-rails', '~> 0.1'
gem 'paranoia', '~> 2.1'
gem 'paranoia', '~> 2.2'
gem 'pg', '~> 0.19.0'
gem 'hashie-forbidden_attributes', '~> 0.1.1'
gem 'redis-rails', '~> 5.0'
gem 'pomona', '~> 0.7'
gem "transitions", '~> 1.2', :require => ["transitions", "active_model/transitions"]
gem 'transitions', '~> 1.2', :require => ['transitions', 'active_model/transitions']

# Middleware
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'

# Utility
gem 'excon', '~> 0.52.0'
gem 'excon', '~> 0.54.0'
gem 'hashie', '~> 3.4.6'
gem 'hashr', '~> 2.0.0'
gem 'mime-types', '~> 3.1.0'
gem 'interactor-rails', '~> 2.0'
gem 'virtus', '~> 1.0.5'
gem 'rubyzip', '~> 1.2.0'
gem 'addressable', '~> 2.4.0'
gem 'addressable', '~> 2.5.0'
gem 'json'

# External Services
gem 'yt', '~> 0.25.40'
gem 'yt', '~> 0.28.1'
gem 'aws-sdk', '~> 2.6' # Used by Paperclip

# Jobs
gem 'sidekiq', '~> 4.2.1'
gem 'sidekiq', '~> 4.2.5'
gem 'sidekiq-failures', '~> 0.4.5'
gem 'sinatra', '~> 1.4.7', require: false
gem 'sinatra', '~> 2.0.0.beta', require: false

# Pipeline
gem 'sprockets-rails', '3.2.0', :require => 'sprockets/railtie'
gem 'sprockets', '3.7.0'
gem 'angular-rails-templates', '~> 1.0.2'
gem 'ngannotate-rails', '~> 1.2.2'
gem 'uglifier', '~> 3.0.2'
gem 'uglifier', '~> 3.0.3'

# View
gem 'haml', '~> 4.1.0.beta'
Expand All @@ -88,7 +88,7 @@ gem 'bootstrap-tagsinput-rails', '~> 0.4.2'
# Style
gem 'sass-rails', '~> 5.0'
gem 'bourbon', '~> 5.0.0.beta'
gem 'font-awesome-sass', '~> 4.6.2'
gem 'font-awesome-sass', '~> 4.7.0'
gem 'material_design_lite-sass', '~> 1.2.1'

# JavaScript
Expand All @@ -105,10 +105,10 @@ end

group :test, :development do
# Environment
gem 'dotenv', '~> 2.1.1'
gem 'dotenv'

# Cache/Sidekiq
gem 'redis-namespace', '~> 1.5'
gem 'redis-namespace'

# Debug
gem 'byebug'
Expand All @@ -121,7 +121,7 @@ group :test, :development do
gem 'pry-stack_explorer'

# Documentation
gem "rails-erd"
gem 'rails-erd'
end

group :test do
Expand All @@ -140,7 +140,7 @@ group :test do
gem 'guard-rspec', '~> 4.7'

# Mocking/Faking
gem 'mocha', '~> 1.1', require: false
gem 'mocha', '~> 1.2', require: false
gem 'database_cleaner', '~> 1.5'
gem 'timecop', '~> 0.8'
gem 'email_spec'
Expand All @@ -164,5 +164,5 @@ end

group :staging, :production do
# Monitoring
gem 'newrelic_rpm', '~> 3.16'
gem 'newrelic_rpm', '~> 3.17'
end
Loading

0 comments on commit 8487bcc

Please sign in to comment.