diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-13 22:17:19 +0300 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2018-12-14 15:11:14 +0300 |
| commit | f151556e331d46a2bc190a5fbeaf5e967eb8397b (patch) | |
| tree | 64b65ebd21985170b32a39342a63c62eff17f942 /db | |
| parent | 73518d57bb46c0756fc2aa92bfdba3438425fdb6 (diff) | |
Merge branch 'osw-suggest-diff-line-change' into 'master'
Allow suggesting single line changes in diffs
See merge request gitlab-org/gitlab-ce!23147
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20181123144235_create_suggestions.rb | 20 | ||||
| -rw-r--r-- | db/schema.rb | 11 |
2 files changed, 31 insertions, 0 deletions
diff --git a/db/migrate/20181123144235_create_suggestions.rb b/db/migrate/20181123144235_create_suggestions.rb new file mode 100644 index 00000000000..bcc4d8c538b --- /dev/null +++ b/db/migrate/20181123144235_create_suggestions.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +class CreateSuggestions < ActiveRecord::Migration + DOWNTIME = false + + def change + create_table :suggestions, id: :bigserial do |t| + t.references :note, foreign_key: { on_delete: :cascade }, null: false + t.integer :relative_order, null: false, limit: 2 + t.boolean :applied, null: false, default: false + t.string :commit_id + t.text :from_content, null: false + t.text :to_content, null: false + + t.index [:note_id, :relative_order], + name: 'index_suggestions_on_note_id_and_relative_order', + unique: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb index ff2dde3243c..ebc63488835 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1956,6 +1956,16 @@ ActiveRecord::Schema.define(version: 20181203002526) do t.index ["subscribable_id", "subscribable_type", "user_id", "project_id"], name: "index_subscriptions_on_subscribable_and_user_id_and_project_id", unique: true, using: :btree end + create_table "suggestions", id: :bigserial, force: :cascade do |t| + t.integer "note_id", null: false + t.integer "relative_order", limit: 2, null: false + t.boolean "applied", default: false, null: false + t.string "commit_id" + t.text "from_content", null: false + t.text "to_content", null: false + t.index ["note_id", "relative_order"], name: "index_suggestions_on_note_id_and_relative_order", unique: true, using: :btree + end + create_table "system_note_metadata", force: :cascade do |t| t.integer "note_id", null: false t.integer "commit_count" @@ -2432,6 +2442,7 @@ ActiveRecord::Schema.define(version: 20181203002526) do add_foreign_key "services", "projects", name: "fk_71cce407f9", on_delete: :cascade add_foreign_key "snippets", "projects", name: "fk_be41fd4bb7", on_delete: :cascade add_foreign_key "subscriptions", "projects", on_delete: :cascade + add_foreign_key "suggestions", "notes", on_delete: :cascade add_foreign_key "system_note_metadata", "notes", name: "fk_d83a918cb1", on_delete: :cascade add_foreign_key "term_agreements", "application_setting_terms", column: "term_id" add_foreign_key "term_agreements", "users", on_delete: :cascade |