summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorgitlabhq <m@gitlabhq.com>2011-11-01 20:29:46 +0200
committergitlabhq <m@gitlabhq.com>2011-11-01 20:29:46 +0200
commitbabd0557cb5ca874769b5b83fd9298a6efabb2ef (patch)
tree5c40cbae1727bee599a95896888bb9197f71eb2d /app/views
parente8d10b321716154421a0642e4d9f48d00c3aa56b (diff)
parent267bd6068c7a57316ef357f9385e12fea6c8d69f (diff)
downloadgitlab-ce-babd0557cb5ca874769b5b83fd9298a6efabb2ef.tar.gz
Merge branch 'dev' into new_layout
Conflicts: app/assets/stylesheets/projects.css.scss
Diffstat (limited to 'app/views')
-rw-r--r--app/views/commits/show.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml
index 3beeada8c8c..3227a447a60 100644
--- a/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@ -16,7 +16,9 @@
%td= @commit.committed_date
%tr
%td Message
- %td= @commit.safe_message
+ %td
+ %pre.commit_message
+ = preserve @commit.safe_message
%tr
%td Tree
%td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)