diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 10:04:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 10:04:04 +0000 |
| commit | aa285f422940feec6c77bf8f3332fc83651211b8 (patch) | |
| tree | d1c7dccf735242cbbc8a222bdfd8a0182aee7dc5 | |
| parent | b6a315d099b978713c1d69eb1bc8ca43883cf119 (diff) | |
| parent | 1e1f99f2b1b3d79f4b767362fbf8fe1838348175 (diff) | |
| download | gitlab-ce-aa285f422940feec6c77bf8f3332fc83651211b8.tar.gz | |
Merge branch '53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master'
Update gitlab-markup gem to avoid binary name collision
Closes #53082
See merge request gitlab-org/gitlab-ce!22960
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -124,7 +124,7 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.6.4' +gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' diff --git a/Gemfile.lock b/Gemfile.lock index 50e3ddef1e1..032de064820 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -272,7 +272,7 @@ GEM gitaly-proto (0.123.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-markup (1.6.4) + gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.3.0) sidekiq (~> 5) gitlab-styles (2.4.1) @@ -995,7 +995,7 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly-proto (~> 0.123.0) github-markup (~> 1.7.0) - gitlab-markup (~> 1.6.4) + gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 181f2db95b0..931976d18c1 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -275,7 +275,7 @@ GEM gitaly-proto (0.123.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-markup (1.6.4) + gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.3.0) sidekiq (~> 5) gitlab-styles (2.4.1) @@ -1004,7 +1004,7 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly-proto (~> 0.123.0) github-markup (~> 1.7.0) - gitlab-markup (~> 1.6.4) + gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) |