2013-11-05 10:06:52 +00:00
|
|
|
module Files
|
2014-01-16 17:03:42 +00:00
|
|
|
class BaseService < ::BaseService
|
2015-08-11 12:33:31 +00:00
|
|
|
class ValidationError < StandardError; end
|
2013-11-05 10:06:52 +00:00
|
|
|
|
2015-08-11 12:33:31 +00:00
|
|
|
def execute
|
|
|
|
@current_branch = params[:current_branch]
|
|
|
|
@target_branch = params[:target_branch]
|
|
|
|
@commit_message = params[:commit_message]
|
|
|
|
@file_path = params[:file_path]
|
|
|
|
@file_content = if params[:file_content_encoding] == 'base64'
|
|
|
|
Base64.decode64(params[:file_content])
|
|
|
|
else
|
|
|
|
params[:file_content]
|
|
|
|
end
|
|
|
|
|
|
|
|
# Validate parameters
|
|
|
|
validate
|
|
|
|
|
|
|
|
# Create new branch if it different from current_branch
|
|
|
|
if @target_branch != @current_branch
|
|
|
|
create_target_branch
|
|
|
|
end
|
|
|
|
|
2015-10-03 05:56:37 +00:00
|
|
|
if commit
|
2015-08-11 12:33:31 +00:00
|
|
|
success
|
|
|
|
else
|
|
|
|
error("Something went wrong. Your changes were not committed")
|
|
|
|
end
|
2015-11-26 00:20:40 +00:00
|
|
|
rescue Repository::CommitError, GitHooksService::PreReceiveError, ValidationError => ex
|
2015-08-11 12:33:31 +00:00
|
|
|
error(ex.message)
|
2013-11-05 10:06:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
2015-08-11 12:33:31 +00:00
|
|
|
def current_branch
|
|
|
|
@current_branch ||= params[:current_branch]
|
|
|
|
end
|
|
|
|
|
|
|
|
def target_branch
|
|
|
|
@target_branch ||= params[:target_branch]
|
|
|
|
end
|
|
|
|
|
|
|
|
def raise_error(message)
|
|
|
|
raise ValidationError.new(message)
|
|
|
|
end
|
|
|
|
|
|
|
|
def validate
|
|
|
|
allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(@target_branch)
|
|
|
|
|
|
|
|
unless allowed
|
|
|
|
raise_error("You are not allowed to push into this branch")
|
|
|
|
end
|
|
|
|
|
|
|
|
unless project.empty_repo?
|
|
|
|
unless repository.branch_names.include?(@current_branch)
|
2015-12-08 16:10:07 +00:00
|
|
|
raise_error("You can only create or edit files when you are on top of a branch")
|
2015-08-11 12:33:31 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
if @current_branch != @target_branch
|
|
|
|
if repository.branch_names.include?(@target_branch)
|
|
|
|
raise_error("Branch with such name already exists. You need to switch to this branch in order to make changes")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def create_target_branch
|
|
|
|
result = CreateBranchService.new(project, current_user).execute(@target_branch, @current_branch)
|
|
|
|
|
|
|
|
unless result[:status] == :success
|
|
|
|
raise_error("Something went wrong when we tried to create #{@target_branch} for you")
|
|
|
|
end
|
2015-08-11 08:28:42 +00:00
|
|
|
end
|
2013-11-05 10:06:52 +00:00
|
|
|
end
|
|
|
|
end
|