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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
af657b05
Commit
af657b05
authored
Apr 02, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reset st_commits before setting new value to prevent error when old st_commits is broken
parent
d3559e25
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
app/models/merge_request.rb
app/models/merge_request.rb
+6
-0
No files found.
app/models/merge_request.rb
View file @
af657b05
...
@@ -172,6 +172,12 @@ class MergeRequest < ActiveRecord::Base
...
@@ -172,6 +172,12 @@ class MergeRequest < ActiveRecord::Base
def
reloaded_commits
def
reloaded_commits
if
opened?
&&
unmerged_commits
.
any?
if
opened?
&&
unmerged_commits
.
any?
# we need to reset st_commits field first
# in order to prevent internal rails comparison
self
.
st_commits
=
[]
save
# Then we can safely write unmerged commits
self
.
st_commits
=
unmerged_commits
self
.
st_commits
=
unmerged_commits
save
save
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