Upgrade to ruby 2.3.1 and rails 4.2.7.
This commit is contained in:
parent
5e28c50703
commit
3317d72bc9
2 changed files with 36 additions and 33 deletions
4
Gemfile
4
Gemfile
|
@ -1,8 +1,8 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
ruby '2.2.3'
|
ruby '2.3.1'
|
||||||
|
|
||||||
gem 'rails', '4.2.6'
|
gem 'rails', '4.2.7'
|
||||||
gem 'rails-observers'
|
gem 'rails-observers'
|
||||||
gem 'activerecord-session_store'
|
gem 'activerecord-session_store'
|
||||||
|
|
||||||
|
|
65
Gemfile.lock
65
Gemfile.lock
|
@ -1,34 +1,34 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.6)
|
actionmailer (4.2.7)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 4.2.7)
|
||||||
actionview (= 4.2.6)
|
actionview (= 4.2.7)
|
||||||
activejob (= 4.2.6)
|
activejob (= 4.2.7)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
actionpack (4.2.6)
|
actionpack (4.2.7)
|
||||||
actionview (= 4.2.6)
|
actionview (= 4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
rack (~> 1.6)
|
rack (~> 1.6)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.6)
|
actionview (4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
activejob (4.2.6)
|
activejob (4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.6)
|
activemodel (4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.6)
|
activerecord (4.2.7)
|
||||||
activemodel (= 4.2.6)
|
activemodel (= 4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activerecord-session_store (1.0.0)
|
activerecord-session_store (1.0.0)
|
||||||
actionpack (>= 4.0, < 5.1)
|
actionpack (>= 4.0, < 5.1)
|
||||||
|
@ -36,7 +36,7 @@ GEM
|
||||||
multi_json (~> 1.11, >= 1.11.2)
|
multi_json (~> 1.11, >= 1.11.2)
|
||||||
rack (>= 1.5.2, < 3)
|
rack (>= 1.5.2, < 3)
|
||||||
railties (>= 4.0, < 5.1)
|
railties (>= 4.0, < 5.1)
|
||||||
activesupport (4.2.6)
|
activesupport (4.2.7)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
@ -217,16 +217,16 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.6)
|
rails (4.2.7)
|
||||||
actionmailer (= 4.2.6)
|
actionmailer (= 4.2.7)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 4.2.7)
|
||||||
actionview (= 4.2.6)
|
actionview (= 4.2.7)
|
||||||
activejob (= 4.2.6)
|
activejob (= 4.2.7)
|
||||||
activemodel (= 4.2.6)
|
activemodel (= 4.2.7)
|
||||||
activerecord (= 4.2.6)
|
activerecord (= 4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.6)
|
railties (= 4.2.7)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
|
@ -238,9 +238,9 @@ GEM
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
rails-observers (0.1.2)
|
rails-observers (0.1.2)
|
||||||
activemodel (~> 4.0)
|
activemodel (~> 4.0)
|
||||||
railties (4.2.6)
|
railties (4.2.7)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 4.2.7)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.7)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.1.0)
|
rainbow (2.1.0)
|
||||||
|
@ -369,7 +369,7 @@ DEPENDENCIES
|
||||||
pre-commit
|
pre-commit
|
||||||
puma
|
puma
|
||||||
rack-livereload
|
rack-livereload
|
||||||
rails (= 4.2.6)
|
rails (= 4.2.7)
|
||||||
rails-observers
|
rails-observers
|
||||||
rb-fsevent
|
rb-fsevent
|
||||||
rubocop
|
rubocop
|
||||||
|
@ -389,5 +389,8 @@ DEPENDENCIES
|
||||||
writeexcel
|
writeexcel
|
||||||
zendesk_api
|
zendesk_api
|
||||||
|
|
||||||
|
RUBY VERSION
|
||||||
|
ruby 2.3.1p112
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.11.2
|
1.12.5
|
||||||
|
|
Loading…
Reference in a new issue