From 1be406d741a3096f831fbb85b09a24749d8bcfcb Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Thu, 17 Dec 2015 09:32:22 +0100 Subject: Swap Author and Assignee Selectors on issuable index view Closes #4039 --- CHANGELOG | 2 ++ app/views/shared/issuable/_filter.html.haml | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 712563e5f06..fc8ae9f8eb7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,8 @@ v 8.4.0 (unreleased) - Add CAS support (tduehr) - Add link to merge request on build detail page - Revert back upvote and downvote button to the issue and MR pages + - Enable "Add key" button when user fills in a proper key (Stan Hu) + - Swap position of Assignee and Author selector on Issueables (Zeger-Jan van de Weg) v 8.3.3 (unreleased) - Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu) diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index ac6c248ccf1..be06738eac9 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -29,14 +29,14 @@ = check_box_tag "check_all_issues", nil, false, class: "check_all_issues left" .issues-other-filters - .filter-item.inline - = users_select_tag(:assignee_id, selected: params[:assignee_id], - placeholder: 'Assignee', class: 'trigger-submit', any_user: "Any Assignee", null_user: true, first_user: true, current_user: true) - .filter-item.inline = users_select_tag(:author_id, selected: params[:author_id], placeholder: 'Author', class: 'trigger-submit', any_user: "Any Author", first_user: true, current_user: true) + .filter-item.inline + = users_select_tag(:assignee_id, selected: params[:assignee_id], + placeholder: 'Assignee', class: 'trigger-submit', any_user: "Any Assignee", null_user: true, first_user: true, current_user: true) + .filter-item.inline.milestone-filter = select_tag('milestone_title', projects_milestones_options, class: 'select2 trigger-submit', include_blank: true, -- cgit v1.2.1 From efc679e4aa02954a8df1de6ed4359a09190f6221 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 30 Dec 2015 17:03:51 -0500 Subject: Fix "I see current user as the first user" step MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why did this break? `¯\_(ツ)_/¯` --- features/steps/project/issues/issues.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index 4a7ff21d385..8e8c9c57452 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -59,15 +59,14 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end step 'I click "author" dropdown' do - first('.ajax-users-select').click + first('#s2id_author_id').click end step 'I see current user as the first user' do - expect(page).to have_selector('.user-result', visible: true, count: 4) + expect(page).to have_selector('.user-result', visible: true, count: 3) users = page.all('.user-name') - expect(users[0].text).to eq 'Any Assignee' - expect(users[1].text).to eq 'Unassigned' - expect(users[2].text).to eq current_user.name + expect(users[0].text).to eq 'Any Author' + expect(users[1].text).to eq current_user.name end step 'I submit new issue "500 error on profile"' do -- cgit v1.2.1 From 00dc5f1b3ea738c602246bda11fc607042b3e76d Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 30 Dec 2015 18:22:06 -0500 Subject: Update CHANGELOG [ci skip] --- CHANGELOG | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index fc8ae9f8eb7..353d5060eba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,7 +11,6 @@ v 8.4.0 (unreleased) - Add CAS support (tduehr) - Add link to merge request on build detail page - Revert back upvote and downvote button to the issue and MR pages - - Enable "Add key" button when user fills in a proper key (Stan Hu) - Swap position of Assignee and Author selector on Issueables (Zeger-Jan van de Weg) v 8.3.3 (unreleased) -- cgit v1.2.1