upgrade ruby and rails

rhdez · Mar 3, 2016 · 7b652a7 · 7b652a7
1 parent d769bc2
commit 7b652a7
Show file tree

Hide file tree

Showing 2 changed files with 126 additions and 316 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,14 +2,11 @@ source 'https://rubygems.org'
 
 ruby '2.3.0'
 
-gem 'rails', '3.2.22.2'
-
-gem 'activeadmin', github: 'activeadmin'
+gem 'activeadmin', '1.0.0.pre2'
 gem 'delayed_job_active_record', '~> 4.0.3'
 gem 'devise'
-gem 'inherited_resources', github: 'josevalim/inherited_resources', branch: 'rails-4-2'
 gem 'pg'
-gem 'rails', '4.2.0'
+gem 'rails', '4.2.5.2'
 gem 'unicorn'
 
 
@@ -29,10 +26,6 @@ group :development, :test do
   gem "dotenv-rails"
 end
 
-gem 'delayed_job_active_record'
-
-gem 'unicorn'
-
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'