diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-21 00:52:05 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-21 00:56:13 +0300 |
| commit | eebb691cb60c7786638667acec0e1c191c0a85b9 (patch) | |
| tree | 052a1abdd02b95492e95fefe8fc0d25e01de06a9 /db | |
| parent | 6a5cd3ca41f61a188b221e6436e9a0d06c0484f2 (diff) | |
Merge branch 'issue_3945' into 'master'
Add syntax highlighting to diff view
Closes #3945
See merge request !2109
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 29 |
2 files changed, 20 insertions, 14 deletions
diff --git a/db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb b/db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb new file mode 100644 index 00000000000..d6c6aa4a4e8 --- /dev/null +++ b/db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb @@ -0,0 +1,5 @@ +class AddBaseCommitShaToMergeRequestDiffs < ActiveRecord::Migration + def change + add_column :merge_request_diffs, :base_commit_sha, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index b52f3a2d094..67bfc775a1e 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: 20160120130905) do +ActiveRecord::Schema.define(version: 20160120172143) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -494,6 +494,7 @@ ActiveRecord::Schema.define(version: 20160120130905) do t.integer "merge_request_id", null: false t.datetime "created_at" t.datetime "updated_at" + t.string "base_commit_sha" end add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree @@ -729,19 +730,19 @@ ActiveRecord::Schema.define(version: 20160120130905) do t.string "type" t.string "title" t.integer "project_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "active", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "active", null: false t.text "properties" - t.boolean "template", default: false - t.boolean "push_events", default: true - t.boolean "issues_events", default: true - t.boolean "merge_requests_events", default: true - t.boolean "tag_push_events", default: true - t.boolean "note_events", default: true, null: false - t.boolean "build_events", default: false, null: false - t.string "category", default: "common", null: false - t.boolean "default", default: false + t.boolean "template", default: false + t.boolean "push_events", default: true + t.boolean "issues_events", default: true + t.boolean "merge_requests_events", default: true + t.boolean "tag_push_events", default: true + t.boolean "note_events", default: true, null: false + t.boolean "build_events", default: false, null: false + t.string "category", default: "common", null: false + t.boolean "default", default: false end add_index "services", ["category"], name: "index_services_on_category", using: :btree @@ -858,7 +859,7 @@ ActiveRecord::Schema.define(version: 20160120130905) do t.boolean "hide_project_limit", default: false t.string "unlock_token" t.datetime "otp_grace_period_started_at" - t.boolean "ldap_email", default: false, null: false + t.boolean "ldap_email", default: false, null: false end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |