diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-19 22:12:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-19 22:12:40 +0300 |
| commit | 608f3286539fbcdb4727cb77623261fa506381ff (patch) | |
| tree | 66eaf28dc549c3cc2bfb3306ce0e3c6c5626cdef | |
| parent | c1583c6d74e7a7088cf6d22957851261de965f23 (diff) | |
| download | gitlab-ce-608f3286539fbcdb4727cb77623261fa506381ff.tar.gz | |
Show iid as default id for issues, mr
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 0f3c4f752eb..b9a2c18efdc 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.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 diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index fc6faa9c19d..d36a831432d 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -1,5 +1,5 @@ %h3.page-title - Issue ##{@issue.id} + Issue ##{@issue.iid} %small created at diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 276436a9c8e..933d78bcbfb 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -1,6 +1,6 @@ %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 diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 7dfc995121f..096a9167645 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -1,5 +1,5 @@ %h3.page-title - = "Merge Request ##{@merge_request.id}:" + = "Merge Request ##{@merge_request.iid}:" -if @merge_request.for_fork? %span.label-branch |