diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-21 13:54:52 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-21 13:54:52 +0000 |
| commit | f95b605cc1ef95187ecc5b369bc8f4f3f9e21515 (patch) | |
| tree | 4dc9c985ce3375b6041da230e8cc8f58e4bef941 | |
| parent | 87499a8f9c8221e5600a4dad928e2ce118f18157 (diff) | |
| parent | d9b334d2afe787c6a935891130ac646bbf25113a (diff) | |
| download | gitlab-ce-f95b605cc1ef95187ecc5b369bc8f4f3f9e21515.tar.gz | |
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
| -rw-r--r-- | app/helpers/triggers_helper.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/services/mattermost_slash_command_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/services/slack_slash_command_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/triggers_helper.rb b/app/helpers/triggers_helper.rb index a48d4475e97..ce435ca2241 100644 --- a/app/helpers/triggers_helper.rb +++ b/app/helpers/triggers_helper.rb @@ -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 diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb index 584d3ed8f42..3319b0fedf3 100644 --- a/spec/features/projects/services/mattermost_slash_command_spec.rb +++ b/spec/features/projects/services/mattermost_slash_command_spec.rb @@ -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 diff --git a/spec/features/projects/services/slack_slash_command_spec.rb b/spec/features/projects/services/slack_slash_command_spec.rb index 4efe484262a..71f5a8d7a4e 100644 --- a/spec/features/projects/services/slack_slash_command_spec.rb +++ b/spec/features/projects/services/slack_slash_command_spec.rb @@ -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 |