deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2532 from dvanduzer/4-0-stable

Browse source 
updating rails to 3.2.11 in response to CVE-2013-0156
This commit is contained in:
Dmitriy Zaporozhets 2013-01-09 10:22:14 -08:00
parent d40215746e 6e067482dc
commit c9ae412e88
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -8,7 +8,7 @@ def linux_only(require_as)
RUBY_PLATFORM.include?('linux') && require_as RUBY_PLATFORM.include?('linux') && require_as
end end
gem "rails", "3.2.10" gem "rails", "3.2.11"
# Supported DBs # Supported DBs
gem "mysql2", group: :mysql gem "mysql2", group: :mysql

52
Gemfile.lock
View file

@ -81,12 +81,12 @@ GIT
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.2.10) actionmailer (3.2.11)
actionpack (= 3.2.10) actionpack (= 3.2.11)
mail (~> 2.4.4) mail (~> 2.4.4)
actionpack (3.2.10) actionpack (3.2.11)
activemodel (= 3.2.10) activemodel (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.4) journey (~> 1.0.4)
@ -94,18 +94,18 @@ GEM
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.2.1) sprockets (~> 2.2.1)
activemodel (3.2.10) activemodel (3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.10) activerecord (3.2.11)
activemodel (= 3.2.10) activemodel (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.10) activeresource (3.2.11)
activemodel (= 3.2.10) activemodel (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
activesupport (3.2.10) activesupport (3.2.11)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
acts-as-taggable-on (2.3.3) acts-as-taggable-on (2.3.3)
@ -306,7 +306,7 @@ GEM
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.1) quiet_assets (1.0.1)
railties (~> 3.1) railties (~> 3.1)
rack (1.4.1) rack (1.4.3)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-cache (1.2) rack-cache (1.2)
@ -321,20 +321,20 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.10) rails (3.2.11)
actionmailer (= 3.2.10) actionmailer (= 3.2.11)
actionpack (= 3.2.10) actionpack (= 3.2.11)
activerecord (= 3.2.10) activerecord (= 3.2.11)
activeresource (= 3.2.10) activeresource (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.10) railties (= 3.2.11)
rails-dev-tweaks (0.6.1) rails-dev-tweaks (0.6.1)
actionpack (~> 3.1) actionpack (~> 3.1)
railties (~> 3.1) railties (~> 3.1)
railties (3.2.10) railties (3.2.11)
actionpack (= 3.2.10) actionpack (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -506,7 +506,7 @@ DEPENDENCIES
pygments.rb! pygments.rb!
quiet_assets (~> 1.0.1) quiet_assets (~> 1.0.1)
rack-mini-profiler rack-mini-profiler
rails (= 3.2.10) rails (= 3.2.11)
rails-dev-tweaks rails-dev-tweaks
raphael-rails (= 1.5.2) raphael-rails (= 1.5.2)
rb-fsevent rb-fsevent