diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-22 12:23:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-22 12:23:08 +0000 |
| commit | 4c3c67a71ed3511bed445373c97ce5bdf56bdbb0 (patch) | |
| tree | f51294b257325e8f3633b3eb6531856daaba1100 | |
| parent | a612ac1cb453ec4b7b72fd8e3e26c30a27e62590 (diff) | |
| parent | 7bdddb481de831b9a00f00a75257b439647d9b82 (diff) | |
| download | gitlab-ce-4c3c67a71ed3511bed445373c97ce5bdf56bdbb0.tar.gz | |
Merge branch 'fix-failing-issue-tests' into 'master'
Fixed failing issues tests
Also removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93
See merge request !2911
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 12 | ||||
| -rw-r--r-- | features/steps/project/issues/issues.rb | 4 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 4 |
4 files changed, 7 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 12fb030760c..9a2c4b83ffb 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -163,7 +163,7 @@ display: inline-block; } - .merge-request-no-comments, .merge-request-no-votes { + .merge-request-no-comments { opacity: 0.5; } } @@ -237,5 +237,3 @@ } } } - - diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index b230b3a0110..b55f6a2d32a 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -25,23 +25,15 @@ = link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name") - upvotes, downvotes = merge_request.upvotes, merge_request.downvotes - - if upvotes > 0 || downvotes > 0 + - if upvotes > 0 %li = icon('thumbs-up') = upvotes - - else - %li{ class: 'merge-request-no-votes' } - = icon('thumbs-up') - = upvotes - - if upvotes > 0 || downvotes > 0 + - if downvotes > 0 %li = icon('thumbs-down') = downvotes - - else - %li{ class: 'merge-request-no-votes' } - = icon('thumbs-down') - = downvotes - note_count = merge_request.mr_and_commit_notes.user.count - if note_count > 0 diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index 54d64bacc52..565bf088b41 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -214,7 +214,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps page.within 'li.issue:nth-child(3)' do expect(page).to have_content 'Bugfix' - expect(page).to have_content '0 0' + expect(page).to_not have_content '0 0' end end end @@ -233,7 +233,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps page.within 'li.issue:nth-child(3)' do expect(page).to have_content 'Bugfix' - expect(page).to have_content '0 0' + expect(page).to_not have_content '0 0' end end end diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 2160d8645fd..dde864f5180 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -164,7 +164,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps page.within 'li.merge-request:nth-child(3)' do expect(page).to have_content 'Bug NS-05' - expect(page).to have_content '0 0' + expect(page).to_not have_content '0 0' end end end @@ -183,7 +183,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps page.within 'li.merge-request:nth-child(3)' do expect(page).to have_content 'Bug NS-05' - expect(page).to have_content '0 0' + expect(page).to_not have_content '0 0' end end end |