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
d4e36640
Commit
d4e36640
authored
Oct 20, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug in MergeRequest#mark_as_unmergable
parent
122769e3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/models/merge_request.rb
app/models/merge_request.rb
+2
-1
No files found.
app/models/merge_request.rb
View file @
d4e36640
...
@@ -135,7 +135,8 @@ class MergeRequest < ActiveRecord::Base
...
@@ -135,7 +135,8 @@ class MergeRequest < ActiveRecord::Base
end
end
def
mark_as_unmergable
def
mark_as_unmergable
self
.
update_attributes
state:
CANNOT_BE_MERGED
self
.
state
=
CANNOT_BE_MERGED
self
.
save
end
end
def
reloaded_commits
def
reloaded_commits
...
...
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