diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-27 18:43:51 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-27 18:43:51 +0000 |
| commit | c066dc6c37ab678bcea0c3bed1503b2d4486b6e1 (patch) | |
| tree | d01e9d1ed915d58bd00b564e99584ac59460476b /app/models/project_services/slash_commands_service.rb | |
| parent | b17912a8af08ada189fc4dc2f864d619ca0bed86 (diff) | |
| parent | d4867c518f2d72125c619c191fa9577dabb1ae9a (diff) | |
| download | gitlab-ce-remove-snippets-bundle.tar.gz | |
Merge branch 'master' into 'remove-snippets-bundle'remove-snippets-bundle
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'app/models/project_services/slash_commands_service.rb')
| -rw-r--r-- | app/models/project_services/slash_commands_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project_services/slash_commands_service.rb b/app/models/project_services/slash_commands_service.rb index eb4da68bb7e..37ea45109ae 100644 --- a/app/models/project_services/slash_commands_service.rb +++ b/app/models/project_services/slash_commands_service.rb @@ -30,10 +30,10 @@ class SlashCommandsService < Service def trigger(params) return unless valid_token?(params[:token]) - user = find_chat_user(params) + chat_user = find_chat_user(params) - if user - Gitlab::SlashCommands::Command.new(project, user, params).execute + if chat_user&.user + Gitlab::SlashCommands::Command.new(project, chat_user, params).execute else url = authorize_chat_name_url(params) Gitlab::SlashCommands::Presenters::Access.new(url).authorize |