summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-15 14:02:24 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-15 14:02:24 +0300
commitb50e3f56968e817b886f8edb173d9a8e17f26ff2 (patch)
treef4491e7d5c25c4e6564677f31a6fa2eb5a3ce424 /Gemfile.lock
parentaa181ba68e157574cfeeaf0510213ce7ce4e39ed (diff)
downloadgitlab-ci-b50e3f56968e817b886f8edb173d9a8e17f26ff2.tar.gz
Update rails to 4.0.5
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock56
1 files changed, 27 insertions, 29 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2885603..ef8bc39 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
GEM
remote: https://rubygems.org/
specs:
- 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)
@@ -14,21 +14,21 @@ GEM
actionpack (>= 4.0.0, < 5.0)
actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5)
- 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)
activerecord-session_store (0.1.0)
actionpack (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
railties (>= 4.0.0, < 5)
- 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)
@@ -38,7 +38,6 @@ GEM
activerecord (>= 2.3.0)
rake (>= 0.8.7)
arel (4.0.2)
- atomic (1.1.14)
axiom-types (0.0.5)
descendants_tracker (~> 0.0.1)
ice_nine (~> 0.9)
@@ -162,7 +161,7 @@ GEM
mime-types (1.25.1)
mini_portile (0.5.2)
minitest (4.3.2)
- multi_json (1.8.4)
+ multi_json (1.10.0)
multi_xml (0.5.5)
mysql2 (0.3.14)
nokogiri (1.6.0)
@@ -192,21 +191,21 @@ 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)
- 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)
- rake (10.1.1)
+ rake (10.3.1)
rb-fsevent (0.9.3)
rb-inotify (0.9.2)
ffi (>= 0.5.0)
@@ -259,7 +258,7 @@ GEM
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.4.7)
- sprockets (2.11.0)
+ sprockets (2.12.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -276,9 +275,8 @@ GEM
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
- thor (0.18.1)
- thread_safe (0.1.3)
- atomic
+ thor (0.19.1)
+ thread_safe (0.3.3)
tilt (1.4.1)
timers (1.1.0)
tins (0.13.1)
@@ -287,7 +285,7 @@ GEM
polyglot (>= 0.3.1)
turbolinks (2.0.0)
coffee-rails
- tzinfo (0.3.38)
+ tzinfo (0.3.39)
uglifier (2.3.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
@@ -346,7 +344,7 @@ DEPENDENCIES
protected_attributes
pry
quiet_assets
- rails (= 4.0.3)
+ rails (= 4.0.5)
rake
rb-fsevent
rb-inotify