diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-05-31 19:07:27 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-05-31 19:07:27 +0800 |
| commit | afc1fac03915f6e9df28fb3932093f73f01e3934 (patch) | |
| tree | c1caac8fd996883c6fe06c40d715f5a7600c3981 /db/schema.rb | |
| parent | b5e8de5c4c202d10ef8b48248b12f49c1330d04a (diff) | |
| parent | 228926daee799c95e752a3c284c860e5bc60e528 (diff) | |
| download | gitlab-ce-afc1fac03915f6e9df28fb3932093f73f01e3934.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 24196-protected-variables
* upstream/master: (89 commits)
Revert "Merge branch 'grpc-1.3.4' into 'master'"
Return nil when looking up config for unknown LDAP provider
Avoid crash when trying to parse string with invalid UTF-8 sequence
Enable Gitaly by default in GitLab 9.3
Don’t create comment on JIRA if link already exists
Disable sub_group_issuables_spec.rb for mysql
Fix math rendering on blob pages
Add changelog
Don't allow to pass a user to ProjectWiki#http_url_to_repo
Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
Fix bottom padding for build page
Fix /unsubscribe slash command creating extra todos
Fix omniauth-google-oauth2 dependencies in Gemfile.lock
Update looks job log
'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
Fix spec for Members::AuthorizedDestroyService
31616-add-uptime-of-gitlab-instance-in-admin-area
Set head pipeline when creating merge requests
Create a separate helper to check if we show particular tab on a search page
Add performance deltas between app deployments on Merge Request widget
...
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 43bd50dce90..59f4e4b2961 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -929,6 +929,8 @@ ActiveRecord::Schema.define(version: 20170524161101) do t.date "expires_at" end + add_index "project_group_links", ["group_id"], name: "index_project_group_links_on_group_id", using: :btree + create_table "project_import_data", force: :cascade do |t| t.integer "project_id" t.text "data" @@ -1356,7 +1358,6 @@ ActiveRecord::Schema.define(version: 20170524161101) do t.boolean "external", default: false t.string "incoming_email_token" t.string "organization" - t.boolean "authorized_projects_populated" t.boolean "require_two_factor_authentication_from_group", default: false, null: false t.integer "two_factor_grace_period", default: 48, null: false t.boolean "ghost" |