diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 12:38:44 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 12:38:44 +0300 |
| commit | 1b62b86fdd1ad98e680c534f05fb32ff6e23fca4 (patch) | |
| tree | c585b79f1a646588328b2c8f4741dea700783b89 /db | |
| parent | 60e0137c864e26fee0120dc4447bb95acc46ce51 (diff) | |
| parent | 0c0ef7dfb6afb1695b62037fc0fa5aba6ce697d7 (diff) | |
Merge remote-tracking branch 'origin/master' into artifacts-expire-date
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 | 2 |
2 files changed, 6 insertions, 2 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 91b9cb0a98a..c1e447d3cda 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -752,8 +752,6 @@ ActiveRecord::Schema.define(version: 20160610301627) 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" |