diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-08-17 13:53:39 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-08-17 13:53:39 +0000 |
commit | 91d3e6d9011edd19f980a8a0864ff0f673513011 (patch) | |
tree | 35e4828a2672de216c21beb98536ce3e270a97b9 /Gemfile.lock | |
parent | 2c528aad8667ec8cafd0040eb2f33594eec693e7 (diff) | |
parent | f865b1b459b7c53eb57580246d8e20c4fd45f7fe (diff) | |
download | gitlab-ce-91d3e6d9011edd19f980a8a0864ff0f673513011.tar.gz |
Merge branch 'ee-2628-backport-to-ce' into 'master'
Backports EE mirror stuck handling featureā¦
See merge request !13627
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ef4411ca7b4..ae1df783a80 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,8 +46,6 @@ GEM ice_nine (~> 0.11.0) memoizable (~> 0.4.0) addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) akismet (2.0.0) allocations (1.0.5) arel (6.0.4) @@ -960,7 +958,6 @@ DEPENDENCIES activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) - after_commit_queue (~> 1.3.0) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) |