summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorSenorsen <sen@senorsen.com>2015-04-14 00:28:49 +0800
committerSenorsen <sen@senorsen.com>2015-04-14 19:42:48 +0800
commit7b28218f96d14c9650484a183ffab3b2132b05db (patch)
treea79cbd394f52a00ba69b1d9b9f192d7ce0b35082 /db
parentae6d0aaae0d8f6251b30a8e5243a98f083f0cac9 (diff)
downloadgitlab-ce-7b28218f96d14c9650484a183ffab3b2132b05db.tar.gz
Allow user to choose which email to be public
This commit allows user to show one of their emails in profile page, or don't show email in this page.
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20150413192223_add_public_email_to_users.rb5
-rw-r--r--db/schema.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/db/migrate/20150413192223_add_public_email_to_users.rb b/db/migrate/20150413192223_add_public_email_to_users.rb
new file mode 100644
index 00000000000..700e9f343a6
--- /dev/null
+++ b/db/migrate/20150413192223_add_public_email_to_users.rb
@@ -0,0 +1,5 @@
+class AddPublicEmailToUsers < ActiveRecord::Migration
+ def change
+ add_column :users, :public_email, :string, default: "", null: false
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 48f1b2ac2cc..7f464d7f973 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150411180045) do
+ActiveRecord::Schema.define(version: 20150413192223) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -476,6 +476,7 @@ ActiveRecord::Schema.define(version: 20150411180045) do
t.string "bitbucket_access_token"
t.string "bitbucket_access_token_secret"
t.string "location"
+ t.string "public_email", default: "", null: false
end
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree