diff --git a/Gemfile.lock b/Gemfile.lock index 5254f1cf18f..3c44c31696c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,7 +194,7 @@ GEM fast_xs (0.8.0) fastimage (1.3.0) ffi (1.8.1) - flamegraph (0.0.2) + flamegraph (0.0.3) fast_stack fog (1.14.0) builder diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index 4d0cc131202..6e4e48e639f 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -33,7 +33,7 @@ GIT GIT remote: git://github.com/rails/rails.git - revision: 025b63db308fbbf942a3bc2673d4aadab968c524 + revision: 08376d3796482fefcd03ad1d7e0bcce0df4c9913 branch: 4-0-stable specs: actionmailer (4.0.0) @@ -173,7 +173,7 @@ GEM activesupport builder arel (4.0.0) - atomic (1.1.13) + atomic (1.1.14) barber (0.4.2) ember-source execjs @@ -222,7 +222,7 @@ GEM fast_xs (0.8.0) fastimage (1.5.0) ffi (1.9.0) - flamegraph (0.0.2) + flamegraph (0.0.3) fast_stack fog (1.14.0) builder @@ -278,7 +278,7 @@ GEM mocha (0.14.0) metaclass (~> 0.0.1) mock_redis (0.8.1) - multi_json (1.7.9) + multi_json (1.8.0) multipart-post (1.2.0) mustache (0.99.4) net-scp (1.1.2) @@ -447,7 +447,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.18.1) - thread_safe (0.1.2) + thread_safe (0.1.3) atomic tilt (1.4.1) timecop (0.6.2.2)