Skip to content

Commit

Permalink
#59 Upgrade to Rails 4.2
Browse files Browse the repository at this point in the history 
 - Updated Gemfile with latest versions of Rails, activeadmin and
   devise required for Rails 4.2 compatibility.
 - In the process db/schema.rb also got updated.
 - Ran the rake rails:update task and updated all the configuration files.
 - Added web console gem in development mode for debugging.
 - Verified steps of upgrading guide from 4.1 to 4.2.
  • Loading branch information
@prathamesh-sonpatki
prathamesh-sonpatki committed Mar 6, 2015
1 parent 8e4c106 commit 45ab66b
Show file tree
Hide file tree
Showing 12 changed files with 178 additions and 106 deletions.
12 changes: 8 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ source 'https://rubygems.org'

ruby '2.2.0'

gem 'rails', '4.1.8'
gem 'rails', '4.2.0'

gem 'arel'
gem 'jquery-rails'
gem 'sprockets-rails', '~> 2.0'
gem 'sprockets-rails', '3.0.0.beta1'
gem 'sass-rails', github: 'rails/sass-rails'
gem 'uglifier', '>= 1.0.3'

Expand All @@ -19,7 +20,7 @@ gem 'sprockets-strict-mode'
gem 'jbuilder', '~> 1.2'

# for authentication
gem 'devise', '3.2.3'
gem 'devise', '3.4.1'

# for sending devise emails in background
gem 'devise-async'
Expand All @@ -43,7 +44,7 @@ gem 'twitter-bootstrap-rails'
gem 'simple_form'

# admin framework
gem 'activeadmin', github: 'gregbell/active_admin'
gem 'activeadmin', github: 'activeadmin'

# for handling file uploads
gem 'carrierwave'
Expand Down Expand Up @@ -78,6 +79,9 @@ group :development do

# speeds up development by keeping your application running in the background
gem 'spring'

# web console
gem 'web-console', '~> 2.0'
end

group :test do
Expand Down
178 changes: 106 additions & 72 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
GIT
remote: git://github.com/gregbell/active_admin.git
revision: 633c1a4f1f7f15759de77691376bea783405118b
remote: git://github.com/activeadmin/activeadmin.git
revision: 60914c887942cb34d737428fb9813f69bb8ae3ee
specs:
activeadmin (1.0.0.pre)
arbre (~> 1.0, >= 1.0.2)
bourbon
coffee-rails
formtastic (~> 3.1)
formtastic_i18n
inherited_resources (~> 1.4, != 1.5.0)
inherited_resources (~> 1.6)
jquery-rails
jquery-ui-rails (~> 5.0)
kaminari (~> 0.15)
rails (>= 3.2, < 4.2)
rails (>= 3.2, < 5.0)
ransack (~> 1.3)
sass-rails

GIT
remote: git://github.com/rails/sass-rails.git
revision: af012d9e7e5283b068cd99a3b549587303762898
revision: f305f0299daa7c08d86f51d5e8ee0474375bbb87
specs:
sass-rails (5.0.0)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
Expand All @@ -30,41 +30,50 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
actionmailer (4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8)
actionview (= 4.1.8)
activesupport (= 4.1.8)
rack (~> 1.5.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0)
actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2)
actionview (4.1.8)
activesupport (= 4.1.8)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.8)
activesupport (= 4.1.8)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0)
activesupport (= 4.2.0)
globalid (>= 0.3.0)
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
activerecord (4.1.8)
activemodel (= 4.1.8)
activesupport (= 4.1.8)
arel (~> 5.0.0)
activesupport (4.1.8)
i18n (~> 0.6, >= 0.6.9)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
ansi (1.4.3)
arbre (1.0.2)
arbre (1.0.3)
activesupport (>= 3.0.0)
arel (5.0.1.20140414130214)
bcrypt (3.1.9)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
bourbon (4.0.2)
sass (~> 3.3)
arel (6.0.0)
bcrypt (3.1.10)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bourbon (4.2.1)
sass (~> 3.4)
thor
browser (0.8.0)
builder (3.2.2)
Expand All @@ -79,8 +88,9 @@ GEM
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
coffee-script-source (1.9.1)
daemons (1.1.9)
debug_inspector (0.0.2)
delayed_job (4.0.6)
activesupport (>= 3.0, < 5.0)
delayed_job_active_record (4.0.3)
Expand All @@ -90,10 +100,11 @@ GEM
activerecord (> 3.0.0)
delayed_job (> 2.0.3)
sinatra (>= 1.4.4)
devise (3.2.3)
bcrypt-ruby (~> 3.0)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-async (0.9.0)
Expand All @@ -103,10 +114,12 @@ GEM
activemodel
erubis (2.7.0)
eventmachine (1.0.4)
execjs (2.2.2)
formtastic (3.1.2)
execjs (2.4.0)
formtastic (3.1.3)
actionpack (>= 3.2.13)
formtastic_i18n (0.1.1)
globalid (0.3.3)
activesupport (>= 4.1.0)
haml (4.1.0.beta.1)
tilt
haml-rails (0.6.0)
Expand All @@ -117,7 +130,7 @@ GEM
railties (>= 4.0.1)
handy (0.0.28)
hashr
has_scope (0.6.0.rc)
has_scope (0.6.0)
actionpack (>= 3.2, < 5)
activesupport (>= 3.2, < 5)
hashr (0.0.22)
Expand All @@ -131,81 +144,96 @@ GEM
hpricot (~> 0.8.6)
ruby_parser (~> 3.1.1)
i18n (0.7.0)
inherited_resources (1.5.1)
actionpack (>= 3.2, < 4.2)
inherited_resources (1.6.0)
actionpack (>= 3.2, < 5)
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 4.2)
responders (~> 1.0)
railties (>= 3.2, < 5)
responders
jbuilder (1.5.3)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
jquery-rails (4.0.3)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.3)
railties (>= 3.2.16)
json (1.8.1)
kaminari (0.16.1)
json (1.8.2)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.2)
loofah (2.0.1)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail_interceptor (0.0.3)
activesupport
mime-types (2.4.3)
minitest (5.5.0)
mini_portile (0.6.2)
minitest (5.5.1)
minitest-reporters (1.0.8)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.10.1)
multi_json (1.11.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
orm_adapter (0.5.0)
pg (0.17.1)
polyamorous (1.1.0)
activerecord (>= 3.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.5.2)
rack (1.6.0)
rack-protection (1.5.3)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.8)
actionmailer (= 4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
activemodel (= 4.1.8)
activerecord (= 4.1.8)
activesupport (= 4.1.8)
rails (4.2.0)
actionmailer (= 4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
activemodel (= 4.2.0)
activerecord (= 4.2.0)
activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8)
sprockets-rails (~> 2.0)
railties (= 4.2.0)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.5)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.3)
rails_stdout_logging (0.0.3)
railties (4.1.8)
actionpack (= 4.1.8)
activesupport (= 4.1.8)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.4.2)
ransack (1.5.1)
ransack (1.6.3)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.1)
responders (1.1.2)
railties (>= 3.2, < 4.2)
responders (2.1.0)
railties (>= 4.2.0, < 5)
ruby-progressbar (1.7.1)
ruby_parser (3.1.3)
sexp_processor (~> 4.1)
sass (3.4.9)
sass (3.4.13)
sexp_processor (4.4.4)
simple_form (3.1.0)
actionpack (~> 4.0)
Expand All @@ -225,10 +253,10 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets-rails (3.0.0.beta1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (~> 2.8)
sprockets-strict-mode (1.0)
sprockets
thin (1.6.3)
Expand All @@ -254,6 +282,11 @@ GEM
raindrops (~> 0.7)
warden (1.2.3)
rack (>= 1.0)
web-console (2.0.0)
activemodel (~> 4.0)
binding_of_caller (>= 0.7.2)
railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0)

PLATFORMS
ruby
Expand All @@ -265,7 +298,7 @@ DEPENDENCIES
carrierwave
delayed_job_active_record
delayed_job_web (>= 1.2.0)
devise (= 3.2.3)
devise (= 3.4.1)
devise-async
email_validator
haml-rails
Expand All @@ -277,15 +310,16 @@ DEPENDENCIES
minitest-reporters
pg
quiet_assets
rails (= 4.1.8)
rails (= 4.2.0)
rails_12factor
sass-rails!
simple_form
simplecov
spring
sprockets-rails (~> 2.0)
sprockets-rails (= 3.0.0.beta1)
sprockets-strict-mode
thin
twitter-bootstrap-rails
uglifier (>= 1.0.3)
unicorn
web-console (~> 2.0)
2 changes: 1 addition & 1 deletion bin/rails
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
APP_PATH = File.expand_path('../../config/application', __FILE__)
APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
require 'rails/commands'
Loading

0 comments on commit 45ab66b

Please sign in to comment.