From 5f16687805b4daa98f7227849d064345e68210d2 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 26 Oct 2012 00:39:23 +0200 Subject: [PATCH] Update arguments for Gitlab::Satellite::EditFileAction#initialize --- app/controllers/tree_controller.rb | 3 +-- lib/gitlab/satellite/edit_file_action.rb | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/tree_controller.rb b/app/controllers/tree_controller.rb index 60da719..7b52704 100644 --- a/app/controllers/tree_controller.rb +++ b/app/controllers/tree_controller.rb @@ -26,9 +26,8 @@ class TreeController < ProjectResourceController end 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( - @path, params[:content], params[:commit_message], params[:last_commit] diff --git a/lib/gitlab/satellite/edit_file_action.rb b/lib/gitlab/satellite/edit_file_action.rb index 8949f54..0a5e753 100644 --- a/lib/gitlab/satellite/edit_file_action.rb +++ b/lib/gitlab/satellite/edit_file_action.rb @@ -5,15 +5,16 @@ module Gitlab # It gives you ability to make changes to files # & commit this changes from GitLab UI. class EditFileAction < Action - attr_accessor :ref + attr_accessor :path, :ref - def initialize(user, project, ref) + def initialize(user, project, ref, path) super user, project + @path = path @ref = ref end - def update(path, content, commit_message, last_commit) - return false unless can_edit?(path, last_commit) + def update(content, commit_message, last_commit) + return false unless can_edit?(last_commit) in_locked_and_timed_satellite do |repo| prepare_satellite!(repo) @@ -34,7 +35,7 @@ module Gitlab protected - def can_edit?(path, last_commit) + def can_edit?(last_commit) current_last_commit = @project.last_commit_for(ref, path).sha last_commit == current_last_commit end -- libgit2 0.21.2