Merge branch 'master' into blogs

spot-us · Mar 2, 2009 · acc3a0c · acc3a0c
2 parents 5fba445 + 2d2ff67
commit acc3a0c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/app/views/pitches/_pitch.html.haml b/app/views/pitches/_pitch.html.haml
@@ -3,7 +3,7 @@
   .box_white
     #equalize
       = render :partial => 'news_items/news_item', :object => pitch
-      .span-235.button_news_items
+      .span-205.button_news_items
         = render :partial => "donations/button", :locals => { :news_item => pitch }
     .clear
 
diff --git a/db/migrate/20090218144012_create_networks.rb b/db/migrate/20090218144012_create_networks.rb
@@ -6,7 +6,6 @@ def self.up
       t.timestamps
     end
 
-    Network.create!(:name => 'sfbay')
   end
 
   def self.down

diff --git a/db/migrate/20090218205536_add_display_name_to_networks.rb b/db/migrate/20090218205536_add_display_name_to_networks.rb
@@ -1,8 +1,6 @@
 class AddDisplayNameToNetworks < ActiveRecord::Migration
   def self.up
     add_column :networks, :display_name, :string
-
-    Network.find_by_name('sfbay').update_attribute(:display_name, 'Bay Area')
   end
 
   def self.down

diff --git a/db/migrate/20090219203016_load_display_name_for_default_network.rb b/db/migrate/20090219203016_load_display_name_for_default_network.rb
@@ -1,9 +1,8 @@
 class LoadDisplayNameForDefaultNetwork < ActiveRecord::Migration
   def self.up
-    Network.find_by_name('sfbay').update_attribute(:display_name, 'Bay Area')
+    Network.create!(:name => 'sfbay', :display_name => 'Bay Area')
   end
 
   def self.down
-    Network.find_by_name('sfbay').update_attribute(:display_name, '')
   end
 end