Merge branch 'master' of github.com:internetee/registry

Conflicts:
	db/schema.rb

db/migrate/20140925073831_add_devise_to_users.rb

@@ -0,0 +1,24 @@
+class AddDeviseToUsers < ActiveRecord::Migration
+  def self.up
+    change_table(:users) do |t|
+      ## Database authenticatable
+      t.string :email
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.inet     :current_sign_in_ip
+      t.inet     :last_sign_in_ip
+    end
+  end
+
+  def self.down
+    remove_column :users, :email
+    remove_column :users, :sign_in_count
+    remove_column :users, :current_sign_in_at
+    remove_column :users, :last_sign_in_at
+    remove_column :users, :current_sign_in_ip
+    remove_column :users, :last_sign_in_ip
+  end
+end

db/migrate/20140925084916_add_admin_to_users.rb

@@ -0,0 +1,5 @@
+class AddAdminToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :admin, :boolean, default: false
+  end
+end

db/migrate/20140925085340_add_identity_code_to_users.rb

@@ -0,0 +1,5 @@
+class AddIdentityCodeToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :identity_code, :string
+  end
+end

db/migrate/20140925101927_add_registrar_to_users.rb

@@ -0,0 +1,5 @@
+class AddRegistrarToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :registrar_id, :integer
+  end
+end