summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <lacerda.filipa@gmail.com>2017-01-26 22:28:39 +0000
committerFilipa Lacerda <lacerda.filipa@gmail.com>2017-01-26 22:28:39 +0000
commita9dc28c78e4832f2a08df1967a77cea911547b5b (patch)
tree35e402a9c232b3841e91aefd975cddc85193b660
parent04bafeb8c7c806fac23de58c80fec5b2ae41477c (diff)
parent4f4d12442f3be382d4562cfb4683969d6eb8f7b2 (diff)
downloadgitlab-ce-a9dc28c78e4832f2a08df1967a77cea911547b5b.tar.gz
Merge branch 'revert-filter-assigned-to-me' into 'master'
Revert filter-assigned-to-me Closes #27176 See merge request !8785
-rw-r--r--app/views/shared/issuable/_search_bar.html.haml4
-rw-r--r--changelogs/unreleased/revert-filter-assigned-to-me.yml4
-rw-r--r--spec/features/issues/filtered_search/dropdown_assignee_spec.rb16
3 files changed, 4 insertions, 20 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index e9644ca0f12..55360dadbc4 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -47,10 +47,6 @@
%li.filter-dropdown-item{ 'data-value' => 'none' }
%button.btn.btn-link
No Assignee
- - if current_user
- %li.filter-dropdown-item{ 'data-value' => current_user.to_reference }
- %button.btn.btn-link
- Assigned to me
%li.divider
%ul.filter-dropdown{ 'data-dynamic' => true, 'data-dropdown' => true }
%li.filter-dropdown-item
diff --git a/changelogs/unreleased/revert-filter-assigned-to-me.yml b/changelogs/unreleased/revert-filter-assigned-to-me.yml
new file mode 100644
index 00000000000..37f9d2f5fc4
--- /dev/null
+++ b/changelogs/unreleased/revert-filter-assigned-to-me.yml
@@ -0,0 +1,4 @@
+---
+title: Revert 3f17f29a
+merge_request: 8785
+author:
diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
index 8a155c3bfc5..db1d1aaf3db 100644
--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -43,14 +43,6 @@ describe 'Dropdown assignee', js: true, feature: true do
expect(page).to have_css(js_dropdown_assignee, visible: true)
end
- it 'shows assigned to me link' do
- filtered_search.set('assignee:')
-
- page.within js_dropdown_assignee do
- expect(page).to have_content('Assigned to me')
- end
- end
-
it 'closes when the search bar is unfocused' do
find('body').click()
@@ -129,14 +121,6 @@ describe 'Dropdown assignee', js: true, feature: true do
filtered_search.set('assignee:')
end
- it 'filters by current user' do
- page.within js_dropdown_assignee do
- click_button 'Assigned to me'
- end
-
- expect(filtered_search.value).to eq("assignee:#{user.to_reference} ")
- end
-
it 'fills in the assignee username when the assignee has not been filtered' do
click_assignee(user_jacob.name)