Merge branch 'rename_reset_approvers' into 'master'

Rename reset_approvers checkbox

https://dev.gitlab.org/gitlab/gitlab-ee/issues/323

See merge request !449

app/services/merge_requests/refresh_service.rb

@@ -74,7 +74,7 @@ module MergeRequests
     # Reset approvals for merge request
     # Note: we should reset approvals for merge requests from forks too
     def reset_approvals_for_merge_requests
-      if @project.approvals_before_merge.nonzero? && @project.reset_approvers_on_push
+      if @project.approvals_before_merge.nonzero? && @project.reset_approvals_on_push
         merge_requests = @project.merge_requests.opened.where(source_branch: @branch_name).to_a
         merge_requests += @fork_merge_requests.where(source_branch: @branch_name).to_a
         merge_requests = filter_merge_requests(merge_requests)

app/views/projects/_merge_request_settings.html.haml

@@ -30,12 +30,12 @@
       .help-block
         How many users should approve merge request before it can be accepted. 0 - approval is disabled
 
-  .form-group.reset-approvers-on-push
+  .form-group.reset-approvals-on-push
     .col-sm-offset-2.col-sm-10
       .checkbox
-        = f.label :reset_approvers_on_push do
-          = f.check_box :reset_approvers_on_push
-          %span.descr Reset approvers on push
+        = f.label :reset_approvals_on_push do
+          = f.check_box :reset_approvals_on_push
+          %span.descr Reset approvals on push
 
   .form-group
     = f.label :approver_ids, class: 'control-label' do

db/migrate/20150717155058_rename_reset_approvers.rb

+class RenameResetApprovers < ActiveRecord::Migration
+  def change
+    rename_column :projects, :reset_approvers_on_push, :reset_approvals_on_push
+  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: 20150713160110) do
+ActiveRecord::Schema.define(version: 20150717155058) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -454,7 +454,7 @@ ActiveRecord::Schema.define(version: 20150713160110) do
     t.string   "import_source"
     t.boolean  "merge_requests_rebase_default", default: true
     t.integer  "approvals_before_merge",        default: 0,        null: false
-    t.boolean  "reset_approvers_on_push",       default: true
+    t.boolean  "reset_approvals_on_push",       default: true
   end
 
   add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree

spec/services/merge_requests/refresh_service_spec.rb

@@ -11,7 +11,7 @@ describe MergeRequests::RefreshService do
       group = create(:group)
       group.add_owner(@user)
 
-      @project = create(:project, namespace: group, approvals_before_merge: 1, reset_approvers_on_push: true)
+      @project = create(:project, namespace: group, approvals_before_merge: 1, reset_approvals_on_push: true)
       @fork_project = Projects::ForkService.new(@project, @user).execute
       @merge_request = create(:merge_request,
                               source_project: @project,
@@ -130,8 +130,8 @@ describe MergeRequests::RefreshService do
         expect(@merge_request.approvals).not_to be_empty
       end
 
-      it "does not reset approvals if reset_approvers_on_push si disabled" do
-        @project.update(reset_approvers_on_push: false)
+      it "does not reset approvals if reset_approvals_on_push si disabled" do
+        @project.update(reset_approvals_on_push: false)
         refresh_service = service.new(@project, @user)
         allow(refresh_service).to receive(:execute_hooks)
         refresh_service.execute(@oldrev, @newrev, 'refs/heads/master')