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

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2015-08-10 09:57:49 +02:00
parent b41c488b7d 1de2f06bfd
commit c3a24cb81f
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
@@ -8,6 +8,7 @@ v 7.14.0 (unreleased)
- Fix URL used for refreshing notes if relative_url is present (Bartłomiej Święcki)
- Fix commit data retrieval when branch name has single quotes (Stan Hu)
- Check that project was actually created rather than just validated in import:repos task (Stan Hu)
- 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 the "Reload with full diff" URL button (Stan Hu)
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