deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update satellite action docs

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-26 02:50:24 +02:00
parent 7192f86ed0
commit 904615c150
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab/satellite/merge_action.rb
View file

@ -1,5 +1,6 @@
module Gitlab
module Satellite
# GitLab server-side merge
class MergeAction < Action
attr_accessor :merge_request
@ -8,6 +9,7 @@ module Gitlab
@merge_request = merge_request
end
# Checks if a merge request can be executed without user interaction
def can_be_merged?
in_locked_and_timed_satellite do |merge_repo|
merge_in_satellite!(merge_repo)