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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
be88e942
Commit
be88e942
authored
Feb 10, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show Pipeline(not Job) in MR desktop notification
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/27955
parent
57d5a549
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/views/projects/merge_requests/widget/_show.html.haml
app/views/projects/merge_requests/widget/_show.html.haml
+2
-2
changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml
...nreleased/27955-mr-notification-use-pipeline-language.yml
+4
-0
No files found.
app/views/projects/merge_requests/widget/_show.html.haml
View file @
be88e942
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
gitlab_icon
:
"
#{
asset_path
'gitlab_logo.png'
}
"
,
gitlab_icon
:
"
#{
asset_path
'gitlab_logo.png'
}
"
,
ci_status
:
"
#{
@merge_request
.
head_pipeline
?
@merge_request
.
head_pipeline
.
status
:
''
}
"
,
ci_status
:
"
#{
@merge_request
.
head_pipeline
?
@merge_request
.
head_pipeline
.
status
:
''
}
"
,
ci_message
:
{
ci_message
:
{
normal
:
"
Job
{{status}} for
\"
{{title}}
\"
"
,
normal
:
"
Pipeline
{{status}} for
\"
{{title}}
\"
"
,
preparing
:
"
{{status}} job for
\"
{{title}}
\"
"
preparing
:
"
{{status}} job for
\"
{{title}}
\"
"
},
},
ci_enable
:
#{
@project
.
ci_service
?
"true"
:
"false"
}
,
ci_enable
:
#{
@project
.
ci_service
?
"true"
:
"false"
}
,
ci_title
:
{
ci_title
:
{
preparing
:
"
{{status}} job
"
,
preparing
:
"
{{status}} job
"
,
normal
:
"
Job
{{status}}
"
normal
:
"
Pipeline
{{status}}
"
},
},
ci_sha
:
"
#{
@merge_request
.
head_pipeline
?
@merge_request
.
head_pipeline
.
short_sha
:
''
}
"
,
ci_sha
:
"
#{
@merge_request
.
head_pipeline
?
@merge_request
.
head_pipeline
.
short_sha
:
''
}
"
,
ci_pipeline
:
#{
@merge_request
.
head_pipeline
.
try
(
:id
).
to_json
}
,
ci_pipeline
:
#{
@merge_request
.
head_pipeline
.
try
(
:id
).
to_json
}
,
...
...
changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml
0 → 100644
View file @
be88e942
---
title
:
Show Pipeline(not Job) in MR desktop notification
merge_request
:
author
:
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