diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 17:34:57 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 17:34:57 +0000 |
| commit | b2ce3643e27db4cc0ad30cc09d651c00ec799887 (patch) | |
| tree | f0e7882be8145da2f59fec4ac26e070afd147ab9 /Gemfile | |
| parent | e9143b15cc400b69ef274789225ac2fee5fdcf83 (diff) | |
| download | gitlab-ce-b2ce3643e27db4cc0ad30cc09d651c00ec799887.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -238,9 +238,6 @@ gem 'redis-rails', '~> 5.0.2' # Discord integration gem 'discordrb-webhooks', '~> 3.4', require: false -# HipChat integration -gem 'hipchat', '~> 1.5.0' - # Jira integration gem 'jira-ruby', '~> 2.1.4' gem 'atlassian-jwt', '~> 0.2.0' @@ -277,7 +274,10 @@ gem 'licensee', '~> 9.14.1' gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content -gem 'mimemagic', '~> 0.3.2' +gem 'ruby-magic-static', '~> 0.3.4' + +# Fake version of the gem to trick bundler +gem 'mimemagic', '0.3.7', path: 'vendor/shims/mimemagic', require: false # Faster blank gem 'fast_blank' |