Commit bdd3513f03a1db060051a29ffcf535821235eac1

Authored by Dmitriy Zaporozhets
2 parents 131aff76 53564d90

Merge pull request #5373 from rtripault/milestone-iid

Show milestones iid instead of id
app/views/projects/issues/_form.html.haml
1 1 %div.issue-form-holder
2   - %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
  2 + %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
3 3 = form_for [@project, @issue] do |f|
4 4 -if @issue.errors.any?
5 5 .alert.alert-error
... ...
app/views/projects/merge_requests/edit.html.haml
1 1 %h3.page-title
2   - = "Edit merge request ##{@merge_request.id}"
  2 + = "Edit merge request ##{@merge_request.iid}"
3 3 %hr
4 4 = render 'form'
... ...
app/views/projects/milestones/_form.html.haml
1   -%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
  1 +%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.iid}"
2 2 .back-link
3 3 = link_to project_milestones_path(@project) do
4 4 ← To milestones
... ...
app/views/projects/milestones/_merge_request.html.haml
1 1 %li
2 2 = link_to [@project, merge_request] do
3   - %span.badge.badge-info ##{merge_request.id}
  3 + %span.badge.badge-info ##{merge_request.iid}
4 4 –
5 5 = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]
... ...
app/views/projects/milestones/show.html.haml
1 1 = render "projects/issues/head"
2 2 %h3.page-title
3   - Milestone ##{@milestone.id}
  3 + Milestone ##{@milestone.iid}
4 4 %small
5 5 = @milestone.expires_at
6 6 .pull-right
... ...