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.lock | |
| parent | e9143b15cc400b69ef274789225ac2fee5fdcf83 (diff) | |
| download | gitlab-ce-b2ce3643e27db4cc0ad30cc09d651c00ec799887.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 063ebc4424b..b4190c88bc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,8 @@ +PATH + remote: vendor/shims/mimemagic + specs: + mimemagic (0.3.7) + GEM remote: https://rubygems.org/ specs: @@ -593,9 +598,6 @@ GEM railties (>= 5.0) heapy (0.2.0) thor - hipchat (1.5.2) - httparty - mimemagic html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) @@ -731,7 +733,6 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) - mimemagic (0.3.5) mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.0.2) @@ -1112,6 +1113,7 @@ GEM i18n ruby-fogbugz (0.2.1) crack (~> 0.4) + ruby-magic-static (0.3.4) ruby-prof (1.3.1) ruby-progressbar (1.11.0) ruby-saml (1.7.2) @@ -1456,7 +1458,6 @@ DEPENDENCIES hashie hashie-forbidden_attributes health_check (~> 3.0) - hipchat (~> 1.5.0) html-pipeline (~> 2.13.2) html2text httparty (~> 0.16.4) @@ -1485,7 +1486,7 @@ DEPENDENCIES marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) - mimemagic (~> 0.3.2) + mimemagic (= 0.3.7)! mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) @@ -1559,6 +1560,7 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) + ruby-magic-static (~> 0.3.4) ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) ruby_parser (~> 3.15) |