deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor EditFileAction#update and rename it to commit!

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-26 01:59:50 +02:00
parent 3080127354
commit 700a784bc9
2 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/tree_controller.rb
View file

@ -26,14 +26,14 @@ class TreeController < ProjectResourceController
end
def update
file_editor = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
update_status = file_editor.update(
edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
updated_successfully = edit_file_action.commit!(
params[:content],
params[:commit_message],
params[:last_commit]
)
if update_status
if updated_successfully
redirect_to project_tree_path(@project, @id), notice: "Your changes have been successfully commited"
else
flash[:notice] = "Your changes could not be commited, because the file has been changed"