Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
a5a5169351d9
Unverified
Commit
64874193
authored
Dec 05, 2014
by
Dmitriy Zaporozhets
Browse files
Automatically close merge requests that were locker for 1 day
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
eb045eb35177
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/merge_requests_controller.rb
View file @
a5a51693
...
...
@@ -225,6 +225,11 @@ def define_show_vars
@allowed_to_merge
=
allowed_to_merge?
@show_merge_controls
=
@merge_request
.
open?
&&
@commits
.
any?
&&
@allowed_to_merge
@source_branch
=
@merge_request
.
source_project
.
repository
.
find_branch
(
@merge_request
.
source_branch
).
try
(
:name
)
if
@merge_request
.
locked_long_ago?
@merge_request
.
unlock_mr
@merge_request
.
close
end
end
def
allowed_to_merge?
...
...
app/models/merge_request.rb
View file @
a5a51693
...
...
@@ -346,4 +346,8 @@ def source_branches
source_project
.
repository
.
branch_names
end
end
def
locked_long_ago?
locked_at
&&
locked_at
<
(
Time
.
now
-
1
.
day
)
end
end
app/views/projects/merge_requests/show/_state_widget.html.haml
View file @
a5a51693
...
...
@@ -11,8 +11,10 @@
-
if
@merge_request
.
closed?
%h4
Closed by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
,
avatar:
false
)
}
#{
time_ago_with_tooltip
(
@merge_request
.
closed_event
.
created_at
)
}
Closed
-
if
@merge_request
.
closed_event
by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
,
avatar:
false
)
}
#{
time_ago_with_tooltip
(
@merge_request
.
closed_event
.
created_at
)
}
%p
Changes were not merged into target branch
-
if
@merge_request
.
merged?
...
...
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