Merge branch 'master' into 'master'

Docs: change badges.svg example to pipeline.svg

See merge request gitlab-org/gitlab-ce!25157

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,
       });

changelogs/unreleased/change-badges-example-to-pipeline.yml

+---
+title: Change badges.svg example to pipeline.svg
+merge_request: 25157
+author: Aviad Levy
+type: fixed