diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-06-14 05:39:11 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-14 05:39:11 +0300 |
commit | b6a703e71546acc482ba58e1bba48f0eb747653c (patch) | |
tree | 6439646525539562cd63adb9d6bf4e436ef10afb /db | |
parent | f7467bd6b4f7f577002d8f14b41d3382d8d93d54 (diff) | |
parent | f34af6b83cc2663bb8a076f4df9c82047e5511ab (diff) |
Merge branch 'master' into 8-9-stable
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20160610194713_remove_deprecated_issues_tracker_columns_from_projects.rb | 6 | ||||
-rw-r--r-- | db/schema.rb | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/db/migrate/20160610194713_remove_deprecated_issues_tracker_columns_from_projects.rb b/db/migrate/20160610194713_remove_deprecated_issues_tracker_columns_from_projects.rb new file mode 100644 index 00000000000..477b2106dea --- /dev/null +++ b/db/migrate/20160610194713_remove_deprecated_issues_tracker_columns_from_projects.rb @@ -0,0 +1,6 @@ +class RemoveDeprecatedIssuesTrackerColumnsFromProjects < ActiveRecord::Migration + def change + remove_column :projects, :issues_tracker, :string, default: 'gitlab', null: false + remove_column :projects, :issues_tracker_id, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index aac327797e7..3dccbbd50ba 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: 20160608155312) do +ActiveRecord::Schema.define(version: 20160610301627) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -670,8 +670,8 @@ ActiveRecord::Schema.define(version: 20160608155312) do create_table "notification_settings", force: :cascade do |t| t.integer "user_id", null: false - t.integer "source_id", null: false - t.string "source_type", null: false + t.integer "source_id" + t.string "source_type" t.integer "level", default: 0, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -751,8 +751,6 @@ ActiveRecord::Schema.define(version: 20160608155312) do t.boolean "merge_requests_enabled", default: true, null: false t.boolean "wiki_enabled", default: true, null: false t.integer "namespace_id" - t.string "issues_tracker", default: "gitlab", null: false - t.string "issues_tracker_id" t.boolean "snippets_enabled", default: true, null: false t.datetime "last_activity_at" t.string "import_url" @@ -988,7 +986,6 @@ ActiveRecord::Schema.define(version: 20160608155312) do t.boolean "can_create_team", default: true, null: false t.string "state" t.integer "color_scheme_id", default: 1, null: false - t.integer "notification_level", default: 1, null: false t.datetime "password_expires_at" t.integer "created_by_id" t.datetime "last_credential_check_at" |