diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-27 10:20:09 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-27 10:20:09 +0000 |
commit | 60503057bcf357bef82e3e61072d2a2646f62279 (patch) | |
tree | 48e234ba8450dd8786c42bcfa157987a5ec0b567 /lib | |
parent | a4885b8f37602c399efff028b0a733ef80fbe7ab (diff) | |
parent | 57719d34d3fcc15f39354b0e9dc1da41bbe5d1a8 (diff) | |
download | gitlab-ce-60503057bcf357bef82e3e61072d2a2646f62279.tar.gz |
Merge branch 'slash-commands-changes-for-chatops' into 'master'
Expose ChatName objects to slash commands
See merge request gitlab-org/gitlab-ce!17295
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/slash_commands/base_command.rb | 7 | ||||
-rw-r--r-- | lib/gitlab/slash_commands/command.rb | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/gitlab/slash_commands/base_command.rb b/lib/gitlab/slash_commands/base_command.rb index cc3c9a50555..466554e398c 100644 --- a/lib/gitlab/slash_commands/base_command.rb +++ b/lib/gitlab/slash_commands/base_command.rb @@ -31,10 +31,11 @@ module Gitlab raise NotImplementedError end - attr_accessor :project, :current_user, :params + attr_accessor :project, :current_user, :params, :chat_name - def initialize(project, user, params = {}) - @project, @current_user, @params = project, user, params.dup + def initialize(project, chat_name, params = {}) + @project, @current_user, @params = project, chat_name.user, params.dup + @chat_name = chat_name end private diff --git a/lib/gitlab/slash_commands/command.rb b/lib/gitlab/slash_commands/command.rb index a78408b0519..85aaa6b0eba 100644 --- a/lib/gitlab/slash_commands/command.rb +++ b/lib/gitlab/slash_commands/command.rb @@ -13,12 +13,13 @@ module Gitlab if command if command.allowed?(project, current_user) - command.new(project, current_user, params).execute(match) + command.new(project, chat_name, params).execute(match) else Gitlab::SlashCommands::Presenters::Access.new.access_denied end else - Gitlab::SlashCommands::Help.new(project, current_user, params).execute(available_commands, params[:text]) + Gitlab::SlashCommands::Help.new(project, chat_name, params) + .execute(available_commands, params[:text]) end end |