diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-05-08 15:45:04 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-05-08 15:47:42 -0400 |
| commit | 0e29653f51b439eb018cefe434a4a57db4239cf4 (patch) | |
| tree | f431d5773807416f714887816fb3f5e867ee74ac | |
| parent | f3578baa83ca8d576f4fe1bef50ebae61615768e (diff) | |
| download | gitlab-ce-rs-remove-wall_enabled.tar.gz | |
Remove `wall_enabled` field from Projectrs-remove-wall_enabled
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | config/gitlab.teatro.yml | 1 | ||||
| -rw-r--r-- | db/migrate/20160508194200_remove_wall_enabled_from_projects.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 3 | ||||
| -rw-r--r-- | spec/factories/projects.rb | 1 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 1 |
6 files changed, 6 insertions, 7 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index dfd1e54ecf7..86a7835c5f6 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -10,7 +10,6 @@ # updated_at :datetime # creator_id :integer # issues_enabled :boolean default(TRUE), not null -# wall_enabled :boolean default(TRUE), not null # merge_requests_enabled :boolean default(TRUE), not null # wiki_enabled :boolean default(TRUE), not null # namespace_id :integer @@ -67,7 +66,6 @@ class Project < ActiveRecord::Base default_value_for :merge_requests_enabled, gitlab_config_features.merge_requests default_value_for :builds_enabled, gitlab_config_features.builds default_value_for :wiki_enabled, gitlab_config_features.wiki - default_value_for :wall_enabled, false default_value_for :snippets_enabled, gitlab_config_features.snippets default_value_for(:shared_runners_enabled) { current_application_settings.shared_runners_enabled } diff --git a/config/gitlab.teatro.yml b/config/gitlab.teatro.yml index f0656400beb..01c8dc5ff98 100644 --- a/config/gitlab.teatro.yml +++ b/config/gitlab.teatro.yml @@ -15,7 +15,6 @@ production: &base issues: true merge_requests: true wiki: true - wall: false snippets: false visibility_level: "private" # can be "private" | "internal" | "public" diff --git a/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb b/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb new file mode 100644 index 00000000000..aa560bc0f0c --- /dev/null +++ b/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb @@ -0,0 +1,5 @@ +class RemoveWallEnabledFromProjects < ActiveRecord::Migration + def change + remove_column :projects, :wall_enabled, :boolean, default: true, null: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 7683aad968c..71d953afe30 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: 20160421130527) do +ActiveRecord::Schema.define(version: 20160508194200) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -728,7 +728,6 @@ ActiveRecord::Schema.define(version: 20160421130527) do t.datetime "updated_at" t.integer "creator_id" t.boolean "issues_enabled", default: true, null: false - t.boolean "wall_enabled", default: true, null: false t.boolean "merge_requests_enabled", default: true, null: false t.boolean "wiki_enabled", default: true, null: false t.integer "namespace_id" diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index c14b99606ba..ecd0e44dd62 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -10,7 +10,6 @@ # updated_at :datetime # creator_id :integer # issues_enabled :boolean default(TRUE), not null -# wall_enabled :boolean default(TRUE), not null # merge_requests_enabled :boolean default(TRUE), not null # wiki_enabled :boolean default(TRUE), not null # namespace_id :integer diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 5b1cf71337e..3a8a6c2c166 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -10,7 +10,6 @@ # updated_at :datetime # creator_id :integer # issues_enabled :boolean default(TRUE), not null -# wall_enabled :boolean default(TRUE), not null # merge_requests_enabled :boolean default(TRUE), not null # wiki_enabled :boolean default(TRUE), not null # namespace_id :integer |