diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-06 11:56:08 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-06 11:56:08 +0000 |
| commit | 0bbea6da1886b61f8612c2c38fd1c08e1632073e (patch) | |
| tree | 33baacffe36dcd7d1621f647185d931892f175d0 | |
| parent | 2f0a0761a8e1352e74b328e5b9b9fa20057a1ac5 (diff) | |
| parent | 97b5ea02e42d8daf376fc2fc1f8bd50bb0834b3a (diff) | |
| download | gitlab-ce-0bbea6da1886b61f8612c2c38fd1c08e1632073e.tar.gz | |
Merge branch '51092-fix-mr-diff-file-filter-clear-button' into 'master'
Make MR diff file filter input Clear button functional
Closes #51092
See merge request gitlab-org/gitlab-ce!21556
3 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/changed_files_dropdown.vue b/app/assets/javascripts/diffs/components/changed_files_dropdown.vue index 045688a32bf..0ec6b8b7f21 100644 --- a/app/assets/javascripts/diffs/components/changed_files_dropdown.vue +++ b/app/assets/javascripts/diffs/components/changed_files_dropdown.vue @@ -63,7 +63,7 @@ export default { v-else role="button" class="fa fa-times dropdown-input-search" - @click="clearSearch" + @click.stop.prevent="clearSearch" ></i> </div> <div class="dropdown-content"> diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 7d7143631f2..d673b59e1c0 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -749,6 +749,10 @@ left: $gl-padding; } + .dropdown-input .dropdown-input-search { + pointer-events: all; + } + .diff-changed-file { display: flex; padding-top: 8px; diff --git a/changelogs/unreleased/51092-fix-mr-diff-file-filter-clear-button.yml b/changelogs/unreleased/51092-fix-mr-diff-file-filter-clear-button.yml new file mode 100644 index 00000000000..cb5ab15d285 --- /dev/null +++ b/changelogs/unreleased/51092-fix-mr-diff-file-filter-clear-button.yml @@ -0,0 +1,5 @@ +--- +title: Make MR diff file filter input Clear button functional +merge_request: 21556 +author: +type: fixed |