diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-29 07:42:48 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-29 07:42:48 +0000 |
commit | 6143d119fec244b196d4e50e0f9ee24a9c7c36dd (patch) | |
tree | 8b5c8ba27a37f790abbac93f04a42aa25dabd9f1 /app | |
parent | 0162222bb20c6a78495195bc113c1b8bc1aae474 (diff) | |
download | redmine-6143d119fec244b196d4e50e0f9ee24a9c7c36dd.tar.gz redmine-6143d119fec244b196d4e50e0f9ee24a9c7c36dd.zip |
Merged #merge! calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9576 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/application_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d50fe60bd..bf68d8dbd 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -947,8 +947,7 @@ module ApplicationHelper def labelled_remote_form_for(*args, &proc) args << {} unless args.last.is_a?(Hash) options = args.last - options.merge!({:remote => true}) - options.merge!({:builder => Redmine::Views::LabelledFormBuilder}) + options.merge!({:builder => Redmine::Views::LabelledFormBuilder, :remote => true}) form_for(*args, &proc) end |