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
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
Show 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)
...
@@ -73,6 +73,7 @@ v 7.10.0 (unreleased)
- Fix git over ssh errors 'fatal: protocol error: bad line length character'
- 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
- 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.
- 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
v 7.9.3
- Contains no changes
- Contains no changes
...
...
app/models/merge_request.rb
View file @
f517dd26
...
@@ -361,6 +361,8 @@ class MergeRequest < ActiveRecord::Base
...
@@ -361,6 +361,8 @@ class MergeRequest < ActiveRecord::Base
end
end
def
locked_long_ago?
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
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