Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 8 deletions

diff --git a/qa/qa/resource/repository/wiki_push.rb b/qa/qa/resource/repository/wiki_push.rb
index 8edaff70ac6..e926c00d380 100644
--- a/qa/qa/resource/repository/wiki_push.rb
+++ b/qa/qa/resource/repository/wiki_push.rb
@@ -25,14 +25,7 @@ module QA
         end
 
         def repository_ssh_uri
-          @repository_ssh_uri ||= begin
-            wiki.visit!
-            Page::Project::Wiki::Show.act do
-              click_clone_repository
-              choose_repository_clone_ssh
-              repository_location.uri
-            end
-          end
+          @repository_ssh_uri ||= wiki.repository_ssh_location.uri
         end
 
         def fabricate!
diff --git a/qa/qa/resource/wiki.rb b/qa/qa/resource/wiki.rb
index 6e3648dba0b..45d5da9346d 100644
--- a/qa/qa/resource/wiki.rb
+++ b/qa/qa/resource/wiki.rb
@@ -21,6 +21,15 @@ module QA
         end
       end
 
+      attribute :repository_ssh_location do
+        Page::Project::Wiki::Show.perform(&:click_clone_repository)
+
+        Page::Project::Wiki::GitAccess.perform do |git_access|
+          git_access.choose_repository_clone_ssh
+          git_access.repository_location
+        end
+      end
+
       def fabricate!
         project.visit!