summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-09 11:07:55 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-09 11:07:55 +0200
commitab344f31b6a9b9456ffed1d30fb77bc6bd0a2381 (patch)
tree6fbdce307d0294dfc35bb71c23dfeafb0011fc84
parent0d5c6a48be6417b1e61f9ca3f8f8dbe95f059b97 (diff)
downloadgitlab-ce-ab344f31b6a9b9456ffed1d30fb77bc6bd0a2381.tar.gz
Rails upto 3.2.11
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock52
2 files changed, 27 insertions, 27 deletions
diff --git a/Gemfile b/Gemfile
index 9dbccd51dbe..d6e5899e3e7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ def linux_only(require_as)
RUBY_PLATFORM.include?('linux') && require_as
end
-gem "rails", "3.2.10"
+gem "rails", "3.2.11"
# Supported DBs
gem "mysql2", group: :mysql
diff --git a/Gemfile.lock b/Gemfile.lock
index 0965974051e..7d76bf9e75c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,12 +80,12 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.10)
- actionpack (= 3.2.10)
+ actionmailer (3.2.11)
+ actionpack (= 3.2.11)
mail (~> 2.4.4)
- actionpack (3.2.10)
- activemodel (= 3.2.10)
- activesupport (= 3.2.10)
+ actionpack (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -93,18 +93,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.10)
- activesupport (= 3.2.10)
+ activemodel (3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
- activerecord (3.2.10)
- activemodel (= 3.2.10)
- activesupport (= 3.2.10)
+ activerecord (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.10)
- activemodel (= 3.2.10)
- activesupport (= 3.2.10)
- activesupport (3.2.10)
+ activeresource (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
+ activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
@@ -318,7 +318,7 @@ GEM
pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.1)
railties (~> 3.1)
- rack (1.4.1)
+ rack (1.4.3)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cache (1.2)
@@ -333,14 +333,14 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.10)
- actionmailer (= 3.2.10)
- actionpack (= 3.2.10)
- activerecord (= 3.2.10)
- activeresource (= 3.2.10)
- activesupport (= 3.2.10)
+ rails (3.2.11)
+ actionmailer (= 3.2.11)
+ actionpack (= 3.2.11)
+ activerecord (= 3.2.11)
+ activeresource (= 3.2.11)
+ activesupport (= 3.2.11)
bundler (~> 1.0)
- railties (= 3.2.10)
+ railties (= 3.2.11)
rails-dev-tweaks (0.6.1)
actionpack (~> 3.1)
railties (~> 3.1)
@@ -352,9 +352,9 @@ GEM
erubis
i18n
progressbar
- railties (3.2.10)
- actionpack (= 3.2.10)
- activesupport (= 3.2.10)
+ railties (3.2.11)
+ actionpack (= 3.2.11)
+ activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -527,7 +527,7 @@ DEPENDENCIES
pygments.rb!
quiet_assets (~> 1.0.1)
rack-mini-profiler
- rails (= 3.2.10)
+ rails (= 3.2.11)
rails-dev-tweaks
rails_best_practices
raphael-rails!