Commit 12f649fe authored by Douwe Maan's avatar Douwe Maan

Merge branch 'rs-revert-title-change' into 'master'

Revert issuable title reordering

Reverts !6503, and uses `to_reference` rather than `iid` for `Issues#show` and `Issues#edit` titles.

See merge request !6983
parents f5608499 31d369b7
...@@ -105,7 +105,6 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -105,7 +105,6 @@ Please view this file on the master branch, on stable branches it's out of date.
- Optimize GitHub importing for speed and memory - Optimize GitHub importing for speed and memory
- API: expose pipeline data in builds API (!6502, Guilherme Salazar) - API: expose pipeline data in builds API (!6502, Guilherme Salazar)
- Notify the Merger about merge after successful build (Dimitris Karakasilis) - Notify the Merger about merge after successful build (Dimitris Karakasilis)
- Reorder issue and merge request titles to show IDs first. !6503 (Greg Laubenstein)
- Reduce queries needed to find users using their SSH keys when pushing commits - Reduce queries needed to find users using their SSH keys when pushing commits
- Prevent rendering the link to all when the author has no access (Katarzyna Kobierska Ula Budziszewska) - Prevent rendering the link to all when the author has no access (Katarzyna Kobierska Ula Budziszewska)
- Fix broken repository 500 errors in project list - Fix broken repository 500 errors in project list
......
- page_title "Edit", "#{@issue.to_reference} #{@issue.title}", "Issues" - page_title "Edit", "#{@issue.title} (#{@issue.to_reference})", "Issues"
%h3.page-title %h3.page-title
Edit Issue ##{@issue.iid} Edit Issue ##{@issue.iid}
......
- page_title "#{@issue.to_reference} #{@issue.title}", "Issues" - page_title "#{@issue.title} (#{@issue.to_reference})", "Issues"
- page_description @issue.description - page_description @issue.description
- page_card_attributes @issue.card_attributes - page_card_attributes @issue.card_attributes
......
- page_title "#{@merge_request.to_reference} #{@merge_request.title}", "Merge Requests" - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
- page_description @merge_request.description - page_description @merge_request.description
- page_card_attributes @merge_request.card_attributes - page_card_attributes @merge_request.card_attributes
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
......
- page_title "Edit", "#{@merge_request.to_reference} #{@merge_request.title}", "Merge Requests" - page_title "Edit", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
%h3.page-title %h3.page-title
Edit Merge Request #{@merge_request.to_reference} Edit Merge Request #{@merge_request.to_reference}
......
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