summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-11 16:06:01 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-11 16:06:01 +0000
commit7acabf7c5908940665e1a8c4e3d09d423385657a (patch)
treefad4bd291a00b986a3e79ad3c47f6ed5b870ed01 /Gemfile.lock
parent0668f54b0a77f8dc6b7891ebd3755965bb6136ff (diff)
parente5c49b57c35e5fe923b0fe29e1863cc29d6cf619 (diff)
downloadgitlab-ce-7acabf7c5908940665e1a8c4e3d09d423385657a.tar.gz
Merge branch 'remove-soft-removals' into 'master'
Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock3
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 40c4f73b8a6..cb6b0ebb3bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -580,8 +580,6 @@ GEM
orm_adapter (0.5.0)
os (0.9.6)
parallel (1.12.0)
- paranoia (2.3.1)
- activerecord (>= 4.0, < 5.2)
parser (2.4.0.2)
ast (~> 2.3)
parslet (1.5.0)
@@ -1117,7 +1115,6 @@ DEPENDENCIES
omniauth-twitter (~> 1.2.0)
omniauth_crowd (~> 2.2.0)
org-ruby (~> 0.9.12)
- paranoia (~> 2.3.1)
peek (~> 1.0.1)
peek-gc (~> 0.0.2)
peek-host (~> 1.0.0)