diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-19 21:34:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-19 21:34:38 +0000 |
| commit | 68d4ab2381ebfe4ad53910a6f1ce6de311c28f8f (patch) | |
| tree | 88f1993c2b64556c20d01e7a9a423e3a6693ab4b /db | |
| parent | ef1ed8f7026d442680f661bfcf64fa7b668556c6 (diff) | |
| parent | 22bbb379ae976d94d7ddd7addb7384e0b79ddfd9 (diff) | |
| download | gitlab-ce-68d4ab2381ebfe4ad53910a6f1ce6de311c28f8f.tar.gz | |
Merge branch 'emoji_votes' into 'master'
Award Emoji
This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.
For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker.
See merge request !1825
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20151106000015_add_is_award_to_notes.rb | 6 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/db/migrate/20151106000015_add_is_award_to_notes.rb b/db/migrate/20151106000015_add_is_award_to_notes.rb new file mode 100644 index 00000000000..02b271637e9 --- /dev/null +++ b/db/migrate/20151106000015_add_is_award_to_notes.rb @@ -0,0 +1,6 @@ +class AddIsAwardToNotes < ActiveRecord::Migration + def change + add_column :notes, :is_award, :boolean, default: false, null: false + add_index :notes, :is_award + end +end diff --git a/db/schema.rb b/db/schema.rb index d687e68d098..5bbe0c908ef 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -556,12 +556,14 @@ ActiveRecord::Schema.define(version: 20151118162244) do t.boolean "system", default: false, null: false t.text "st_diff" t.integer "updated_by_id" + t.boolean "is_award", default: false, null: false end add_index "notes", ["author_id"], name: "index_notes_on_author_id", using: :btree add_index "notes", ["commit_id"], name: "index_notes_on_commit_id", using: :btree add_index "notes", ["created_at", "id"], name: "index_notes_on_created_at_and_id", using: :btree add_index "notes", ["created_at"], name: "index_notes_on_created_at", using: :btree + add_index "notes", ["is_award"], name: "index_notes_on_is_award", using: :btree add_index "notes", ["line_code"], name: "index_notes_on_line_code", using: :btree add_index "notes", ["noteable_id", "noteable_type"], name: "index_notes_on_noteable_id_and_noteable_type", using: :btree add_index "notes", ["noteable_type"], name: "index_notes_on_noteable_type", using: :btree |