diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-19 09:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-19 09:09:12 +0300 |
| commit | 765ec2e3b2eb347314af5f806c6b70bad696265a (patch) | |
| tree | 2ee189f816fd44c8fcba706cd95983d1605bfca2 /qa | |
| parent | ec1f0dd7f46a6d25e4a47c8254ac67b720f81e89 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/gdk/Dockerfile.gdk | 4 | ||||
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk index a9863446e8e..6952267ad9c 100644 --- a/qa/gdk/Dockerfile.gdk +++ b/qa/gdk/Dockerfile.gdk @@ -4,7 +4,7 @@ ARG BASE_TAG=master -FROM registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-slim-ruby-3.0-golang-1.19-rust-1.65-node-16.14-postgresql-12:rubygems-3.4-git-2.36-lfs-2.9-yarn-1.22 as gdk-base +FROM registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-slim-ruby-3.0-golang-1.19-rust-1.65-node-16.14-postgresql-13:rubygems-3.4-git-2.36-lfs-2.9-yarn-1.22 as gdk-base RUN set -eux; \ groupadd gdk -g 1000; \ @@ -26,7 +26,7 @@ RUN set -eux; \ libpcre2-8-0 \ libpcre2-dev \ libpcre2-posix2 \ - && apt-get install -y --no-install-recommends postgresql-12; \ + && apt-get install -y --no-install-recommends postgresql-13; \ apt-get autoclean -y # Clone GDK and install system dependencies, purge system git diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index e10db796f8e..d5d8c52a0e3 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -201,13 +201,6 @@ module QA def click_diffs_tab # Do not wait for spinner due to https://gitlab.com/gitlab-org/gitlab/-/issues/398584 click_element(:diffs_tab, skip_finished_loading_check: true) - - # If the diff isn't available when we navigate to the Changes tab - # we must reload the page. https://gitlab.com/gitlab-org/gitlab/-/issues/398557 - wait_until(reload: true, skip_finished_loading_check_on_refresh: true) do - QA::Runtime::Logger.debug('Ensuring that diff has loaded async') - has_element?(:file_tree_button, skip_finished_loading_check: true, wait: 5) - end end def click_pipeline_link |