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
Tatuya Kamada
gitlab-ce
Commits
a1db7077
Commit
a1db7077
authored
Jun 10, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused MergeRequest#gitlab_merge_status method
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
37be2007
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
8 deletions
+0
-8
app/models/merge_request.rb
app/models/merge_request.rb
+0
-8
No files found.
app/models/merge_request.rb
View file @
a1db7077
...
@@ -276,14 +276,6 @@ class MergeRequest < ActiveRecord::Base
...
@@ -276,14 +276,6 @@ class MergeRequest < ActiveRecord::Base
true
true
end
end
def
gitlab_merge_status
if
work_in_progress?
"work_in_progress"
else
merge_status_name
end
end
def
can_cancel_merge_when_build_succeeds?
(
current_user
)
def
can_cancel_merge_when_build_succeeds?
(
current_user
)
can_be_merged_by?
(
current_user
)
||
self
.
author
==
current_user
can_be_merged_by?
(
current_user
)
||
self
.
author
==
current_user
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