summaryrefslogtreecommitdiff
path: root/app/views/notify/new_merge_request_email.text.erb
diff options
context:
space:
mode:
authorJames Newton <james@Zaphyous.com>2013-08-29 21:26:32 -0500
committerJames Newton <james@Zaphyous.com>2013-08-29 21:26:32 -0500
commit850b4af0fffa77d5f3440d89015543f060d9ac67 (patch)
tree65143dfa315bcecad757206a528530e3ca42a6f6 /app/views/notify/new_merge_request_email.text.erb
parent25a723c3ae04c5818427682b2fbe97609a97f1ea (diff)
downloadgitlab-ce-850b4af0fffa77d5f3440d89015543f060d9ac67.tar.gz
have email views use iid
Diffstat (limited to 'app/views/notify/new_merge_request_email.text.erb')
-rw-r--r--app/views/notify/new_merge_request_email.text.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb
index 3f711840a51..2d27350486e 100644
--- a/app/views/notify/new_merge_request_email.text.erb
+++ b/app/views/notify/new_merge_request_email.text.erb
@@ -1,4 +1,4 @@
-New Merge Request <%= @merge_request.id %>
+New Merge Request <%= @merge_request.iid %>
<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>