summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-05-13 20:49:38 +0000
committerDouwe Maan <douwe@gitlab.com>2016-05-13 20:49:38 +0000
commit710ebf164fdbdfb80510960e87af08bba4157a4b (patch)
tree9633efed548bd9fb2797fc47e1820ce0036774cf /Gemfile.lock
parent5e130c3e39febcd577e61ebd30bd231827d41f2c (diff)
parentb42f39d2c27ec2a87e21dea7414d9845f2512144 (diff)
downloadgitlab-ce-710ebf164fdbdfb80510960e87af08bba4157a4b.tar.gz
Merge branch 'remove-deprecated-finders' into 'master'
Remove activerecord-deprecated_finders gem We don’t use any of the deprecated finders, so it should be safe to remove. See https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders for more information. Resolves #17015. See merge request !3981
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 0 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ce1da92e517..4b51bf58bba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,7 +33,6 @@ GEM
activemodel (= 4.2.6)
activesupport (= 4.2.6)
arel (~> 6.0)
- activerecord-deprecated_finders (1.0.4)
activerecord-session_store (0.1.2)
actionpack (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
@@ -883,7 +882,6 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 4.0.2)
- activerecord-deprecated_finders (~> 1.0.3)
activerecord-session_store (~> 0.1.0)
acts-as-taggable-on (~> 3.4)
addressable (~> 2.3.8)