diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-10 19:38:15 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-11 17:49:24 +0300 |
| commit | 3d2fefe07233dfb09dbe7c213bfdb3a4e85d88b8 (patch) | |
| tree | cc3041a2003fcbc7459ba100bdeb8a551cc370e2 /Gemfile.lock | |
| parent | 0cd47b14431a3a6ab0658a7a70c4f0bd81aa2fc3 (diff) | |
Merge branch 'revert_bootsnap' into 'master'
Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"
See merge request !12755
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f356024506c..deaf3ded2f9 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.1.1) - msgpack (~> 1.0) bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) @@ -465,7 +463,6 @@ GEM minitest (5.7.0) mmap2 (2.2.7) mousetrap-rails (1.4.6) - msgpack (1.1.0) multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -930,7 +927,6 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) better_errors (~> 2.1.0) binding_of_caller (~> 0.7.2) - bootsnap (~> 1.1) bootstrap-sass (~> 3.3.0) bootstrap_form (~> 2.7.0) brakeman (~> 3.6.0) |