From 60cceb180ebb7410b49fdcfcc164950ed78af5b4 Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Tue, 7 Feb 2017 19:08:51 +0600 Subject: [PATCH 1/4] fixes special character encoding problem in issue and mr list --- app/views/projects/issues/_issue.html.haml | 2 +- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 085b2fc2814a..6931a6777374 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -6,7 +6,7 @@ .issue-title.title %span.issue-title-text = confidential_icon(issue) - = link_to issue.title, issue_path(issue) + = link_to sanitize(issue.title), issue_path(issue) %ul.controls - if issue.closed? %li diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 4dbb97b3228b..63c637397480 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -5,7 +5,7 @@ .merge-request-title.title %span.merge-request-title-text - = link_to merge_request.title, merge_request_path(merge_request) + = link_to sanitize(merge_request.title), merge_request_path(merge_request) %ul.controls - if merge_request.merged? %li -- GitLab From 31c577041b77e55f3074170600ac428cb02e38ce Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Tue, 7 Feb 2017 19:25:02 +0600 Subject: [PATCH 2/4] adds changelog --- .../27678-special-character-issue-in-mr-and-issue-list.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/27678-special-character-issue-in-mr-and-issue-list.yml diff --git a/changelogs/unreleased/27678-special-character-issue-in-mr-and-issue-list.yml b/changelogs/unreleased/27678-special-character-issue-in-mr-and-issue-list.yml new file mode 100644 index 000000000000..aa915c3990f3 --- /dev/null +++ b/changelogs/unreleased/27678-special-character-issue-in-mr-and-issue-list.yml @@ -0,0 +1,4 @@ +--- +title: Fixes special charater issue for MR and issue title in list page +merge_request: 9027 +author: -- GitLab From 3466e77cb1ac494266d5c606f67a4111fefbbedd Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Wed, 8 Feb 2017 11:26:20 +0600 Subject: [PATCH 3/4] escape character in mr and issue title --- app/views/projects/issues/_issue.html.haml | 2 +- app/views/projects/issues/show.html.haml | 2 +- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- app/views/projects/merge_requests/show/_mr_box.html.haml | 2 +- 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 6931a6777374..085b2fc2814a 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -6,7 +6,7 @@ .issue-title.title %span.issue-title-text = confidential_icon(issue) - = link_to sanitize(issue.title), issue_path(issue) + = link_to issue.title, issue_path(issue) %ul.controls - if issue.closed? %li diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index a2305f4f5476..b5dd1098d2cf 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -58,7 +58,7 @@ .issue-details.issuable-details .detail-page-description.content-block{ class: ('hide-bottom-border' unless @issue.description.present? ) } %h2.title - = markdown_field(@issue, :title) + = @issue.title - if @issue.description.present? .description{ class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '' } .wiki diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 63c637397480..4dbb97b3228b 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -5,7 +5,7 @@ .merge-request-title.title %span.merge-request-title-text - = link_to sanitize(merge_request.title), merge_request_path(merge_request) + = link_to merge_request.title, merge_request_path(merge_request) %ul.controls - if merge_request.merged? %li diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 683cb8a5a27a..962364cb5e88 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -1,6 +1,6 @@ .detail-page-description.content-block %h2.title - = markdown_field(@merge_request, :title) + = @merge_request.title %div - if @merge_request.description.present? -- GitLab From 6aacc1263764e9b7d187d3a9eecb2eb6eacd8b57 Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Wed, 8 Feb 2017 11:28:54 +0600 Subject: [PATCH 4/4] changed changelog title --- .../27678-special-character-issue-in-mr-and-issue-list.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/27678-special-character-issue-in-mr-and-issue-list.yml b/changelogs/unreleased/27678-special-character-issue-in-mr-and-issue-list.yml index aa915c3990f3..26e8cf96352b 100644 --- a/changelogs/unreleased/27678-special-character-issue-in-mr-and-issue-list.yml +++ b/changelogs/unreleased/27678-special-character-issue-in-mr-and-issue-list.yml @@ -1,4 +1,4 @@ --- -title: Fixes special charater issue for MR and issue title in list page +title: Fixes html escaping issue in MR and Issue title merge_request: 9027 author: -- GitLab