Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
f517dd26
Commit
f517dd26
authored
Apr 14, 2015
by
Ben Bodenmiller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix stuck mr
fixes #348. related to
64874193
.
parent
4ab717ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
CHANGELOG
CHANGELOG
+1
-0
app/models/merge_request.rb
app/models/merge_request.rb
+3
-1
No files found.
CHANGELOG
View file @
f517dd26
...
...
@@ -73,6 +73,7 @@ v 7.10.0 (unreleased)
- Fix git over ssh errors 'fatal: protocol error: bad line length character'
- Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled
- Bust group page project list cache when namespace name or path changes.
- Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)
v 7.9.3
- Contains no changes
...
...
app/models/merge_request.rb
View file @
f517dd26
...
...
@@ -361,6 +361,8 @@ def source_branches
end
def
locked_long_ago?
locked_at
&&
locked_at
<
(
Time
.
now
-
1
.
day
)
return
false
unless
locked?
locked_at
.
nil?
||
locked_at
<
(
Time
.
now
-
1
.
day
)
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