Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
72843e02
Commit
72843e02
authored
Jan 12, 2017
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
parent
53846da2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
app/models/project_services/chat_slash_commands_service.rb
app/models/project_services/chat_slash_commands_service.rb
+2
-6
No files found.
app/models/project_services/chat_slash_commands_service.rb
View file @
72843e02
...
@@ -28,7 +28,7 @@ class ChatSlashCommandsService < Service
...
@@ -28,7 +28,7 @@ class ChatSlashCommandsService < Service
end
end
def
trigger
(
params
)
def
trigger
(
params
)
return
access_presenter
unless
valid_token?
(
params
[
:token
])
return
unless
valid_token?
(
params
[
:token
])
user
=
find_chat_user
(
params
)
user
=
find_chat_user
(
params
)
...
@@ -36,16 +36,12 @@ class ChatSlashCommandsService < Service
...
@@ -36,16 +36,12 @@ class ChatSlashCommandsService < Service
Gitlab
::
ChatCommands
::
Command
.
new
(
project
,
user
,
params
).
execute
Gitlab
::
ChatCommands
::
Command
.
new
(
project
,
user
,
params
).
execute
else
else
url
=
authorize_chat_name_url
(
params
)
url
=
authorize_chat_name_url
(
params
)
access_presenter
(
url
).
authorize
Gitlab
::
ChatCommands
::
Presenters
::
Access
.
new
(
url
).
authorize
end
end
end
end
private
private
def
access_presenter
(
url
=
nil
)
Gitlab
::
ChatCommands
::
Presenters
::
Access
.
new
(
url
)
end
def
find_chat_user
(
params
)
def
find_chat_user
(
params
)
ChatNames
::
FindUserService
.
new
(
self
,
params
).
execute
ChatNames
::
FindUserService
.
new
(
self
,
params
).
execute
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment