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
iv
gitlab-ce
Commits
ae6d0aaa
Commit
ae6d0aaa
authored
Apr 14, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'fix-stuck-mr' into 'master'"
This reverts commit
79b4d0b0
, reversing changes made to
a1e147ce
.
parent
6b479b6c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
CHANGELOG
CHANGELOG
+0
-1
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
No files found.
CHANGELOG
View file @
ae6d0aaa
...
@@ -73,7 +73,6 @@ v 7.10.0 (unreleased)
...
@@ -73,7 +73,6 @@ v 7.10.0 (unreleased)
- 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.
- Explicitly set image alt-attribute to prevent graphical glitches if gravatars could not be loaded
- Explicitly set image alt-attribute to prevent graphical glitches if gravatars could not be loaded
- 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 @
ae6d0aaa
...
@@ -361,6 +361,6 @@ class MergeRequest < ActiveRecord::Base
...
@@ -361,6 +361,6 @@ class MergeRequest < ActiveRecord::Base
end
end
def
locked_long_ago?
def
locked_long_ago?
locked_at
.
nil?
||
locked_at
<
(
Time
.
now
-
1
.
day
)
locked_at
&&
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