ade0c2c892
Currently when a user performs an update of a file through the UI and there has already been a change committed to the file the previous commits will be overwritten without a check to see if the file has been changed. This commit uses the last commit sha at the time the user starts editing the file and compares it with the current sha of the file being edited to ensure they are the same before committing the file. If the shas do not match we throw an exception preventing the commit from the commit from occurring. Fixes #5857
35 lines
906 B
Ruby
35 lines
906 B
Ruby
require_relative "base_service"
|
|
|
|
module Files
|
|
class UpdateService < Files::BaseService
|
|
class FileChangedError < StandardError; end
|
|
|
|
def commit
|
|
repository.update_file(current_user, @file_path, @file_content,
|
|
branch: @target_branch,
|
|
previous_path: @previous_path,
|
|
message: @commit_message)
|
|
end
|
|
|
|
private
|
|
|
|
def validate
|
|
super
|
|
|
|
if file_has_changed?
|
|
raise FileChangedError.new("You are attempting to update a file that has changed since you started editing it.")
|
|
end
|
|
end
|
|
|
|
def file_has_changed?
|
|
return false unless @last_commit_sha && last_commit
|
|
|
|
@last_commit_sha != last_commit.sha
|
|
end
|
|
|
|
def last_commit
|
|
@last_commit ||= Gitlab::Git::Commit.
|
|
last_for_path(@source_project.repository, @source_branch, @file_path)
|
|
end
|
|
end
|
|
end
|