avoid default value for new column on Projects

app/controllers/projects_controller.rb

@@ -337,7 +337,7 @@ class ProjectsController < Projects::ApplicationController
   def project_params_ee
     %i[
       approvals_before_merge
-      approvals_overwritable_mr
+      approvals
       approver_group_ids
       approver_ids
       issues_template
@@ -346,6 +346,7 @@ class ProjectsController < Projects::ApplicationController
       mirror
       mirror_trigger_builds
       mirror_user_id
+      project_wide_approvals
       repository_size_limit
       reset_approvals_on_push
       service_desk_enabled

app/views/projects/ee/_merge_request_settings.html.haml

@@ -106,10 +106,9 @@
       Set number of approvers required before any open merge request can be merged
 
   .form-group.mr-overwrite-approvals
-    - approvals_overwritable_mr = local_assigns
     .checkbox
-      = form.label :approvals_overwritable_mr do
-        = form.check_box :approvals_overwritable_mr
+      = form.label :project_wide_approvals do
+        = form.check_box(:project_wide_approvals, { checked: !project.project_wide_approvals }, false, true)
         %strong Can overwrite approvers and approvals required per merge request
 
   .form-group.reset-approvals-on-push

app/views/shared/issuable/_approvals.html.haml

 - issuable = local_assigns.fetch(:issuable)
-- overwritable = issuable.target_project.approvals_overwritable_mr
+- overwritable = !issuable.target_project.project_wide_approvals
 - form = local_assigns.fetch(:form)
 
 

db/migrate/20170601233853_add_approvals_overwritable_mr_to_project.rb → db/migrate/20170605151307_add_project_wide_approvals_to_project.rb

 # See http://doc.gitlab.com/ce/development/migration_style_guide.html
 # for more information on how to write migrations for GitLab.
 
-class AddApprovalsOverwritableMrToProject < ActiveRecord::Migration
+class AddProjectWideApprovalsToProject < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
   # Set this constant to true if this migration requires downtime.
@@ -23,13 +23,9 @@ class AddApprovalsOverwritableMrToProject < ActiveRecord::Migration
   #
   # To disable transactions uncomment the following line and remove these
   # comments:
-  disable_ddl_transaction!
+  # disable_ddl_transaction!
 
-  def up
-    add_column_with_default :projects, :approvals_overwritable_mr, :boolean, default: true
-  end
-
-  def down
-    remove_column :projects, :approvals_overwritable_mr
+  def change
+    add_column :projects, :project_wide_approvals, :boolean
   end
 end

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: 20170601233853) do
+ActiveRecord::Schema.define(version: 20170605151307) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1144,7 +1144,7 @@ ActiveRecord::Schema.define(version: 20170601233853) do
     t.string "import_jid"
     t.integer "cached_markdown_version"
     t.datetime "last_repository_updated_at"
-    t.boolean "approvals_overwritable_mr", default: true, null: false
+    t.boolean "project_wide_approvals"
   end
 
   add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree