Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-06-22 23:45:40 +0300
committerkushalpandya <kushal@gitlab.com>2017-06-23 14:46:00 +0300
commitfac4e8cccfe85169fbf3f5c9003de0ab0788c8a6 (patch)
tree24bcd6307144e436a7b68f6579e3fed289a06a1c /Gemfile.lock
parent0dc3a08cfea7ce376e6b2bc68360ab1f47248fcd (diff)
Merge branch 'rs-revert-bootsnap' into 'master'
Revert "Merge branch 'rs-bootsnap' into 'master'" Closes #34134, #34106, and #34084 See merge request !12389
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 676cd977e37..83f6961e785 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,8 +83,6 @@ GEM
bindata (2.3.5)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootsnap (1.0.0)
- msgpack (~> 1.0)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
@@ -464,7 +462,6 @@ GEM
minitest (5.7.0)
mmap2 (2.2.6)
mousetrap-rails (1.4.6)
- msgpack (1.1.0)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -924,7 +921,6 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
better_errors (~> 2.1.0)
binding_of_caller (~> 0.7.2)
- bootsnap (~> 1.0.0)
bootstrap-sass (~> 3.3.0)
brakeman (~> 3.6.0)
browser (~> 2.2)