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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9e6c5853
Commit
9e6c5853
authored
Dec 21, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing spec squash.
parent
2c4997a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+1
-1
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+0
-4
No files found.
app/views/projects/merge_requests/widget/_open.html.haml
View file @
9e6c5853
...
...
@@ -54,7 +54,7 @@
.mr-widget-footer
{
'v-show'
=>
'!showApprovals'
}
=
icon
(
"spinner spin"
)
Checking approval status for this merge request.
.approvals-component
{
'v-show'
=>
'showApprovals'
}
.approvals-component
s
{
'v-show'
=>
'showApprovals'
}
=
render
'projects/merge_requests/widget/open/approvals_body'
=
render
'projects/merge_requests/widget/open/approvals_footer'
...
...
spec/features/merge_requests/approvals_spec.rb
View file @
9e6c5853
...
...
@@ -197,10 +197,6 @@ feature 'Merge request approvals', js: true, feature: true do
it
'I am able to approve'
do
approve_merge_request
page
.
within
'.mr-state-widget'
do
click_button
'Approve Merge Request'
end
wait_for_ajax
expect
(
page
).
to
have_content
(
'Approved by'
)
expect
(
page
).
to
have_css
(
'.approver-avatar'
)
...
...
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