diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /lib/gitlab/slash_commands | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'lib/gitlab/slash_commands')
-rw-r--r-- | lib/gitlab/slash_commands/base_command.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/slash_commands/presenters/issue_new.rb | 14 | ||||
-rw-r--r-- | lib/gitlab/slash_commands/run.rb | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/lib/gitlab/slash_commands/base_command.rb b/lib/gitlab/slash_commands/base_command.rb index fcc120112f2..e184afa0032 100644 --- a/lib/gitlab/slash_commands/base_command.rb +++ b/lib/gitlab/slash_commands/base_command.rb @@ -36,7 +36,9 @@ module Gitlab attr_accessor :project, :current_user, :params, :chat_name def initialize(project, chat_name, params = {}) - @project, @current_user, @params = project, chat_name.user, params.dup + @project = project + @current_user = chat_name.user + @params = params.dup @chat_name = chat_name end diff --git a/lib/gitlab/slash_commands/presenters/issue_new.rb b/lib/gitlab/slash_commands/presenters/issue_new.rb index 552456f5836..8841fef702e 100644 --- a/lib/gitlab/slash_commands/presenters/issue_new.rb +++ b/lib/gitlab/slash_commands/presenters/issue_new.rb @@ -12,16 +12,18 @@ module Gitlab private - def fallback_message - "New issue #{issue.to_reference}: #{issue.title}" + def pretext + "I created an issue on #{author_profile_link}'s behalf: *#{issue_link}* in #{project_link}" end - def fields_with_markdown - %i(title pretext text fields) + def issue_link + "[#{issue.to_reference}](#{project_issue_url(issue.project, issue)})" end - def pretext - "I created an issue on #{author_profile_link}'s behalf: *#{issue.to_reference}* in #{project_link}" + def response_message(custom_pretext: pretext) + { + text: pretext + } end end end diff --git a/lib/gitlab/slash_commands/run.rb b/lib/gitlab/slash_commands/run.rb index 10a545e28ac..40fd7ee4f20 100644 --- a/lib/gitlab/slash_commands/run.rb +++ b/lib/gitlab/slash_commands/run.rb @@ -5,7 +5,7 @@ module Gitlab # Slash command for triggering chatops jobs. class Run < BaseCommand def self.match(text) - /\Arun\s+(?<command>\S+)(\s+(?<arguments>.+))?\z/.match(text) + /\Arun\s+(?<command>\S+)(\s+(?<arguments>.+))?\z/m.match(text) end def self.help_message |