Update rails to 4.2.5.2
This commit is contained in:
parent
f4de0b8431
commit
7a82c4b25f
2 changed files with 53 additions and 51 deletions
2
Gemfile
2
Gemfile
|
@ -2,7 +2,7 @@ source 'https://rubygems.org'
|
||||||
|
|
||||||
|
|
||||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||||
gem 'rails', '4.2.0'
|
gem 'rails', '4.2.5.2'
|
||||||
|
|
||||||
# Use SCSS for stylesheets
|
# Use SCSS for stylesheets
|
||||||
gem 'sass-rails', '~> 5.0'
|
gem 'sass-rails', '~> 5.0'
|
||||||
|
|
102
Gemfile.lock
102
Gemfile.lock
|
@ -9,38 +9,38 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.0)
|
actionmailer (4.2.5.2)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.5.2)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.5.2)
|
||||||
activejob (= 4.2.0)
|
activejob (= 4.2.5.2)
|
||||||
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.0)
|
actionpack (4.2.5.2)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.5.2)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5.2)
|
||||||
rack (~> 1.6.0)
|
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.1)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.0)
|
actionview (4.2.5.2)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5.2)
|
||||||
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.1)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
active_model_serializers (0.8.3)
|
active_model_serializers (0.8.3)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
activejob (4.2.0)
|
activejob (4.2.5.2)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5.2)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.0)
|
activemodel (4.2.5.2)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5.2)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.0)
|
activerecord (4.2.5.2)
|
||||||
activemodel (= 4.2.0)
|
activemodel (= 4.2.5.2)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5.2)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activesupport (4.2.0)
|
activesupport (4.2.5.2)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
@ -49,7 +49,7 @@ GEM
|
||||||
addressable (2.3.8)
|
addressable (2.3.8)
|
||||||
apipie-rails (0.3.1)
|
apipie-rails (0.3.1)
|
||||||
json
|
json
|
||||||
arel (6.0.2)
|
arel (6.0.3)
|
||||||
as_csv (2.0.2)
|
as_csv (2.0.2)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
|
@ -99,6 +99,7 @@ GEM
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.9.1.1)
|
coffee-script-source (1.9.1.1)
|
||||||
columnize (0.9.0)
|
columnize (0.9.0)
|
||||||
|
concurrent-ruby (1.0.1)
|
||||||
crack (0.4.2)
|
crack (0.4.2)
|
||||||
safe_yaml (~> 1.0.0)
|
safe_yaml (~> 1.0.0)
|
||||||
css_splitter (0.4.4)
|
css_splitter (0.4.4)
|
||||||
|
@ -135,7 +136,7 @@ GEM
|
||||||
font-awesome-rails (4.4.0.0)
|
font-awesome-rails (4.4.0.0)
|
||||||
railties (>= 3.2, < 5.0)
|
railties (>= 3.2, < 5.0)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
globalid (0.3.5)
|
globalid (0.3.6)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
guard (2.13.0)
|
guard (2.13.0)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
|
@ -204,7 +205,7 @@ GEM
|
||||||
logstasher (0.6.5)
|
logstasher (0.6.5)
|
||||||
logstash-event (~> 1.2.0)
|
logstash-event (~> 1.2.0)
|
||||||
request_store
|
request_store
|
||||||
loofah (2.0.2)
|
loofah (2.0.3)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
lumberjack (1.0.9)
|
lumberjack (1.0.9)
|
||||||
mail (2.6.3)
|
mail (2.6.3)
|
||||||
|
@ -215,15 +216,15 @@ GEM
|
||||||
rest-client
|
rest-client
|
||||||
maruku (0.7.2)
|
maruku (0.7.2)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.6.1)
|
mime-types (2.99.1)
|
||||||
mini_portile (0.6.2)
|
mini_portile2 (2.0.0)
|
||||||
minitest (5.7.0)
|
minitest (5.8.4)
|
||||||
multi_json (1.11.2)
|
multi_json (1.11.2)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
nenv (0.2.0)
|
nenv (0.2.0)
|
||||||
netrc (0.10.3)
|
netrc (0.10.3)
|
||||||
nokogiri (1.6.6.2)
|
nokogiri (1.6.7.2)
|
||||||
mini_portile (~> 0.6.0)
|
mini_portile2 (~> 2.0.0.rc2)
|
||||||
notiffany (0.0.8)
|
notiffany (0.0.8)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
shellany (~> 0.0)
|
shellany (~> 0.0)
|
||||||
|
@ -271,33 +272,33 @@ GEM
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
railroady (1.3.0)
|
railroady (1.3.0)
|
||||||
rails (4.2.0)
|
rails (4.2.5.2)
|
||||||
actionmailer (= 4.2.0)
|
actionmailer (= 4.2.5.2)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.5.2)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.5.2)
|
||||||
activejob (= 4.2.0)
|
activejob (= 4.2.5.2)
|
||||||
activemodel (= 4.2.0)
|
activemodel (= 4.2.5.2)
|
||||||
activerecord (= 4.2.0)
|
activerecord (= 4.2.5.2)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5.2)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.0)
|
railties (= 4.2.5.2)
|
||||||
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)
|
||||||
rails-dom-testing (1.0.6)
|
rails-dom-testing (1.0.7)
|
||||||
activesupport (>= 4.2.0.beta, < 5.0)
|
activesupport (>= 4.2.0.beta, < 5.0)
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
rails-html-sanitizer (1.0.2)
|
rails-html-sanitizer (1.0.3)
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
railties (4.2.0)
|
railties (4.2.5.2)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.5.2)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.5.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.0.0)
|
rainbow (2.0.0)
|
||||||
raindrops (0.13.0)
|
raindrops (0.13.0)
|
||||||
rake (10.4.2)
|
rake (10.5.0)
|
||||||
rb-fsevent (0.9.6)
|
rb-fsevent (0.9.6)
|
||||||
rb-inotify (0.9.5)
|
rb-inotify (0.9.5)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
|
@ -385,12 +386,13 @@ GEM
|
||||||
spring (1.3.6)
|
spring (1.3.6)
|
||||||
spring-commands-rspec (1.0.4)
|
spring-commands-rspec (1.0.4)
|
||||||
spring (>= 0.9.1)
|
spring (>= 0.9.1)
|
||||||
sprockets (3.2.0)
|
sprockets (3.5.2)
|
||||||
rack (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
sprockets-rails (2.3.2)
|
rack (> 1, < 3)
|
||||||
actionpack (>= 3.0)
|
sprockets-rails (3.0.3)
|
||||||
activesupport (>= 3.0)
|
actionpack (>= 4.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
activesupport (>= 4.0)
|
||||||
|
sprockets (>= 3.0.0)
|
||||||
swd (1.0.0)
|
swd (1.0.0)
|
||||||
activesupport (>= 3)
|
activesupport (>= 3)
|
||||||
attr_required (>= 0.0.5)
|
attr_required (>= 0.0.5)
|
||||||
|
@ -493,7 +495,7 @@ DEPENDENCIES
|
||||||
poltergeist
|
poltergeist
|
||||||
pry-byebug
|
pry-byebug
|
||||||
railroady
|
railroady
|
||||||
rails (= 4.2.0)
|
rails (= 4.2.5.2)
|
||||||
rest-client
|
rest-client
|
||||||
rgeo-geojson
|
rgeo-geojson
|
||||||
rspec-rails (~> 3.0)
|
rspec-rails (~> 3.0)
|
||||||
|
|
Loading…
Reference in a new issue