diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-10 16:13:30 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-10 16:13:30 +0000 |
| commit | 14c58e959ef10e9ec6ed49c55d911e42330bf1f1 (patch) | |
| tree | 15a788d872a516a7292f0855afe60229a7e0f429 | |
| parent | ce9d41df085428ac7e212e95142f6a6ff0b50ae0 (diff) | |
| parent | 689f7933ec48cb8855f47fdc00dc5c5c41d689a8 (diff) | |
| download | gitlab-ce-14c58e959ef10e9ec6ed49c55d911e42330bf1f1.tar.gz | |
Merge branch '27955-mr-notification-use-pipeline-language' into 'master'
Show Pipeline(not Job) in MR CI status desktop notification
Closes #27955
See merge request !9122
| -rw-r--r-- | app/views/projects/merge_requests/widget/_show.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index 5de59473840..4c063747857 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -16,13 +16,13 @@ gitlab_icon: "#{asset_path 'gitlab_logo.png'}", ci_status: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.status : ''}", ci_message: { - normal: "Job {{status}} for \"{{title}}\"", + normal: "Pipeline {{status}} for \"{{title}}\"", preparing: "{{status}} job for \"{{title}}\"" }, ci_enable: #{@project.ci_service ? "true" : "false"}, ci_title: { preparing: "{{status}} job", - normal: "Job {{status}}" + normal: "Pipeline {{status}}" }, ci_sha: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.short_sha : ''}", ci_pipeline: #{@merge_request.head_pipeline.try(:id).to_json}, diff --git a/changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml b/changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml new file mode 100644 index 00000000000..d9f78db4bec --- /dev/null +++ b/changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml @@ -0,0 +1,4 @@ +--- +title: Show Pipeline(not Job) in MR desktop notification +merge_request: +author: |