diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-09-25 18:07:43 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-09-25 18:07:43 +0300 |
| commit | a615994fdba770262747e1f57409bb713a1fdf2b (patch) | |
| tree | b0c429468bc0ddd6d220ed3cc0b2ff88a1077ff8 /app/assets/javascripts | |
| parent | be7ac9ec5b15e7afe5a7bb970af3cab49e6dc03d (diff) | |
| parent | 6ed79d608a60e9a16f4917bf59cb3e4f23bd82c2 (diff) | |
Merge branch 'ide-remove-stage-buttons' into 'master'
Remove stage/unstage buttons from IDE commit list items
Closes #51695
See merge request gitlab-org/gitlab-ce!21845
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/list_item.vue | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue b/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue index c3ca147e850..3aca38399fb 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue @@ -52,6 +52,7 @@ export default { </strong> <changed-file-icon :file="activeFile" + class="ml-0" /> <div class="ml-auto"> <button diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue index 10c78a80302..ee0e72cd05f 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue @@ -120,10 +120,6 @@ export default { :css-classes="iconClass" /> </div> - <component - :is="actionComponent" - :path="file.path" - /> </div> </div> </div> |