提交 5f166878 编写于 作者: R Riyad Preukschas

Update arguments for Gitlab::Satellite::EditFileAction#initialize

上级 55779b00
...@@ -26,9 +26,8 @@ class TreeController < ProjectResourceController ...@@ -26,9 +26,8 @@ class TreeController < ProjectResourceController
end end
def update def update
file_editor = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref) file_editor = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
update_status = file_editor.update( update_status = file_editor.update(
@path,
params[:content], params[:content],
params[:commit_message], params[:commit_message],
params[:last_commit] params[:last_commit]
......
...@@ -5,15 +5,16 @@ module Gitlab ...@@ -5,15 +5,16 @@ module Gitlab
# It gives you ability to make changes to files # It gives you ability to make changes to files
# & commit this changes from GitLab UI. # & commit this changes from GitLab UI.
class EditFileAction < Action class EditFileAction < Action
attr_accessor :ref attr_accessor :path, :ref
def initialize(user, project, ref) def initialize(user, project, ref, path)
super user, project super user, project
@path = path
@ref = ref @ref = ref
end end
def update(path, content, commit_message, last_commit) def update(content, commit_message, last_commit)
return false unless can_edit?(path, last_commit) return false unless can_edit?(last_commit)
in_locked_and_timed_satellite do |repo| in_locked_and_timed_satellite do |repo|
prepare_satellite!(repo) prepare_satellite!(repo)
...@@ -34,7 +35,7 @@ module Gitlab ...@@ -34,7 +35,7 @@ module Gitlab
protected protected
def can_edit?(path, last_commit) def can_edit?(last_commit)
current_last_commit = @project.last_commit_for(ref, path).sha current_last_commit = @project.last_commit_for(ref, path).sha
last_commit == current_last_commit last_commit == current_last_commit
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册