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
99ee24d8
Commit
99ee24d8
authored
Feb 20, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
e5d0b1ed
d7db2232
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/assets/javascripts/badges/components/badge_form.vue
app/assets/javascripts/badges/components/badge_form.vue
+1
-1
changelogs/unreleased/change-badges-example-to-pipeline.yml
changelogs/unreleased/change-badges-example-to-pipeline.yml
+5
-0
No files found.
app/assets/javascripts/badges/components/badge_form.vue
View file @
99ee24d8
...
@@ -90,7 +90,7 @@ export default {
...
@@ -90,7 +90,7 @@ export default {
},
},
badgeImageUrlExample
()
{
badgeImageUrlExample
()
{
const
exampleUrl
=
const
exampleUrl
=
'
https://example.gitlab.com/%{project_path}/badges/%{default_branch}/
badg
e.svg
'
;
'
https://example.gitlab.com/%{project_path}/badges/%{default_branch}/
pipelin
e.svg
'
;
return
sprintf
(
s__
(
'
Badges|e.g. %{exampleUrl}
'
),
{
return
sprintf
(
s__
(
'
Badges|e.g. %{exampleUrl}
'
),
{
exampleUrl
,
exampleUrl
,
});
});
...
...
changelogs/unreleased/change-badges-example-to-pipeline.yml
0 → 100644
View file @
99ee24d8
---
title
:
Change badges.svg example to pipeline.svg
merge_request
:
25157
author
:
Aviad Levy
type
:
fixed
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