bump rails
This commit is contained in:
parent
137e60ca51
commit
e4f68acf0a
2 changed files with 29 additions and 29 deletions
2
Gemfile
2
Gemfile
|
|
@ -1,7 +1,7 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
source 'https://rails-assets.org'
|
source 'https://rails-assets.org'
|
||||||
|
|
||||||
gem 'rails', '4.1.7'
|
gem 'rails', '4.1.8'
|
||||||
|
|
||||||
# Legacy Rails features, remove me!
|
# Legacy Rails features, remove me!
|
||||||
|
|
||||||
|
|
|
||||||
56
Gemfile.lock
56
Gemfile.lock
|
|
@ -2,29 +2,29 @@ GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
remote: https://rails-assets.org/
|
remote: https://rails-assets.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.1.7)
|
actionmailer (4.1.8)
|
||||||
actionpack (= 4.1.7)
|
actionpack (= 4.1.8)
|
||||||
actionview (= 4.1.7)
|
actionview (= 4.1.8)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
actionpack (4.1.7)
|
actionpack (4.1.8)
|
||||||
actionview (= 4.1.7)
|
actionview (= 4.1.8)
|
||||||
activesupport (= 4.1.7)
|
activesupport (= 4.1.8)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
actionpack-action_caching (1.1.1)
|
actionpack-action_caching (1.1.1)
|
||||||
actionpack (>= 4.0.0, < 5.0)
|
actionpack (>= 4.0.0, < 5.0)
|
||||||
actionpack-page_caching (1.0.2)
|
actionpack-page_caching (1.0.2)
|
||||||
actionpack (>= 4.0.0, < 5)
|
actionpack (>= 4.0.0, < 5)
|
||||||
actionview (4.1.7)
|
actionview (4.1.8)
|
||||||
activesupport (= 4.1.7)
|
activesupport (= 4.1.8)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
activemodel (4.1.7)
|
activemodel (4.1.8)
|
||||||
activesupport (= 4.1.7)
|
activesupport (= 4.1.8)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.1.7)
|
activerecord (4.1.8)
|
||||||
activemodel (= 4.1.7)
|
activemodel (= 4.1.8)
|
||||||
activesupport (= 4.1.7)
|
activesupport (= 4.1.8)
|
||||||
arel (~> 5.0.0)
|
arel (~> 5.0.0)
|
||||||
activerecord-import (0.6.0)
|
activerecord-import (0.6.0)
|
||||||
activerecord (>= 3.0)
|
activerecord (>= 3.0)
|
||||||
|
|
@ -32,7 +32,7 @@ GEM
|
||||||
activemodel (~> 4.0)
|
activemodel (~> 4.0)
|
||||||
activesupport (~> 4.0)
|
activesupport (~> 4.0)
|
||||||
rails-observers (~> 0.1.1)
|
rails-observers (~> 0.1.1)
|
||||||
activesupport (4.1.7)
|
activesupport (4.1.8)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
|
@ -301,7 +301,7 @@ GEM
|
||||||
mini_magick (3.8.1)
|
mini_magick (3.8.1)
|
||||||
subexec (~> 0.2.1)
|
subexec (~> 0.2.1)
|
||||||
mini_portile (0.6.1)
|
mini_portile (0.6.1)
|
||||||
minitest (5.4.2)
|
minitest (5.4.3)
|
||||||
mobile-fu (1.3.1)
|
mobile-fu (1.3.1)
|
||||||
rack-mobile-detect
|
rack-mobile-detect
|
||||||
rails
|
rails
|
||||||
|
|
@ -375,15 +375,15 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.1.7)
|
rails (4.1.8)
|
||||||
actionmailer (= 4.1.7)
|
actionmailer (= 4.1.8)
|
||||||
actionpack (= 4.1.7)
|
actionpack (= 4.1.8)
|
||||||
actionview (= 4.1.7)
|
actionview (= 4.1.8)
|
||||||
activemodel (= 4.1.7)
|
activemodel (= 4.1.8)
|
||||||
activerecord (= 4.1.7)
|
activerecord (= 4.1.8)
|
||||||
activesupport (= 4.1.7)
|
activesupport (= 4.1.8)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.1.7)
|
railties (= 4.1.8)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
rails-assets-diaspora_jsxc (0.0.4)
|
rails-assets-diaspora_jsxc (0.0.4)
|
||||||
rails-assets-jquery (~> 1.11.1)
|
rails-assets-jquery (~> 1.11.1)
|
||||||
|
|
@ -430,9 +430,9 @@ GEM
|
||||||
remotipart (~> 1.0)
|
remotipart (~> 1.0)
|
||||||
safe_yaml (~> 1.0)
|
safe_yaml (~> 1.0)
|
||||||
sass-rails (~> 4.0)
|
sass-rails (~> 4.0)
|
||||||
railties (4.1.7)
|
railties (4.1.8)
|
||||||
actionpack (= 4.1.7)
|
actionpack (= 4.1.8)
|
||||||
activesupport (= 4.1.7)
|
activesupport (= 4.1.8)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.13.0)
|
raindrops (0.13.0)
|
||||||
|
|
@ -514,7 +514,7 @@ GEM
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
sprockets-rails (2.2.0)
|
sprockets-rails (2.2.1)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
|
|
@ -629,7 +629,7 @@ DEPENDENCIES
|
||||||
rack-protection (= 1.2)
|
rack-protection (= 1.2)
|
||||||
rack-rewrite (= 1.5.0)
|
rack-rewrite (= 1.5.0)
|
||||||
rack-ssl (= 1.4.1)
|
rack-ssl (= 1.4.1)
|
||||||
rails (= 4.1.7)
|
rails (= 4.1.8)
|
||||||
rails-assets-diaspora_jsxc (~> 0.0.4)
|
rails-assets-diaspora_jsxc (~> 0.0.4)
|
||||||
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
|
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
|
||||||
rails-assets-jquery (= 1.11.1)
|
rails-assets-jquery (= 1.11.1)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue