Skip to content
Snippets Groups Projects
Commit 904615c1 authored by Riyad Preukschas's avatar Riyad Preukschas
Browse files

Update satellite action docs

parent 7192f86e
No related branches found
No related tags found
1 merge request!1818Refactor Satellite Code
module Gitlab
module Satellite
# GitLab file editor
#
# It gives you ability to make changes to files
# & commit this changes from GitLab UI.
# GitLab server-side file update and commit
class EditFileAction < Action
attr_accessor :file_path, :ref
 
Loading
Loading
@@ -13,6 +10,12 @@ module Gitlab
@ref = ref
end
 
# Updates the files content and creates a new commit for it
#
# Returns false if the ref has been updated while editing the file
# Returns false if commiting the change fails
# Returns false if pushing from the satellite to Gitolite failed or was rejected
# Returns true otherwise
def commit!(content, commit_message, last_commit)
return false unless can_edit?(last_commit)
 
Loading
Loading
module Gitlab
module Satellite
# GitLab server-side merge
class MergeAction < Action
attr_accessor :merge_request
 
Loading
Loading
@@ -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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment