diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-18 19:02:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-04-18 19:02:04 +0000 |
| commit | aa2bb207560e06d81ae4fcf07ee4bb86dfa862a1 (patch) | |
| tree | 3a227f2fff78f9fbd1dc5c5ad3a7563cf578d053 /Gemfile | |
| parent | 371a9edc96810385189bb779ab2b43c19991d7dd (diff) | |
| parent | 1a2728d940a4349f9d22f71f3a8180c72545e56d (diff) | |
| download | gitlab-ce-aa2bb207560e06d81ae4fcf07ee4bb86dfa862a1.tar.gz | |
Merge branch 'revert-goldiloader' into 'master'
Revert the addition of goldiloader
See merge request gitlab-org/gitlab-ce!18458
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -434,5 +434,3 @@ gem 'grape_logging', '~> 1.7' # Asset synchronization gem 'asset_sync', '~> 2.2.0' - -gem 'goldiloader', '~> 2.0' |