diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-11 14:58:39 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-11 14:58:39 +0200 |
commit | 986697a99bde07ea0d7e878f8618f801b6b81a8c (patch) | |
tree | 8123f73e9bda56df2496d15f2985d2c1a1a8dd8f /app/contexts | |
parent | c77d957b365bd023b1dc73b5f5111b4fe262bfbe (diff) | |
download | gitlab-ce-986697a99bde07ea0d7e878f8618f801b6b81a8c.tar.gz |
Refactor Create/Update file context and lib
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/contexts')
-rw-r--r-- | app/contexts/files/create_context.rb | 5 | ||||
-rw-r--r-- | app/contexts/files/update_context.rb | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/contexts/files/create_context.rb b/app/contexts/files/create_context.rb index e1554c47bd6..ae73b11bd54 100644 --- a/app/contexts/files/create_context.rb +++ b/app/contexts/files/create_context.rb @@ -33,11 +33,10 @@ module Files return error("Your changes could not be commited, because file with such name exists") end - new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, path) + new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path) created_successfully = new_file_action.commit!( params[:content], - params[:commit_message], - file_name, + params[:commit_message] ) if created_successfully diff --git a/app/contexts/files/update_context.rb b/app/contexts/files/update_context.rb index 000d3d02f12..f40c7496994 100644 --- a/app/contexts/files/update_context.rb +++ b/app/contexts/files/update_context.rb @@ -24,8 +24,7 @@ module Files new_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path) created_successfully = new_file_action.commit!( params[:content], - params[:commit_message], - params[:last_commit] + params[:commit_message] ) if created_successfully |