diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-20 19:33:34 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-20 19:51:50 +0300 |
| commit | 4984c8d669440bd9cbbcc4dd15d969610fb6c9dd (patch) | |
| tree | 0d87ea0edda7d6ffc268b70476b308612cb67d2e /features | |
| parent | 81978178ddbf92a6a87456c2622e7b22cb7f0b1a (diff) | |
Merge branch 'update_issues_mr_counter' into 'master'
Fix issues with wrong issues/merge request counts when filters are selected
Closes #15356 plus counter for issues and MR are now displayed for the these paths `https://gitlab.com/groups/group-name/issues` `https://gitlab.com/groups/group-name/merge_requests` `https://gitlab.com/dashboard/issues` and `https://gitlab.com/dashboard/merge_requests`
See merge request !4960
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/issues/issues.rb | 2 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index e21f76d00d9..ed7241679ee 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -356,6 +356,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end def filter_issue(text) - fill_in 'issue_search', with: text + fill_in 'issuable_search', with: text end end diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index df17b5626c6..4a67cf06fba 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -493,7 +493,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I fill in merge request search with "Fe"' do - fill_in 'issue_search', with: "Fe" + fill_in 'issuable_search', with: "Fe" end step 'I click the "Target branch" dropdown' do |