Merge branch...

Merge branch 'ee-53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master'

Update gitlab-markup gem to avoid binary name collision

See merge request gitlab-org/gitlab-ee!8393

Gemfile

@@ -134,7 +134,7 @@ gem 'faraday_middleware-aws-signers-v4'
 # 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'

Gemfile.lock

@@ -297,7 +297,7 @@ GEM
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-license (1.0.0)
-    gitlab-markup (1.6.4)
+    gitlab-markup (1.6.5)
     gitlab-sidekiq-fetcher (0.3.0)
       sidekiq (~> 5)
     gitlab-styles (2.4.1)
@@ -1030,7 +1030,7 @@ DEPENDENCIES
   gitaly-proto (~> 0.123.0)
   github-markup (~> 1.7.0)
   gitlab-license (~> 1.0)
-  gitlab-markup (~> 1.6.4)
+  gitlab-markup (~> 1.6.5)
   gitlab-sidekiq-fetcher
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)

Gemfile.rails5.lock

@@ -300,7 +300,7 @@ GEM
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-license (1.0.0)
-    gitlab-markup (1.6.4)
+    gitlab-markup (1.6.5)
     gitlab-sidekiq-fetcher (0.3.0)
       sidekiq (~> 5)
     gitlab-styles (2.4.1)
@@ -1039,7 +1039,7 @@ DEPENDENCIES
   gitaly-proto (~> 0.123.0)
   github-markup (~> 1.7.0)
   gitlab-license (~> 1.0)
-  gitlab-markup (~> 1.6.4)
+  gitlab-markup (~> 1.6.5)
   gitlab-sidekiq-fetcher
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)