diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-27 09:06:17 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-28 17:37:01 +0800 |
| commit | 8b86921db8aeb46a2c4b5450be05dc110d9a660a (patch) | |
| tree | 5ad0dd5556776396d021a95a12b4a1e880afee39 | |
| parent | 07b4c1b28ffcaa97dd4050ea1235ebc518f4879d (diff) | |
| download | gitlab-ce-8b86921db8aeb46a2c4b5450be05dc110d9a660a.tar.gz | |
Merge branch '30645-show-pipeline-events-description' into 'master'
Remove description for build_events, add pipeline_events
Closes #30645
See merge request !10908
| -rw-r--r-- | app/helpers/services_helper.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/30645-show-pipeline-events-description.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index 715e5893a2c..3707bb5ba36 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -13,8 +13,8 @@ module ServicesHelper "Event will be triggered when a confidential issue is created/updated/closed" when "merge_request", "merge_request_events" "Event will be triggered when a merge request is created/updated/merged" - when "build", "build_events" - "Event will be triggered when a build status changes" + when "pipeline", "pipeline_events" + "Event will be triggered when a pipeline status changes" when "wiki_page", "wiki_page_events" "Event will be triggered when a wiki page is created/updated" when "commit", "commit_events" diff --git a/changelogs/unreleased/30645-show-pipeline-events-description.yml b/changelogs/unreleased/30645-show-pipeline-events-description.yml new file mode 100644 index 00000000000..fb75dde1d86 --- /dev/null +++ b/changelogs/unreleased/30645-show-pipeline-events-description.yml @@ -0,0 +1,4 @@ +--- +title: Fix pipeline events description for Slack and Mattermost integration +merge_request: 10908 +author: |