Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index d24dab63bd9..abbdb11a3f7 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -448,7 +448,7 @@ module API
           .execute.map { |lang| [lang.name, lang.share] }.to_h
       end
 
-      desc 'Remove a project'
+      desc 'Delete a project'
       delete ":id" do
         authorize! :remove_project, user_project
 
diff --git a/lib/gitlab/service_desk_email.rb b/lib/gitlab/service_desk_email.rb
index f8dba82cb40..52da10eff3e 100644
--- a/lib/gitlab/service_desk_email.rb
+++ b/lib/gitlab/service_desk_email.rb
@@ -17,6 +17,12 @@ module Gitlab
       def config
         Gitlab.config.service_desk_email
       end
+
+      def address_for_key(key)
+        return if config.address.blank?
+
+        config.address.sub(Gitlab::IncomingEmail::WILDCARD_PLACEHOLDER, key)
+      end
     end
   end
 end