diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-17 14:15:38 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-17 14:15:38 +0000 |
| commit | 21af7459ab6f3049a98cfdaa6dda8dc2336098d8 (patch) | |
| tree | b596f459936c00f12fbdc8e50dcf9febdd80391e /db | |
| parent | cf2e3ff6f985c1ffdab9b795d79f792d3ea115fa (diff) | |
| parent | 956e914307029dbfbdb387fd6c0749dd50935fa4 (diff) | |
| download | gitlab-ce-21af7459ab6f3049a98cfdaa6dda8dc2336098d8.tar.gz | |
Merge branch '4009-external-users' into 'master'
External Users
The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users)
See merge request !3171
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20160310185910_add_external_flag_to_users.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20160310185910_add_external_flag_to_users.rb b/db/migrate/20160310185910_add_external_flag_to_users.rb new file mode 100644 index 00000000000..54937f1eb71 --- /dev/null +++ b/db/migrate/20160310185910_add_external_flag_to_users.rb @@ -0,0 +1,5 @@ +class AddExternalFlagToUsers < ActiveRecord::Migration + def change + add_column :users, :external, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 2c27b228864..2f075677b30 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -940,6 +940,7 @@ ActiveRecord::Schema.define(version: 20160316123110) do t.string "unlock_token" t.datetime "otp_grace_period_started_at" t.boolean "ldap_email", default: false, null: false + t.boolean "external", default: false end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |