Show iid as default id for issues, mr

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