diff options
| author | Romain <romain@melting-media.com> | 2013-10-19 09:23:51 +0200 |
|---|---|---|
| committer | Romain <romain@melting-media.com> | 2013-10-19 09:23:51 +0200 |
| commit | 53564d90099dacec79f8a4fca010999a3381d9e1 (patch) | |
| tree | 8f3563f5b5d175af459f34d4f4b27af7aae31659 | |
| parent | bae18f0a9865edd607e64e78be96c4db0a25fe89 (diff) | |
| download | gitlab-ce-53564d90099dacec79f8a4fca010999a3381d9e1.tar.gz | |
A few other iids instead of ids (mostly in edit forms)
| -rw-r--r-- | app/views/projects/issues/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/_merge_request.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml index 6acad9134d1..05cfb2788be 100644 --- a/app/views/projects/issues/_form.html.haml +++ b/app/views/projects/issues/_form.html.haml @@ -1,5 +1,5 @@ %div.issue-form-holder - %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}" + %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}" = form_for [@project, @issue] do |f| -if @issue.errors.any? .alert.alert-error diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml index 67a1541d9bf..839c63986ab 100644 --- a/app/views/projects/merge_requests/edit.html.haml +++ b/app/views/projects/merge_requests/edit.html.haml @@ -1,4 +1,4 @@ %h3.page-title - = "Edit merge request ##{@merge_request.id}" + = "Edit merge request ##{@merge_request.iid}" %hr = render 'form' diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index 78e4cd2243e..b2fd1a9284d 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -1,4 +1,4 @@ -%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}" +%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.iid}" .back-link = link_to project_milestones_path(@project) do ← To milestones diff --git a/app/views/projects/milestones/_merge_request.html.haml b/app/views/projects/milestones/_merge_request.html.haml index 7f815894069..8e30a42a608 100644 --- a/app/views/projects/milestones/_merge_request.html.haml +++ b/app/views/projects/milestones/_merge_request.html.haml @@ -1,5 +1,5 @@ %li = link_to [@project, merge_request] do - %span.badge.badge-info ##{merge_request.id} + %span.badge.badge-info ##{merge_request.iid} – = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request] |