Download as
Browse Code »

Commit 53564d90099dacec79f8a4fca010999a3381d9e1

Authored by Romain
1 parent bae18f0a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

A few other iids instead of ids (mostly in edit forms)

Showing 4 changed files with 4 additions and 4 deletions   Show diff stats
app/views/projects/issues/_form.html.haml
  Diff comments   View file @53564d9
1 %div.issue-form-holder 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 = form_for [@project, @issue] do |f| 3 = form_for [@project, @issue] do |f|
4 -if @issue.errors.any? 4 -if @issue.errors.any?
5 .alert.alert-error 5 .alert.alert-error
app/views/projects/merge_requests/edit.html.haml
  Diff comments   View file @53564d9
1 %h3.page-title 1 %h3.page-title
2 - = "Edit merge request ##{@merge_request.id}" 2 + = "Edit merge request ##{@merge_request.iid}"
3 %hr 3 %hr
4 = render 'form' 4 = render 'form'
app/views/projects/milestones/_form.html.haml
  Diff comments   View file @53564d9
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 .back-link 2 .back-link
3 = link_to project_milestones_path(@project) do 3 = link_to project_milestones_path(@project) do
4 ← To milestones 4 ← To milestones
app/views/projects/milestones/_merge_request.html.haml
  Diff comments   View file @53564d9
1 %li 1 %li
2 = link_to [@project, merge_request] do 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 = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request] 5 = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]