Skip to content

Commit

Permalink
upgrade rails from 4.0.13 to 4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
branch14 committed Mar 18, 2015
1 parent 8ef479f commit 3f8cd88
Show file tree
Hide file tree
Showing 24 changed files with 335 additions and 199 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.3-p448
2.1.2
26 changes: 13 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
source 'https://rubygems.org'

gem 'rails', '4.0.13'
gem 'rails', '4.2.0'
gem 'pg'
gem 'sass-rails', '~> 4.0.2'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'haml-rails'
gem 'therubyracer', platforms: :ruby
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'turbolinks'
gem 'jbuilder', '~> 1.2'
gem 'delayed_job'
gem 'delayed_job_active_record'
gem 'jbuilder', '~> 2.0'
gem 'delayed_job', '~> 4.0.6'
gem 'delayed_job_active_record', '~> 4.0.3'
gem "highcharts-rails", "~> 3.0.0"
gem 'd3_rails'
# remember to update app/assets/javascripts/private_pub.js when
# updating private_pub gem!
# see https://github.com/munen/voicerepublic_backoffice/commit/ca0b016e01481bd500
gem 'private_pub'
gem 'devise'

group :doc do
gem 'sdoc', require: false
end
gem 'sdoc', '~> 0.4.0', group: :doc

# gem 'bcrypt', '~> 3.1.7'

gem 'unicorn'
gem 'activeadmin', github: 'gregbell/active_admin'
gem 'activeadmin', github: 'activeadmin/activeadmin'
gem 'airbrake'
gem 'rails_config'
gem 'activeadmin-dragonfly', github: 'stefanoverna/activeadmin-dragonfly'
Expand All @@ -42,8 +41,9 @@ group :development do
end

group :development, :test do
gem 'zeus'
gem 'spring'
gem 'web-console', '~> 2.0'
gem 'pry-rails'
gem 'debugger'
gem 'disable_assets_logger'
gem 'byebug'
#gem 'disable_assets_logger'
end
Loading

0 comments on commit 3f8cd88

Please sign in to comment.