diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-20 21:14:31 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-20 21:14:31 +0300 |
commit | a538b0da9b34fb1b0f24607ff7dca2250ffdd4ea (patch) | |
tree | 5a49647dcf20067a6e8053106b3a3d124b87243e /db | |
parent | eede4ab1a2509ef4aa14d21527386224c4116adc (diff) | |
parent | 9fe863f43db93b5b8a4617cb1722d92d31c6ea5e (diff) |
Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration
* upstream/master: (234 commits)
Improve performance of User Agent Detail
Fix some grammar in the API docs
Remove shared example for pagination
API: Use POST to (un)block a user
API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`
Use grape validation for dates
Change wording for LDAP doc that was moved to a new location
API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`
Download snippets with LF line-endings by default
utilize pre-minified Vue in production since no CJS distribution is available
Prevent project team from being truncated too early during project destruction
loading icon sometimes toggled alongside MR pipeline contents
fix failed spec because haml_lint
fix incorrect sidekiq concurrency count in admin background page
exclude rpc_pipefs from system disc info
Fix wrong line ending [ci-skip]
fix overlooked window binding in spec files
remove imports loader
replace implicit this == window with explicit binding
Todo done clicking is kind of unusable.
...
Diffstat (limited to 'db')
-rw-r--r-- | db/fixtures/development/18_abuse_reports.rb | 5 | ||||
-rw-r--r-- | db/migrate/20170210103609_add_index_to_user_agent_detail.rb | 14 | ||||
-rw-r--r-- | db/post_migrate/20170215200045_remove_theme_id_from_users.rb | 9 | ||||
-rw-r--r-- | db/schema.rb | 5 |
4 files changed, 31 insertions, 2 deletions
diff --git a/db/fixtures/development/18_abuse_reports.rb b/db/fixtures/development/18_abuse_reports.rb new file mode 100644 index 00000000000..8618d10387a --- /dev/null +++ b/db/fixtures/development/18_abuse_reports.rb @@ -0,0 +1,5 @@ +require 'factory_girl_rails' + +(AbuseReport.default_per_page + 3).times do + FactoryGirl.create(:abuse_report) +end diff --git a/db/migrate/20170210103609_add_index_to_user_agent_detail.rb b/db/migrate/20170210103609_add_index_to_user_agent_detail.rb new file mode 100644 index 00000000000..c01753cfbd2 --- /dev/null +++ b/db/migrate/20170210103609_add_index_to_user_agent_detail.rb @@ -0,0 +1,14 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddIndexToUserAgentDetail < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def change + add_concurrent_index(:user_agent_details, [:subject_id, :subject_type]) + end +end diff --git a/db/post_migrate/20170215200045_remove_theme_id_from_users.rb b/db/post_migrate/20170215200045_remove_theme_id_from_users.rb new file mode 100644 index 00000000000..c51646fbe52 --- /dev/null +++ b/db/post_migrate/20170215200045_remove_theme_id_from_users.rb @@ -0,0 +1,9 @@ +class RemoveThemeIdFromUsers < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + remove_column :users, :theme_id, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 29ba7167bfa..938e70ee575 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: 20170214111112) do +ActiveRecord::Schema.define(version: 20170215200045) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1219,6 +1219,8 @@ ActiveRecord::Schema.define(version: 20170214111112) do t.datetime "updated_at", null: false end + add_index "user_agent_details", ["subject_id", "subject_type"], name: "index_user_agent_details_on_subject_id_and_subject_type", using: :btree + create_table "users", force: :cascade do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false @@ -1239,7 +1241,6 @@ ActiveRecord::Schema.define(version: 20170214111112) do 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.string "bio" t.integer "failed_attempts", default: 0 t.datetime "locked_at" |