Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 6 deletions

diff --git a/lib/gitlab/slash_commands/presenters/base.rb b/lib/gitlab/slash_commands/presenters/base.rb
index b60f0b78fef..b8affb42372 100644
--- a/lib/gitlab/slash_commands/presenters/base.rb
+++ b/lib/gitlab/slash_commands/presenters/base.rb
@@ -69,7 +69,6 @@ module Gitlab
         def resource_url
           url_for(
             [
-              resource.project.namespace.becomes(Namespace),
               resource.project,
               resource
             ]
diff --git a/lib/gitlab/slash_commands/presenters/issue_search.rb b/lib/gitlab/slash_commands/presenters/issue_search.rb
index fffa082baac..f5b1670b2e9 100644
--- a/lib/gitlab/slash_commands/presenters/issue_search.rb
+++ b/lib/gitlab/slash_commands/presenters/issue_search.rb
@@ -22,7 +22,7 @@ module Gitlab
 
         def attachments
           resource.map do |issue|
-            url = "[#{issue.to_reference}](#{url_for([namespace, project, issue])})"
+            url = "[#{issue.to_reference}](#{url_for([project, issue])})"
 
             {
               color: color(issue),
@@ -39,10 +39,6 @@ module Gitlab
         def project
           @project ||= resource.first.project
         end
-
-        def namespace
-          @namespace ||= project.namespace.becomes(Namespace)
-        end
       end
     end
   end