summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2016-02-03 18:21:14 -0500
committerJosh Frye <joshfng@gmail.com>2016-02-04 13:03:41 -0500
commit2ad094132de3c491511261bf0e6a2e577fd699dd (patch)
tree7ba4cf6ed687cde58b13a0c4151ac243db09e47f /app/controllers/application_controller.rb
parent2c871ca1968846871ed264cad34b50611eecae3b (diff)
downloadgitlab-ce-2ad094132de3c491511261bf0e6a2e577fd699dd.tar.gz
Various filter fixes
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c189f498951..48b1f95acb9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -277,9 +277,9 @@ class ApplicationController < ActionController::Base
}
end
- def view_to_html_string(partial, locals = nil)
+ def view_to_html_string(partial, locals = {})
render_to_string(
- partial: partial,
+ partial,
locals: locals,
layout: false,
formats: [:html]