Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 1 deletions

diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb
index b1c64bc3c0a..8dc8c804ea5 100644
--- a/spec/services/git/branch_hooks_service_spec.rb
+++ b/spec/services/git/branch_hooks_service_spec.rb
@@ -69,6 +69,7 @@ describe Git::BranchHooksService do
               Gitlab.config.gitlab.url,
               project.namespace.to_param,
               project.to_param,
+              '-',
               'commit',
               commit.id
             ].join('/')
diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb
index 4d7ec7ac1d8..c64b93a2532 100644
--- a/spec/services/git/branch_push_service_spec.rb
+++ b/spec/services/git/branch_push_service_spec.rb
@@ -421,7 +421,7 @@ describe Git::BranchPushService, services: true do
         let(:message) { "this is some work.\n\ncloses JIRA-1" }
         let(:comment_body) do
           {
-            body: "Issue solved with [#{closing_commit.id}|http://#{Gitlab.config.gitlab.host}/#{project.full_path}/commit/#{closing_commit.id}]."
+            body: "Issue solved with [#{closing_commit.id}|http://#{Gitlab.config.gitlab.host}/#{project.full_path}/-/commit/#{closing_commit.id}]."
           }.to_json
         end
 
diff --git a/spec/services/git/tag_hooks_service_spec.rb b/spec/services/git/tag_hooks_service_spec.rb
index abb5b9b130b..094ccd8c9f0 100644
--- a/spec/services/git/tag_hooks_service_spec.rb
+++ b/spec/services/git/tag_hooks_service_spec.rb
@@ -107,6 +107,7 @@ describe Git::TagHooksService, :service do
                Gitlab.config.gitlab.url,
                project.namespace.to_param,
                project.to_param,
+               '-',
                'commit',
                commit.id
               ].join('/')