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
67748fbf
Commit
67748fbf
authored
Jul 21, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CE Backport] Recommend V4 API usage on chat slash command integrations
parent
913b4c7c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/helpers/triggers_helper.rb
app/helpers/triggers_helper.rb
+1
-1
spec/features/projects/services/mattermost_slash_command_spec.rb
...atures/projects/services/mattermost_slash_command_spec.rb
+1
-1
spec/features/projects/services/slack_slash_command_spec.rb
spec/features/projects/services/slack_slash_command_spec.rb
+1
-1
No files found.
app/helpers/triggers_helper.rb
View file @
67748fbf
...
...
@@ -8,6 +8,6 @@ module TriggersHelper
end
def
service_trigger_url
(
service
)
"
#{
Settings
.
gitlab
.
url
}
/api/v
3
/projects/
#{
service
.
project_id
}
/services/
#{
service
.
to_param
}
/trigger"
"
#{
Settings
.
gitlab
.
url
}
/api/v
4
/projects/
#{
service
.
project_id
}
/services/
#{
service
.
to_param
}
/trigger"
end
end
spec/features/projects/services/mattermost_slash_command_spec.rb
View file @
67748fbf
...
...
@@ -159,7 +159,7 @@ feature 'Setup Mattermost slash commands', :feature, :js do
it
'shows the correct trigger url'
do
value
=
find_field
(
'request_url'
).
value
expect
(
value
).
to
match
(
"api/v
3
/projects/
#{
project
.
id
}
/services/mattermost_slash_commands/trigger"
)
expect
(
value
).
to
match
(
"api/v
4
/projects/
#{
project
.
id
}
/services/mattermost_slash_commands/trigger"
)
end
it
'shows a token placeholder'
do
...
...
spec/features/projects/services/slack_slash_command_spec.rb
View file @
67748fbf
...
...
@@ -40,6 +40,6 @@ feature 'Slack slash commands', feature: true do
it
'shows the correct trigger url'
do
value
=
find_field
(
'url'
).
value
expect
(
value
).
to
match
(
"api/v
3
/projects/
#{
project
.
id
}
/services/slack_slash_commands/trigger"
)
expect
(
value
).
to
match
(
"api/v
4
/projects/
#{
project
.
id
}
/services/slack_slash_commands/trigger"
)
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