summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-08 17:30:43 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-08 17:30:43 +0000
commit5218537c3bff9e26f657fd0f8c773471a5170d9b (patch)
tree92c4e6a759ab2b5760eebbf86381c6cc8ed6764a /Gemfile.lock
parente5de006845647ab1e0b9fa614f1f3313fabfec0d (diff)
parentad5a982d841f572e4e9207ae5ac6a0013648d30e (diff)
downloadgitlab-ce-5218537c3bff9e26f657fd0f8c773471a5170d9b.tar.gz
Merge branch 'rails_4_0_5' into 'master'
Rails 4.0.5
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock55
1 files changed, 28 insertions, 27 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f4513af7a84..c022868bc2e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,26 +2,26 @@ GEM
remote: https://rubygems.org/
specs:
ace-rails-ap (2.0.1)
- actionmailer (4.0.3)
- actionpack (= 4.0.3)
+ actionmailer (4.0.5)
+ actionpack (= 4.0.5)
mail (~> 2.5.4)
- actionpack (4.0.3)
- activesupport (= 4.0.3)
+ actionpack (4.0.5)
+ activesupport (= 4.0.5)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- activemodel (4.0.3)
- activesupport (= 4.0.3)
+ activemodel (4.0.5)
+ activesupport (= 4.0.5)
builder (~> 3.1.0)
- activerecord (4.0.3)
- activemodel (= 4.0.3)
+ activerecord (4.0.5)
+ activemodel (= 4.0.5)
activerecord-deprecated_finders (~> 1.0.2)
- activesupport (= 4.0.3)
+ activesupport (= 4.0.5)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
- activesupport (4.0.3)
- i18n (~> 0.6, >= 0.6.4)
+ activesupport (4.0.5)
+ i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
@@ -279,7 +279,7 @@ GEM
mime-types (1.25.1)
mini_portile (0.5.3)
minitest (4.7.5)
- multi_json (1.9.3)
+ multi_json (1.10.0)
multi_xml (0.5.5)
multipart-post (1.2.0)
mysql2 (0.3.11)
@@ -349,13 +349,13 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.0.3)
- actionmailer (= 4.0.3)
- actionpack (= 4.0.3)
- activerecord (= 4.0.3)
- activesupport (= 4.0.3)
+ rails (4.0.5)
+ actionmailer (= 4.0.5)
+ actionpack (= 4.0.5)
+ activerecord (= 4.0.5)
+ activesupport (= 4.0.5)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.0.3)
+ railties (= 4.0.5)
sprockets-rails (~> 2.0.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
@@ -368,9 +368,9 @@ GEM
i18n
require_all
ruby-progressbar
- railties (4.0.3)
- actionpack (= 4.0.3)
- activesupport (= 4.0.3)
+ railties (4.0.5)
+ actionpack (= 4.0.5)
+ activesupport (= 4.0.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.12.0)
@@ -427,11 +427,12 @@ GEM
safe_yaml (0.9.7)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
- sass (3.2.12)
- sass-rails (4.0.1)
+ sass (3.2.19)
+ sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
- sass (>= 3.1.10)
- sprockets-rails (~> 2.0.0)
+ sass (~> 3.2.0)
+ sprockets (~> 2.8, <= 2.11.0)
+ sprockets-rails (~> 2.0)
sdoc (0.3.20)
json (>= 1.1.3)
rdoc (~> 3.10)
@@ -478,7 +479,7 @@ GEM
spring (>= 0.9.1)
spring-commands-spinach (1.0.0)
spring (>= 0.9.1)
- sprockets (2.10.1)
+ sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -636,7 +637,7 @@ DEPENDENCIES
redis-rails
rspec-rails
sanitize (~> 2.0)
- sass-rails
+ sass-rails (~> 4.0.2)
sdoc
seed-fu
select2-rails