diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-20 17:26:13 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-20 17:26:13 +0300 |
| commit | d7db2232f0cdb901f50d44f0887997ab9bb426b4 (patch) | |
| tree | 718f22f7368d90a89807cfd55d0d8d65eb3a2cea | |
| parent | 9c7363db1fbf17c5e8ab68930932911352f94cb2 (diff) | |
| parent | 87499fcc04187dbdef3626c19ceed1d29f2f69a6 (diff) | |
Merge branch 'master' into 'master'
Docs: change badges.svg example to pipeline.svg
See merge request gitlab-org/gitlab-ce!25157
| -rw-r--r-- | app/assets/javascripts/badges/components/badge_form.vue | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/change-badges-example-to-pipeline.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue index 85a15b38de1..df74eb2c2f7 100644 --- a/app/assets/javascripts/badges/components/badge_form.vue +++ b/app/assets/javascripts/badges/components/badge_form.vue @@ -90,7 +90,7 @@ export default { }, badgeImageUrlExample() { const exampleUrl = - 'https://example.gitlab.com/%{project_path}/badges/%{default_branch}/badge.svg'; + 'https://example.gitlab.com/%{project_path}/badges/%{default_branch}/pipeline.svg'; return sprintf(s__('Badges|e.g. %{exampleUrl}'), { exampleUrl, }); diff --git a/changelogs/unreleased/change-badges-example-to-pipeline.yml b/changelogs/unreleased/change-badges-example-to-pipeline.yml new file mode 100644 index 00000000000..8ed4d77fd6c --- /dev/null +++ b/changelogs/unreleased/change-badges-example-to-pipeline.yml @@ -0,0 +1,5 @@ +--- +title: Change badges.svg example to pipeline.svg +merge_request: 25157 +author: Aviad Levy +type: fixed |