Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 27 deletions

diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk
index 9d489ad34ff..b4632a8a9f7 100644
--- a/qa/gdk/Dockerfile.gdk
+++ b/qa/gdk/Dockerfile.gdk
@@ -5,7 +5,7 @@ ENV GITLAB_LICENSE_MODE=test \
 
 # Clone GDK at specific sha and bootstrap packages
 #
-ARG GDK_SHA=ba07fa47f98fc8a1e6ef16cdef9dabd7a0d445b0
+ARG GDK_SHA=d8359a7b292375586d991e36072c2e3fb2c94d18
 RUN set -eux; \
     git clone --depth 1 https://gitlab.com/gitlab-org/gitlab-development-kit.git && cd gitlab-development-kit; \
     git fetch --depth 1 origin ${GDK_SHA} && git -c advice.detachedHead=false checkout ${GDK_SHA}; \
diff --git a/qa/qa/page/component/deploy_token.rb b/qa/qa/page/component/deploy_token.rb
index 71501391db1..c52b187226a 100644
--- a/qa/qa/page/component/deploy_token.rb
+++ b/qa/qa/page/component/deploy_token.rb
@@ -19,12 +19,6 @@ module QA
             element 'deploy-token-write-registry-checkbox'
             element 'create-deploy-token-button'
           end
-
-          base.view 'app/views/shared/deploy_tokens/_new_deploy_token.html.haml' do
-            element 'created-deploy-token-container'
-            element 'deploy-token-user-field'
-            element 'deploy-token-field'
-          end
         end
 
         def fill_token_name(name)
@@ -46,26 +40,6 @@ module QA
         def add_token
           click_element('create-deploy-token-button')
         end
-
-        def token_username
-          within_new_project_deploy_token do
-            find_element('deploy-token-user-field').value
-          end
-        end
-
-        def token_password
-          within_new_project_deploy_token do
-            find_element('deploy-token-field').value
-          end
-        end
-
-        private
-
-        def within_new_project_deploy_token(&block)
-          has_element?('created-deploy-token-container', wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
-
-          within_element('created-deploy-token-container', &block)
-        end
       end
     end
   end