diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-10-27 10:16:36 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-10-27 10:16:36 +0000 |
commit | d165b684eff674ed572c57852bb83f680facecb1 (patch) | |
tree | 2111f0d93234a536e97fa03b3f088d2390512c0e | |
parent | 2c1fd83a4ad742c2b2a9165ef4decc9305fe635a (diff) | |
parent | 9293c7d8d95cfb444303bb113b84853fcda46aad (diff) | |
download | gitlab-ce-d165b684eff674ed572c57852bb83f680facecb1.tar.gz |
Merge branch '23258-invalid-encoding' into 'master'
Fix encoding issues on pipeline commits
## What does this MR do?
#### What does this MR do?
Sets `escape: false` on `truncate` method to fix commit message on pipelines page
#### Screenshots (if relevant)
Before:
![Screen_Shot_2016-10-12_at_8.53.10_AM](/uploads/5e26e98a272139fe2264c315d579178f/Screen_Shot_2016-10-12_at_8.53.10_AM.png)
After:
![Screen_Shot_2016-10-12_at_8.52.49_AM](/uploads/58c6c69f2ba735fdcd5a0b6922b56aa7/Screen_Shot_2016-10-12_at_8.52.49_AM.png)
#### What are the relevant issue numbers?
Closes #23258
See merge request !6832
-rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index f16d0b22538..840f468dc05 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -37,7 +37,7 @@ %p.commit-title - if commit = pipeline.commit = author_avatar(commit, size: 20) - = link_to_gfm truncate(commit.title, length: 60), namespace_project_commit_path(pipeline.project.namespace, pipeline.project, commit.id), class: "commit-row-message" + = link_to_gfm truncate(commit.title, length: 60, escape: false), namespace_project_commit_path(pipeline.project.namespace, pipeline.project, commit.id), class: "commit-row-message" - else Cant find HEAD commit for this branch |