Commit bdd3513f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #5373 from rtripault/milestone-iid

Show milestones iid instead of id
parents 131aff76 53564d90
%div.issue-form-holder %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| = form_for [@project, @issue] do |f|
-if @issue.errors.any? -if @issue.errors.any?
.alert.alert-error .alert.alert-error
......
%h3.page-title %h3.page-title
= "Edit merge request ##{@merge_request.id}" = "Edit merge request ##{@merge_request.iid}"
%hr %hr
= render 'form' = render 'form'
%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 .back-link
= link_to project_milestones_path(@project) do = link_to project_milestones_path(@project) do
← To milestones ← To milestones
......
%li %li
= link_to [@project, merge_request] do = 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] = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]
= render "projects/issues/head" = render "projects/issues/head"
%h3.page-title %h3.page-title
Milestone ##{@milestone.id} Milestone ##{@milestone.iid}
%small %small
= @milestone.expires_at = @milestone.expires_at
.pull-right .pull-right
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment