summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-06-26 13:01:15 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-06-26 13:01:15 +0000
commit7eae2b3ce0a944e003e45d75cb3365f2e09212c7 (patch)
tree2f1323fbf65cf12b0eddf84297a4773e83676a0f
parent627236c9edd7f085ec5070ef7fcfbcbfc9b6de78 (diff)
parent0f5d9d22f8b0b54762b8c1f96b48c658e734be74 (diff)
downloadgitlab-ce-7eae2b3ce0a944e003e45d75cb3365f2e09212c7.tar.gz
Merge branch 'update-pipeline-icon-in-web-ide-sidebar' into 'master'
Update pipeline icon in web ide sidebar Closes #48206 See merge request gitlab-org/gitlab-ce!20058
-rw-r--r--app/assets/javascripts/ide/components/panes/right.vue2
-rw-r--r--changelogs/unreleased/update-pipeline-icon-in-web-ide-sidebar.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/components/panes/right.vue b/app/assets/javascripts/ide/components/panes/right.vue
index dedc2988618..5cd2c9ce188 100644
--- a/app/assets/javascripts/ide/components/panes/right.vue
+++ b/app/assets/javascripts/ide/components/panes/right.vue
@@ -69,7 +69,7 @@ export default {
>
<icon
:size="16"
- name="pipeline"
+ name="rocket"
/>
</button>
</li>
diff --git a/changelogs/unreleased/update-pipeline-icon-in-web-ide-sidebar.yml b/changelogs/unreleased/update-pipeline-icon-in-web-ide-sidebar.yml
new file mode 100644
index 00000000000..3f1f3c643e2
--- /dev/null
+++ b/changelogs/unreleased/update-pipeline-icon-in-web-ide-sidebar.yml
@@ -0,0 +1,5 @@
+---
+title: Update pipeline icon in web ide sidebar
+merge_request: 20058
+author: George Tsiolis
+type: changed