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
Jérome Perrin
gitlab-ce
Commits
34586c18
Commit
34586c18
authored
Sep 13, 2016
by
Katarzyna Kobierska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve grammar
parent
bef1292c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/helpers/merge_requests_helper.rb
app/helpers/merge_requests_helper.rb
+1
-1
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-1
No files found.
app/helpers/merge_requests_helper.rb
View file @
34586c18
...
@@ -98,7 +98,7 @@ module MergeRequestsHelper
...
@@ -98,7 +98,7 @@ module MergeRequestsHelper
end
end
def
merge_request_button_visibility
(
merge_request
,
closed
)
def
merge_request_button_visibility
(
merge_request
,
closed
)
return
'hidden'
if
merge_request
.
c
an_reopen
?
return
'hidden'
if
merge_request
.
c
losed?
==
closed
||
(
merge_request
.
merged?
==
closed
&&
!
merge_request
.
closed?
)
||
merge_request
.
closed_without_fork
?
end
end
def
merge_request_version_path
(
project
,
merge_request
,
merge_request_diff
,
start_sha
=
nil
)
def
merge_request_version_path
(
project
,
merge_request
,
merge_request_diff
,
start_sha
=
nil
)
...
...
spec/models/merge_request_spec.rb
View file @
34586c18
...
@@ -1101,7 +1101,7 @@ describe MergeRequest, models: true do
...
@@ -1101,7 +1101,7 @@ describe MergeRequest, models: true do
expect
(
merge_request
.
reload
.
can_reopen?
).
to
be_falsey
expect
(
merge_request
.
reload
.
can_reopen?
).
to
be_falsey
end
end
it
'return
e
s false if the merge request is merged'
do
it
'returns false if the merge request is merged'
do
merge_request
.
update_attributes
(
state:
'merged'
)
merge_request
.
update_attributes
(
state:
'merged'
)
expect
(
merge_request
.
reload
.
can_reopen?
).
to
be_falsey
expect
(
merge_request
.
reload
.
can_reopen?
).
to
be_falsey
...
...
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