summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-01-12 09:04:21 -0500
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-01-30 09:25:15 +0100
commit72843e021dba0022b75f3fd3988115691c19a4fb (patch)
tree8d1dbffdbacefbfc45eac7fbcec042c4c3734528
parent53846da2c7fe3879b4f26383d6367b0bb69e5dc8 (diff)
downloadgitlab-ce-72843e021dba0022b75f3fd3988115691c19a4fb.tar.gz
Fix tests
-rw-r--r--app/models/project_services/chat_slash_commands_service.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/models/project_services/chat_slash_commands_service.rb b/app/models/project_services/chat_slash_commands_service.rb
index 608754f3035..5eb1bd86e9d 100644
--- a/app/models/project_services/chat_slash_commands_service.rb
+++ b/app/models/project_services/chat_slash_commands_service.rb
@@ -28,7 +28,7 @@ class ChatSlashCommandsService < Service
end
def trigger(params)
- return access_presenter unless valid_token?(params[:token])
+ return unless valid_token?(params[:token])
user = find_chat_user(params)
@@ -36,16 +36,12 @@ class ChatSlashCommandsService < Service
Gitlab::ChatCommands::Command.new(project, user, params).execute
else
url = authorize_chat_name_url(params)
- access_presenter(url).authorize
+ Gitlab::ChatCommands::Presenters::Access.new(url).authorize
end
end
private
- def access_presenter(url = nil)
- Gitlab::ChatCommands::Presenters::Access.new(url)
- end
-
def find_chat_user(params)
ChatNames::FindUserService.new(self, params).execute
end