diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:52:33 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:52:33 +0300 |
commit | 9bc512314a6a11e075539ada1d1d032b6992d039 (patch) | |
tree | af4919663a45cddc6022efb5ea10b37fdc33b55e /app/services | |
parent | 08066059623184dbd55f0591fa05adc18ed80580 (diff) |
Revert "Create and edit files in web editor via rugged"
This reverts commit 734a4ba87de7bc8cf152c5bc7f93ba04210b282d.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/files/create_service.rb | 24 | ||||
-rw-r--r-- | app/services/files/update_service.rb | 24 |
2 files changed, 14 insertions, 34 deletions
diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb index c0cf5956326..23833aa78ec 100644 --- a/app/services/files/create_service.rb +++ b/app/services/files/create_service.rb @@ -33,24 +33,14 @@ module Files end end - if params[:encoding] == 'base64' - new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path) - created_successfully = new_file_action.commit!( - params[:content], - params[:commit_message], - params[:encoding], - params[:new_branch] - ) - else - created_successfull = repository.commit_file( - current_user, - file_path, - params[:content], - params[:commit_message], - params[:new_branch] || ref - ) - end + new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path) + created_successfully = new_file_action.commit!( + params[:content], + params[:commit_message], + params[:encoding], + params[:new_branch] + ) if created_successfully success diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 5efd43d16ce..0724d3ae634 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -19,23 +19,13 @@ module Files return error("You can only edit text files") end - if params[:encoding] == 'base64' - edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path) - edit_file_action.commit!( - params[:content], - params[:commit_message], - params[:encoding], - params[:new_branch] - ) - else - repository.commit_file( - current_user, - path, - params[:content], - params[:commit_message], - params[:new_branch] || ref - ) - end + edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path) + edit_file_action.commit!( + params[:content], + params[:commit_message], + params[:encoding], + params[:new_branch] + ) success rescue Gitlab::Satellite::CheckoutFailed => ex |