From 61dd038c178207196c3982b47db0bf5993af0deb Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Fri, 10 Feb 2017 11:37:51 -0600
Subject: [PATCH] Added changelog

Also removed redundant code
---
 app/controllers/projects/protected_branches_controller.rb    | 1 -
 ...ror-repository-and-protect-branches-settings-pages-ee.yml | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased-ee/26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages-ee.yml

diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index 177aff301fe2..e209abed929f 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,5 +1,4 @@
 class Projects::ProtectedBranchesController < Projects::ApplicationController
-  include RepositoryHelper
   # Authorize
   before_action :require_non_empty_project
   before_action :authorize_admin_project!
diff --git a/changelogs/unreleased-ee/26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages-ee.yml b/changelogs/unreleased-ee/26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages-ee.yml
new file mode 100644
index 000000000000..5a41a6df6206
--- /dev/null
+++ b/changelogs/unreleased-ee/26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages-ee.yml
@@ -0,0 +1,5 @@
+---
+title: Combined deploy keys and push rules settings options into a single one called
+  Repository
+merge_request:
+author:
-- 
GitLab