Merge branch 'profile-settings' into 'master'

app/views/layouts/nav/_dashboard.html.haml

@@ -42,7 +42,7 @@
       = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
         = icon('user fw')
         %span
-          Profile
+          Profile Settings
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help', data: {placement: 'right'} do
       = icon('question-circle fw')

app/views/layouts/profile.html.haml

-- page_title    "Settings"
-- header_title  "Settings", profile_path
+- page_title    "Profile Settings"
+- header_title  "Profile Settings", profile_path
 - sidebar       "profile"
 
 = render template: "layouts/application"

db/schema.rb

@@ -487,12 +487,12 @@ ActiveRecord::Schema.define(version: 20150824002011) do
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
 
   create_table "users", force: true do |t|
-    t.string   "email",                         default: "",    null: false
-    t.string   "encrypted_password",            default: "",    null: false
+    t.string   "email",                      default: "",    null: false
+    t.string   "encrypted_password",         default: "",    null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                 default: 0
+    t.integer  "sign_in_count",              default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
@@ -500,22 +500,22 @@ ActiveRecord::Schema.define(version: 20150824002011) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "name"
-    t.boolean  "admin",                         default: false, null: false
-    t.integer  "projects_limit",                default: 10
-    t.string   "skype",                         default: "",    null: false
-    t.string   "linkedin",                      default: "",    null: false
-    t.string   "twitter",                       default: "",    null: false
+    t.boolean  "admin",                      default: false, null: false
+    t.integer  "projects_limit",             default: 10
+    t.string   "skype",                      default: "",    null: false
+    t.string   "linkedin",                   default: "",    null: false
+    t.string   "twitter",                    default: "",    null: false
     t.string   "authentication_token"
-    t.integer  "theme_id",                      default: 1,     null: false
+    t.integer  "theme_id",                   default: 1,     null: false
     t.string   "bio"
-    t.integer  "failed_attempts",               default: 0
+    t.integer  "failed_attempts",            default: 0
     t.datetime "locked_at"
     t.string   "username"
-    t.boolean  "can_create_group",              default: true,  null: false
-    t.boolean  "can_create_team",               default: true,  null: false
+    t.boolean  "can_create_group",           default: true,  null: false
+    t.boolean  "can_create_team",            default: true,  null: false
     t.string   "state"
-    t.integer  "color_scheme_id",               default: 1,     null: false
-    t.integer  "notification_level",            default: 1,     null: false
+    t.integer  "color_scheme_id",            default: 1,     null: false
+    t.integer  "notification_level",         default: 1,     null: false
     t.datetime "password_expires_at"
     t.integer  "created_by_id"
     t.datetime "last_credential_check_at"
@@ -524,20 +524,20 @@ ActiveRecord::Schema.define(version: 20150824002011) do
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
-    t.boolean  "hide_no_ssh_key",               default: false
-    t.string   "website_url",                   default: "",    null: false
+    t.boolean  "hide_no_ssh_key",            default: false
+    t.string   "website_url",                default: "",    null: false
     t.string   "notification_email"
-    t.boolean  "hide_no_password",              default: false
-    t.boolean  "password_automatically_set",    default: false
+    t.boolean  "hide_no_password",           default: false
+    t.boolean  "password_automatically_set", default: false
     t.string   "location"
     t.string   "encrypted_otp_secret"
     t.string   "encrypted_otp_secret_iv"
     t.string   "encrypted_otp_secret_salt"
-    t.boolean  "otp_required_for_login",        default: false, null: false
+    t.boolean  "otp_required_for_login",     default: false, null: false
     t.text     "otp_backup_codes"
-    t.string   "public_email",                  default: "",    null: false
-    t.integer  "dashboard",                     default: 0
-    t.integer  "project_view",                  default: 0
+    t.string   "public_email",               default: "",    null: false
+    t.integer  "dashboard",                  default: 0
+    t.integer  "project_view",               default: 0
   end
 
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree