summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-22 12:45:39 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-22 12:45:39 +0100
commit6ddf4567f43497a10e7faddf98d0a5d467bf043c (patch)
tree12e98fe084d6104767f005a58bee96d29b799030
parent9e8aadb0f06f16248f82ae948ed7f875f8c0e2f2 (diff)
downloadgitlab-ce-6ddf4567f43497a10e7faddf98d0a5d467bf043c.tar.gz
Don't escape Html in patches
Fixes #2036
-rw-r--r--app/controllers/commit_controller.rb2
-rw-r--r--app/views/commit/show.patch.erb1
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/commit_controller.rb b/app/controllers/commit_controller.rb
index 97998352255..50556954817 100644
--- a/app/controllers/commit_controller.rb
+++ b/app/controllers/commit_controller.rb
@@ -26,7 +26,7 @@ class CommitController < ProjectResourceController
end
end
- format.patch
+ format.patch { render text: @commit.to_patch }
end
end
end
diff --git a/app/views/commit/show.patch.erb b/app/views/commit/show.patch.erb
deleted file mode 100644
index ce1c3d023f5..00000000000
--- a/app/views/commit/show.patch.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= @commit.to_patch %>