summaryrefslogtreecommitdiff
path: root/app/services/commits
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-03-03 07:23:49 -0600
committerDouwe Maan <douwe@selenight.nl>2017-03-03 07:23:49 -0600
commit358897bcbfa7e907511f29cf80acc315ade160b1 (patch)
treecb5b69801f95dc60c80005d9962294713eca8bdb /app/services/commits
parentcaed61adeee1b5f1bf6943abd53e381ca31588c6 (diff)
downloadgitlab-ce-358897bcbfa7e907511f29cf80acc315ade160b1.tar.gz
Remove useless assignmentdm-fix-cherry-pick
Diffstat (limited to 'app/services/commits')
-rw-r--r--app/services/commits/change_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb
index 3dcecee9365..1297a792259 100644
--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -37,7 +37,7 @@ module Commits
start_branch_name: @start_branch)
success
- rescue Repository::CreateTreeError => e
+ rescue Repository::CreateTreeError
error_msg = "Sorry, we cannot #{action.to_s.dasherize} this #{@commit.change_type_title(current_user)} automatically.
A #{action.to_s.dasherize} may have already been performed with this #{@commit.change_type_title(current_user)}, or a more recent commit may have updated some of its content."
raise ChangeError, error_msg