Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 23:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1736 from matjack1/CVE-2014-7829

Browse source 
Upgrade Rails to 4.1.8 to address CVE-2014-7829
This commit is contained in:
Dan Rice 2014-12-14 14:27:24 -05:00
commit 2289a888ca
2 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '~>4.1.7' gem 'rails', '~>4.1.8'
gem 'sass-rails', '~>4.0' gem 'sass-rails', '~>4.0'
gem 'coffee-rails', '~>4.0' gem 'coffee-rails', '~>4.0'

58
Gemfile.lock
View file

@ -3,30 +3,30 @@ GEM
specs: specs:
RedCloth (4.2.9) RedCloth (4.2.9)
aasm (3.4.0) aasm (3.4.0)
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-xml_parser (1.0.1) actionpack-xml_parser (1.0.1)
actionpack (>= 4.0.0.rc1) actionpack (>= 4.0.0.rc1)
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-deprecated_finders (1.0.3) activerecord-deprecated_finders (1.0.3)
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)
@ -103,7 +103,7 @@ GEM
metaclass (0.0.4) metaclass (0.0.4)
mime-types (2.4.3) mime-types (2.4.3)
mini_portile (0.6.1) mini_portile (0.6.1)
minitest (5.4.2) minitest (5.5.0)
mocha (1.1.0) mocha (1.1.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.10.1) multi_json (1.10.1)
@ -120,24 +120,24 @@ GEM
rack (>= 1.1.3) rack (>= 1.1.3)
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_autolink (1.1.6) rails_autolink (1.1.6)
rails (> 3.1) rails (> 3.1)
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)
rake (10.3.2) rake (10.4.2)
ref (1.0.5) ref (1.0.5)
rspec-expectations (3.1.2) rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
@ -173,7 +173,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.2)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
@ -228,7 +228,7 @@ DEPENDENCIES
mysql2 mysql2
rack-dev-mark rack-dev-mark
rack-mini-profiler rack-mini-profiler
rails (~> 4.1.7) rails (~> 4.1.8)
rails_autolink rails_autolink
rspec-expectations rspec-expectations
sanitize sanitize