Merge branch 'fix-reset-approvals-on-push' into 'master'

Fix inability to save "Reset approvals on push" setting

Closes gitlab-org/gitlab-ce#2140

See merge request !16

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
 
 v 7.14.0 (unreleased)
+  - Fix inability to save "Reset approvals on push" setting (Sandish Chen)
   - Fix full screen mode for snippet comments (Daniel Gerhardt)
   - Fix 404 error in files view after deleting the last file in a repository (Stan Hu)
   - Fix label read access for unauthenticated users (Daniel Gerhardt)

app/controllers/projects_controller.rb

@@ -195,7 +195,7 @@ class ProjectsController < ApplicationController
       :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
       :wiki_enabled, :merge_requests_template, :visibility_level, :merge_requests_rebase_enabled,
       :import_url, :last_activity_at, :namespace_id, :avatar, :merge_requests_rebase_default,
-      :approvals_before_merge, :approver_ids
+      :approvals_before_merge, :approver_ids, :reset_approvals_on_push
     )
   end