summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-02-01 14:32:15 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-02-19 13:14:49 -0500
commit0b7d70a35ee8e743e69102c3ee6d7c73d7f4a89a (patch)
tree5beff56c3f93ceaca6d860c53a768e8c8f629e50 /app
parente1a3c8cd1a4f2a9a8a8cb4bc2df50398fbf1d604 (diff)
downloadgitlab-ce-0b7d70a35ee8e743e69102c3ee6d7c73d7f4a89a.tar.gz
Use #iid for revert branch name so it's consistent when the MR id in the URL.
Diffstat (limited to 'app')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index bb9295e1b68..8d26b1788e1 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -535,6 +535,6 @@ class MergeRequest < ActiveRecord::Base
end
def revert_branch_name
- "revert-#{id}-#{target_branch}"
+ "revert-#{iid}-#{target_branch}"
end
end