Commit 608f3286539fbcdb4727cb77623261fa506381ff

Authored by Dmitriy Zaporozhets
1 parent c1583c6d

Show iid as default id for issues, mr

app/views/projects/issues/_issue.html.haml
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue) 4 = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
5 5
6 .issue-title 6 .issue-title
7 - %span.light= "##{issue.id}" 7 + %span.light= "##{issue.iid}"
8 = link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title" 8 = link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title"
9 9
10 .issue-info 10 .issue-info
app/views/projects/issues/show.html.haml
1 %h3.page-title 1 %h3.page-title
2 - Issue ##{@issue.id} 2 + Issue ##{@issue.iid}
3 3
4 %small 4 %small
5 created at 5 created at
app/views/projects/merge_requests/_merge_request.html.haml
1 %li{ class: mr_css_classes(merge_request) } 1 %li{ class: mr_css_classes(merge_request) }
2 .merge-request-title 2 .merge-request-title
3 - %span.light= "##{merge_request.id}" 3 + %span.light= "##{merge_request.iid}"
4 = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title" 4 = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
5 - if merge_request.merged? 5 - if merge_request.merged?
6 %small.pull-right 6 %small.pull-right
app/views/projects/merge_requests/show/_mr_title.html.haml
1 %h3.page-title 1 %h3.page-title
2 - = "Merge Request ##{@merge_request.id}:" 2 + = "Merge Request ##{@merge_request.iid}:"
3   3  
4 -if @merge_request.for_fork? 4 -if @merge_request.for_fork?
5 %span.label-branch 5 %span.label-branch