Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
51c17329
Commit
51c17329
authored
Feb 22, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing issues tests
Removed up/down vote icons from merge requests. Was missed from
d8069bd8
parent
1d9863c1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
14 deletions
+6
-14
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+2
-10
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+2
-2
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+2
-2
No files found.
app/views/projects/merge_requests/_merge_request.html.haml
View file @
51c17329
...
@@ -25,23 +25,15 @@
...
@@ -25,23 +25,15 @@
=
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
,
name:
false
,
title:
"Assigned to :name"
)
=
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
,
name:
false
,
title:
"Assigned to :name"
)
-
upvotes
,
downvotes
=
merge_request
.
upvotes
,
merge_request
.
downvotes
-
upvotes
,
downvotes
=
merge_request
.
upvotes
,
merge_request
.
downvotes
-
if
upvotes
>
0
||
downvotes
>
0
-
if
upvotes
>
0
%li
%li
=
icon
(
'thumbs-up'
)
=
icon
(
'thumbs-up'
)
=
upvotes
=
upvotes
-
else
%li
{
class:
'merge-request-no-votes'
}
=
icon
(
'thumbs-up'
)
=
upvotes
-
if
upvotes
>
0
||
downvotes
>
0
-
if
downvotes
>
0
%li
%li
=
icon
(
'thumbs-down'
)
=
icon
(
'thumbs-down'
)
=
downvotes
=
downvotes
-
else
%li
{
class:
'merge-request-no-votes'
}
=
icon
(
'thumbs-down'
)
=
downvotes
-
note_count
=
merge_request
.
mr_and_commit_notes
.
user
.
count
-
note_count
=
merge_request
.
mr_and_commit_notes
.
user
.
count
-
if
note_count
>
0
-
if
note_count
>
0
...
...
features/steps/project/issues/issues.rb
View file @
51c17329
...
@@ -214,7 +214,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
...
@@ -214,7 +214,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
page
.
within
'li.issue:nth-child(3)'
do
page
.
within
'li.issue:nth-child(3)'
do
expect
(
page
).
to
have_content
'Bugfix'
expect
(
page
).
to
have_content
'Bugfix'
expect
(
page
).
to
have_content
'0 0'
expect
(
page
).
to
_not
have_content
'0 0'
end
end
end
end
end
end
...
@@ -233,7 +233,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
...
@@ -233,7 +233,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
page
.
within
'li.issue:nth-child(3)'
do
page
.
within
'li.issue:nth-child(3)'
do
expect
(
page
).
to
have_content
'Bugfix'
expect
(
page
).
to
have_content
'Bugfix'
expect
(
page
).
to
have_content
'0 0'
expect
(
page
).
to
_not
have_content
'0 0'
end
end
end
end
end
end
...
...
features/steps/project/merge_requests.rb
View file @
51c17329
...
@@ -164,7 +164,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -164,7 +164,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
page
.
within
'li.merge-request:nth-child(3)'
do
page
.
within
'li.merge-request:nth-child(3)'
do
expect
(
page
).
to
have_content
'Bug NS-05'
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
end
end
end
...
@@ -183,7 +183,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -183,7 +183,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
page
.
within
'li.merge-request:nth-child(3)'
do
page
.
within
'li.merge-request:nth-child(3)'
do
expect
(
page
).
to
have_content
'Bug NS-05'
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
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment