Missed a few lines during rebase

openstax · Apr 7, 2015 · ced44e9 · ced44e9
1 parent 19a048e
commit ced44e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/app/controllers/contact_infos_controller.rb b/app/controllers/contact_infos_controller.rb
@@ -2,10 +2,8 @@ class ContactInfosController < ApplicationController
 
   skip_before_filter :authenticate_user!, only: [:confirm, :confirm_unclaimed]
 
-  fine_print_skip_signatures :general_terms_of_use,
-                             :privacy_policy,
-                             only: [:confirm, :confirm_unclaimed]
-
+  fine_print_skip :general_terms_of_use, :privacy_policy, only: [:confirm, :confirm_unclaimed]
+
   before_filter :get_contact_info, only: [:destroy, :toggle_is_searchable]
 
   def create

diff --git a/db/schema.rb b/db/schema.rb
@@ -247,7 +247,7 @@
     t.string   "title"
     t.string   "uuid"
     t.string   "suffix"
-    t.string   "state",            :default => "temp"
+    t.string   "state",            :default => "temp", :null => false
     t.index ["first_name"], :name => "index_users_on_first_name"
     t.index ["full_name"], :name => "index_users_on_full_name"
     t.index ["last_name"], :name => "index_users_on_last_name"