Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 files changed, 9 insertions, 9 deletions

diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb
index 14396e274..fe27e3d88 100644
--- a/app/views/settings/_authentication.html.erb
+++ b/app/views/settings/_authentication.html.erb
@@ -1,4 +1,4 @@
-<% form_tag({:action => 'edit', :tab => 'authentication'}) do %>
+<%= form_tag({:action => 'edit', :tab => 'authentication'}) do %>
 
 <div class="box tabular settings">
 <p><%= setting_check_box :login_required %></p>
diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb
index 25f65fc56..3299ff10b 100644
--- a/app/views/settings/_display.html.erb
+++ b/app/views/settings/_display.html.erb
@@ -1,4 +1,4 @@
-<% form_tag({:action => 'edit', :tab => 'display'}) do %>
+<%= form_tag({:action => 'edit', :tab => 'display'}) do %>
 
 <div class="box tabular settings">
 <p><%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %></p>
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index befec041c..4ec01995a 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -1,4 +1,4 @@
-<% form_tag({:action => 'edit'}) do %>
+<%= form_tag({:action => 'edit'}) do %>
 
 <div class="box tabular settings">
 <p><%= setting_text_field :app_title, :size => 30 %></p>
diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb
index 2ffa21113..429685638 100644
--- a/app/views/settings/_issues.html.erb
+++ b/app/views/settings/_issues.html.erb
@@ -1,4 +1,4 @@
-<% form_tag({:action => 'edit', :tab => 'issues'}) do %>
+<%= form_tag({:action => 'edit', :tab => 'issues'}) do %>
 
 <div class="box tabular settings">
 <p><%= setting_check_box :cross_project_issue_relations %></p>
diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb
index 3da977353..e4ddf5e99 100644
--- a/app/views/settings/_mail_handler.html.erb
+++ b/app/views/settings/_mail_handler.html.erb
@@ -1,4 +1,4 @@
-<% form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
+<%= form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
 
 <div class="box tabular settings">
   <p>
diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb
index 26c11ad9a..f746f7ced 100644
--- a/app/views/settings/_notifications.html.erb
+++ b/app/views/settings/_notifications.html.erb
@@ -1,5 +1,5 @@
 <% if @deliveries %>
-<% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
+<%= form_tag({:action => 'edit', :tab => 'notifications'}) do %>
 
 <div class="box tabular settings">
 <p><%= setting_text_field :mail_from, :size => 60 %></p>
diff --git a/app/views/settings/_projects.html.erb b/app/views/settings/_projects.html.erb
index f61a0055d..90db6b1ce 100644
--- a/app/views/settings/_projects.html.erb
+++ b/app/views/settings/_projects.html.erb
@@ -1,4 +1,4 @@
-<% form_tag({:action => 'edit', :tab => 'projects'}) do %>
+<%= form_tag({:action => 'edit', :tab => 'projects'}) do %>
 
 <div class="box tabular settings">
 <p><%= setting_check_box :default_projects_public %></p>
diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb
index 9593a14c4..d63c1db45 100644
--- a/app/views/settings/_repositories.html.erb
+++ b/app/views/settings/_repositories.html.erb
@@ -1,4 +1,4 @@
-<% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
+<%= form_tag({:action => 'edit', :tab => 'repositories'}) do %>
 
 <fieldset class="box settings enabled_scm">
 <%= hidden_field_tag 'settings[enabled_scm][]', '' %>
diff --git a/app/views/settings/plugin.html.erb b/app/views/settings/plugin.html.erb
index 61913484d..155f80c22 100644
--- a/app/views/settings/plugin.html.erb
+++ b/app/views/settings/plugin.html.erb
@@ -1,7 +1,7 @@
 <h2><%= l(:label_settings) %>: <%=h @plugin.name %></h2>
 
 <div id="settings">
-<% form_tag({:action => 'plugin'}) do %>
+<%= form_tag({:action => 'plugin'}) do %>
 <div class="box tabular">
 <%= render :partial => @partial, :locals => {:settings => @settings}%>
 </div>