diff options
author | Marin Jankovski <marin@gitlab.com> | 2018-11-07 14:10:23 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2018-11-07 14:10:23 +0000 |
commit | 1183183403cadb465cfec52532cb77ad6a9494c9 (patch) | |
tree | dfe0084199b332a067d852a4b47b12cbb1a78cb1 /Gemfile.lock | |
parent | ad7d0cb2f4395d4abca83acd9b98b17fc73523c0 (diff) | |
parent | 1c7c1400165fff3c6648a44051620c72fdcf11a7 (diff) | |
download | gitlab-ce-1183183403cadb465cfec52532cb77ad6a9494c9.tar.gz |
Merge branch 'remove-asset-sync' into 'master'
Remove asset_sync gem and related code
Closes omnibus-gitlab#3872
See merge request gitlab-org/gitlab-ce!22610
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e755b0e0a8d..4ad9613989d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,11 +58,6 @@ GEM asciidoctor (1.5.6.2) asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) - asset_sync (2.4.0) - activemodel (>= 4.1.0) - fog-core - mime-types (>= 2.99) - unf ast (2.4.0) atomic (1.1.99) attr_encrypted (3.1.0) @@ -939,7 +934,6 @@ DEPENDENCIES asana (~> 0.6.0) asciidoctor (~> 1.5.6) asciidoctor-plantuml (= 0.0.8) - asset_sync (~> 2.4) attr_encrypted (~> 3.1.0) awesome_print babosa (~> 1.0.2) |