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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
97114d13
Commit
97114d13
authored
Dec 27, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
cccbe418
f13ec30d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
app/assets/javascripts/pipelines/components/pipeline_url.vue
app/assets/javascripts/pipelines/components/pipeline_url.vue
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/pipelines/components/pipeline_url.vue
View file @
97114d13
...
...
@@ -65,7 +65,7 @@ export default {
v-if=
"pipeline.flags.latest"
v-gl-tooltip
class=
"js-pipeline-url-latest badge badge-success"
title=
"__('Latest pipeline for this branch')"
:
title=
"__('Latest pipeline for this branch')"
>
latest
</span>
...
...
@@ -100,7 +100,7 @@ export default {
<span
v-if=
"pipeline.flags.merge_request"
v-gl-tooltip
title=
"__('This pipeline is run in a merge request context')"
:
title=
"__('This pipeline is run in a merge request context')"
class=
"js-pipeline-url-mergerequest badge badge-info"
>
merge request
...
...
locale/gitlab.pot
View file @
97114d13
...
...
@@ -8910,6 +8910,9 @@ msgstr ""
msgid "This page will be removed in a future release."
msgstr ""
msgid "This pipeline is run in a merge request context"
msgstr ""
msgid "This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>"
msgstr ""
...
...
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