Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 10 deletions

diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index 01f7ab43d27..b3cbf572cb7 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -17,12 +17,22 @@ module QA
             element :deploy_tokens_settings
           end
 
+          view 'app/views/projects/deploy_keys/_index.html.haml' do
+            element :deploy_keys_settings
+          end
+
           def expand_deploy_tokens(&block)
             expand_section(:deploy_tokens_settings) do
               Settings::DeployTokens.perform(&block)
             end
           end
 
+          def expand_deploy_keys(&block)
+            expand_section(:deploy_keys_settings) do
+              Settings::DeployKeys.perform(&block)
+            end
+          end
+
           def expand_runners_settings(&block)
             expand_section(:runners_settings_content) do
               Settings::Runners.perform(&block)
diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb
index 7875a38dcf3..9b48e62a9f9 100644
--- a/qa/qa/page/project/settings/repository.rb
+++ b/qa/qa/page/project/settings/repository.rb
@@ -7,10 +7,6 @@ module QA
         class Repository < Page::Base
           include Common
 
-          view 'app/views/projects/deploy_keys/_index.html.haml' do
-            element :deploy_keys_settings
-          end
-
           view 'app/views/projects/protected_branches/shared/_index.html.haml' do
             element :protected_branches_settings
           end
@@ -19,12 +15,6 @@ module QA
             element :mirroring_repositories_settings_section
           end
 
-          def expand_deploy_keys(&block)
-            expand_section(:deploy_keys_settings) do
-              DeployKeys.perform(&block)
-            end
-          end
-
           def expand_protected_branches(&block)
             expand_section(:protected_branches_settings) do
               ProtectedBranches.perform(&block)