home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 05:26:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix inability to save "Reset approvals on push" setting

Closes gitlab-org/gitlab-ce#2140

See merge request !16
This commit is contained in:
Stan Hu
2015-07-31 17:29:04 +00:00
parent 73a8780285 d4c1c1ab48
commit 1de2f06bfd
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,6 +1,7 @@
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
+1 -1
View File
@@ -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