diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-15 10:23:45 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-15 10:23:45 +0300 |
| commit | 014eff5d8f0081820f3f7a9ac905ab894e101dd7 (patch) | |
| tree | b66227952927ee5be657dfa2847af88accb094e0 | |
| parent | 0602c5d0279dba64bd3a34d2cc8ce39224ccaa49 (diff) | |
| parent | fe465004489024f731835d5eb934efa2decf6ac3 (diff) | |
| download | gitlab-ce-014eff5d8f0081820f3f7a9ac905ab894e101dd7.tar.gz | |
Merge pull request #7499 from skv-headless/fix-commit-msg
Fix commit msg
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index f2b0699f136..2bc9048b2ad 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -55,4 +55,4 @@ = gfm escape_once(@commit.title) - if @commit.description.present? %pre.commit-description - = gfm escape_once(@commit.description) + = preserve(gfm(escape_once(@commit.description))) diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index abe0d4cff46..8e73663939f 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -23,7 +23,7 @@ - if commit.description? .commit-row-description.js-toggle-content %pre - = commit.description + = preserve(gfm(escape_once(commit.description))) .commit-row-info = commit_author_link(commit, avatar: true, size: 16) |