Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 3 deletions

diff --git a/qa/Gemfile b/qa/Gemfile
index f00f26a5482..fa8fd40d5bb 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -23,5 +23,4 @@ gem 'rspec-parameterized', '~> 0.4.2'
 group :development do
   gem 'pry-byebug', '~> 3.5.1', platform: :mri
   gem "ruby-debug-ide", "~> 0.7.0"
-  gem "debase", "~> 0.2.4.1"
 end
diff --git a/qa/qa/page/component/design_management.rb b/qa/qa/page/component/design_management.rb
index fafbda58b07..cccf1cf1a58 100644
--- a/qa/qa/page/component/design_management.rb
+++ b/qa/qa/page/component/design_management.rb
@@ -64,7 +64,7 @@ module QA
           # It doesn't work as a CSS selector.
           # So instead we use the name attribute as a locator
           within_element(:design_dropzone_content) do
-            page.attach_file("design_file", design_file_path, make_visible: { display: 'block' })
+            page.attach_file("upload_file", design_file_path, make_visible: { display: 'block' })
           end
 
           filename = ::File.basename(design_file_path)
diff --git a/qa/qa/page/profile/personal_access_tokens.rb b/qa/qa/page/profile/personal_access_tokens.rb
index fd191fa3e27..caa8c0ceb40 100644
--- a/qa/qa/page/profile/personal_access_tokens.rb
+++ b/qa/qa/page/profile/personal_access_tokens.rb
@@ -6,8 +6,11 @@ module QA
   module Page
     module Profile
       class PersonalAccessTokens < Page::Base
-        view 'app/views/shared/access_tokens/_form.html.haml' do
+        view 'app/assets/javascripts/access_tokens/components/expires_at_field.vue' do
           element :expiry_date_field
+        end
+
+        view 'app/views/shared/access_tokens/_form.html.haml' do
           element :access_token_name_field
           element :create_token_button
         end