Merge branch '28975-recommend-using-v4-api-on-slash-command-integrations' into 'master'
Recommend V4 API usage on chat slash command integrations Closes #28975 See merge request !12954
This commit is contained in:
commit
f95b605cc1
|
@ -8,6 +8,6 @@ module TriggersHelper
|
|||
end
|
||||
|
||||
def service_trigger_url(service)
|
||||
"#{Settings.gitlab.url}/api/v3/projects/#{service.project_id}/services/#{service.to_param}/trigger"
|
||||
"#{Settings.gitlab.url}/api/v4/projects/#{service.project_id}/services/#{service.to_param}/trigger"
|
||||
end
|
||||
end
|
||||
|
|
|
@ -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/v3/projects/#{project.id}/services/mattermost_slash_commands/trigger")
|
||||
expect(value).to match("api/v4/projects/#{project.id}/services/mattermost_slash_commands/trigger")
|
||||
end
|
||||
|
||||
it 'shows a token placeholder' do
|
||||
|
|
|
@ -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/v3/projects/#{project.id}/services/slack_slash_commands/trigger")
|
||||
expect(value).to match("api/v4/projects/#{project.id}/services/slack_slash_commands/trigger")
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue