Merge remote-tracking branch 'upstream/staging' into staging

Conflicts (resolved): .ruby-gemset config/schedule.rb config/sitemap.rb config/unicorn.rb
joegattnet · Oct 10, 2013 · 72d3df4 · 72d3df4
2 parents cfffe21 + f3f826a
commit 72d3df4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,12 +9,15 @@
 /tmp
 
 # Ignore other unneeded files.
-.rvmrc
-doc/
+!sitemap.rb
 *.swp
 *~
-.project
 .DS_Store
+.project
+.ruby-gemset
+.ruby-version
+.rvmrc
+doc/
 sitemap.*
 !sitemap.rb
 

diff --git a/.ruby-gemset b/.ruby-gemset
diff --git a/.ruby-version b/.ruby-version
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 rvm:
-  - 2.0.0
+  - 2.0.0-p195
 
 script:
   - "rake db:migrate RAILS_ENV=test"

diff --git a/db/migrate/20121214133719_change_index_name_in_cloud_notes.rb b/db/migrate/20121214133719_change_index_name_in_cloud_notes.rb
diff --git a/db/migrate/20121214134225_change_cloud_notes_content_hash_to_binary.rb b/db/migrate/20121214134225_change_cloud_notes_content_hash_to_binary.rb
@@ -1,9 +1,11 @@
 class ChangeCloudNotesContentHashToBinary < ActiveRecord::Migration
   def up
-    change_column :cloud_notes, :content_hash, :binary
+    remove_column :cloud_notes, :content_hash, :string
+    add_column :cloud_notes, :content_hash, :binary
   end
 
   def down
-    change_column :cloud_notes, :content_hash, :string
+    remove_column :cloud_notes, :content_hash, :binary
+    add_column :cloud_notes, :content_hash, :string
   end
 end