From 14169b1770b1efd4fbb6b5f1705da594eb205fd6 Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Fri, 17 Sep 2010 18:52:59 +0200
Subject: [PATCH] block rails3

---
 app/views/admin/users/new.html.erb                            | 2 +-
 app/views/albums/edit.html.erb                                | 2 +-
 app/views/albums/new.html.erb                                 | 2 +-
 app/views/collections/edit.html.erb                           | 2 +-
 app/views/collections/new.html.erb                            | 2 +-
 app/views/photos/edit_multiple.html.erb                       | 2 +-
 app/views/photos/untouched.html.erb                           | 2 +-
 app/views/user_sessions/new.html.erb                          | 2 +-
 app/views/users/edit.html.erb                                 | 2 +-
 app/views/users/new.html.erb                                  | 2 +-
 vendor/plugins/rails_upgrade/test/application_checker_test.rb | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/admin/users/new.html.erb b/app/views/admin/users/new.html.erb
index fd293b1..c73725d 100644
--- a/app/views/admin/users/new.html.erb
+++ b/app/views/admin/users/new.html.erb
@@ -1,6 +1,6 @@
 <h1>Register</h1>
  
-<% form_for @user do |f| %>
+<%= form_for @user do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Register" %>
diff --git a/app/views/albums/edit.html.erb b/app/views/albums/edit.html.erb
index f5ab04f..2612f0a 100644
--- a/app/views/albums/edit.html.erb
+++ b/app/views/albums/edit.html.erb
@@ -1,6 +1,6 @@
 <h1>Edit Album</h1>
  
-<% form_for @album do |f| %>
+<%= form_for @album do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Update" %>
diff --git a/app/views/albums/new.html.erb b/app/views/albums/new.html.erb
index f609ce5..34d14cd 100644
--- a/app/views/albums/new.html.erb
+++ b/app/views/albums/new.html.erb
@@ -1,6 +1,6 @@
 <h1>New Album</h1>
  
-<% form_for @album do |f| %>
+<%= form_for @album do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Create" %>
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
index e9d7ee4..48e886b 100644
--- a/app/views/collections/edit.html.erb
+++ b/app/views/collections/edit.html.erb
@@ -1,6 +1,6 @@
 <h1>Edit collection</h1>
  
-<% form_for @collection do |f| %>
+<%= form_for @collection do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Update" %>
diff --git a/app/views/collections/new.html.erb b/app/views/collections/new.html.erb
index aeec19f..6145682 100644
--- a/app/views/collections/new.html.erb
+++ b/app/views/collections/new.html.erb
@@ -1,6 +1,6 @@
 <h1>New collection</h1>
  
-<% form_for @collection do |f| %>
+<%= form_for @collection do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Create" %>
diff --git a/app/views/photos/edit_multiple.html.erb b/app/views/photos/edit_multiple.html.erb
index 6d445bf..dbc7982 100644
--- a/app/views/photos/edit_multiple.html.erb
+++ b/app/views/photos/edit_multiple.html.erb
@@ -1,4 +1,4 @@
-<% form_for :photos, :url => update_multiple_photos_path, :html => { :method => :put } do |f| %>
+<%= form_for :photos, :url => update_multiple_photos_path, :html => { :method => :put } do |f| %>
 <% for photo in @photos %>
 <p>
 <% f.fields_for photo, :index => photo.id do |p|%>
diff --git a/app/views/photos/untouched.html.erb b/app/views/photos/untouched.html.erb
index 9c58200..9c45395 100644
--- a/app/views/photos/untouched.html.erb
+++ b/app/views/photos/untouched.html.erb
@@ -1,4 +1,4 @@
-<% form_for :photos, :url => update_multiple_photos_path, :html => { :method => :put } do |f| %>
+<%= form_for :photos, :url => update_multiple_photos_path, :html => { :method => :put } do |f| %>
 <% for photo in @photos %>
 <p>
 <% f.fields_for photo do |p|%>
diff --git a/app/views/user_sessions/new.html.erb b/app/views/user_sessions/new.html.erb
index 71b0f2d..335d8f0 100644
--- a/app/views/user_sessions/new.html.erb
+++ b/app/views/user_sessions/new.html.erb
@@ -1,6 +1,6 @@
 <h1>Login</h1>
  
-<% form_for @user_session, :url => authenticate_path do |f| %>
+<%= form_for @user_session, :url => authenticate_path do |f| %>
   <%= f.error_messages %>
   <%= f.label :email %><br />
   <%= f.text_field :email %><br />
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 40a466f..267a6bf 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,6 +1,6 @@
 <h1>Edit My Account</h1>
  
-<% form_for @user, :url => account_path do |f| %>
+<%= form_for @user, :url => account_path do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Update" %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index baf4146..e9f1604 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,6 +1,6 @@
 <h1>Register</h1>
  
-<% form_for @user, :url => account_path do |f| %>
+<%= form_for @user, :url => account_path do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Register" %>
diff --git a/vendor/plugins/rails_upgrade/test/application_checker_test.rb b/vendor/plugins/rails_upgrade/test/application_checker_test.rb
index a5edd4d..58432d5 100644
--- a/vendor/plugins/rails_upgrade/test/application_checker_test.rb
+++ b/vendor/plugins/rails_upgrade/test/application_checker_test.rb
@@ -240,7 +240,7 @@ class ApplicationCheckerTest < ActiveSupport::TestCase
   end
 
   def test_check_helpers
-    make_file("app/views/users/", "test.html.erb", "<b>blah blah blah</b><% form_for(:thing) do |f| %> <label>doo dah</label> <%= f.whatever %> <% end %>")
+    make_file("app/views/users/", "test.html.erb", "<b>blah blah blah</b><%= form_for(:thing) do |f| %> <label>doo dah</label> <%= f.whatever %> <% end %>")
     @checker.check_old_helpers
 
     assert @checker.alerts.has_key?("Deprecated ERb helper calls")