diff options
-rw-r--r-- | app/models/list.rb | 1 | ||||
-rw-r--r-- | changelogs/unreleased/32390-some-board-lists-missing-for-some-users-minimal.yml | 5 | ||||
-rw-r--r-- | doc/administration/packages/container_registry.md | 4 | ||||
-rw-r--r-- | doc/api/project_import_export.md | 2 | ||||
-rw-r--r-- | doc/user/group/subgroups/index.md | 13 | ||||
-rw-r--r-- | qa/qa/page/base.rb | 4 | ||||
-rw-r--r-- | qa/qa/resource/issue.rb | 11 | ||||
-rw-r--r-- | qa/qa/support/page/logging.rb | 3 |
8 files changed, 27 insertions, 16 deletions
diff --git a/app/models/list.rb b/app/models/list.rb index 84c63f3fd6f..b4a4631b397 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -23,7 +23,6 @@ class List < ApplicationRecord scope :preload_associations, -> (user) do preload(:board, label: :priorities) - .with_preferences_for(user) end scope :ordered, -> { order(:list_type, :position) } diff --git a/changelogs/unreleased/32390-some-board-lists-missing-for-some-users-minimal.yml b/changelogs/unreleased/32390-some-board-lists-missing-for-some-users-minimal.yml new file mode 100644 index 00000000000..eb6ed86b150 --- /dev/null +++ b/changelogs/unreleased/32390-some-board-lists-missing-for-some-users-minimal.yml @@ -0,0 +1,5 @@ +--- +title: Fix missing board lists when other users collapse / expand the list +merge_request: 17318 +author: +type: fixed diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md index ae7f17e4ff4..58a34607e2d 100644 --- a/doc/administration/packages/container_registry.md +++ b/doc/administration/packages/container_registry.md @@ -5,8 +5,8 @@ > Docker versions earlier than 1.10. NOTE: **Note:** -This document is about the admin guide. To learn how to use GitLab Container -Registry [user documentation](../../user/packages/container_registry/index.md). +This document is the administrator's guide. To learn how to use GitLab Container +Registry, see the [user documentation](../../user/packages/container_registry/index.md). With the Container Registry integrated into GitLab, every project can have its own space to store its Docker images. diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md index 7040646641b..cd02d423a9f 100644 --- a/doc/api/project_import_export.md +++ b/doc/api/project_import_export.md @@ -137,7 +137,7 @@ from io import BytesIO s3_file = requests.get(presigned_url) url = 'https://gitlab.example.com/api/v4/projects/import' -files = {'file': BytesIO(s3_file.content)} +files = {'file': ('file.tar.gz', BytesIO(s3_file.content))} data = { "path": "example-project", "namespace": "example-group" diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index eec929e3309..376d4510934 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -4,8 +4,7 @@ type: reference, howto, concepts # Subgroups -NOTE: **Note:** -[Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/2772) in GitLab 9.0. +>[Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/2772) in GitLab 9.0. Subgroups, also known as nested groups or hierarchical groups, allow you to have up to 20 levels of groups. @@ -68,9 +67,9 @@ Another example of GitLab as a company would be the following: The maximum subgroups a group can have, including the first one in the hierarchy, is 21. -Actions such as transferring or importing a project inside subgroups, work like -when performing these actions the traditional way with the `group/project` -structure. +When performing actions such as transferring or importing a project between +subgroups, the behavior is the same as when performing these actions at the +`group/project` level. ## Creating a subgroup @@ -117,6 +116,10 @@ When you add a member to a subgroup, they inherit the membership and permission level from the parent group. This model allows access to nested groups if you have membership in one of its parents. +Jobs for pipelines in subgroups can use [Runners](../../../ci/runners/README.md) registered to the parent group. This means secrets configured for the parent group are available to subgroup jobs. + +In addition, maintainers of projects that belong to subgroups can see the details of Runners registered to parent groups. + The group permissions for a member can be changed only by Owners, and only on the **Members** page of the group the member was added. diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb index 42fe431bfbd..104c9b19e2a 100644 --- a/qa/qa/page/base.rb +++ b/qa/qa/page/base.rb @@ -94,8 +94,8 @@ module QA end # replace with (..., page = self.class) - def click_element(name, page = nil) - find_element(name).click + def click_element(name, page = nil, text: nil) + find_element(name, text: nil).click page.validate_elements_present! if page end diff --git a/qa/qa/resource/issue.rb b/qa/qa/resource/issue.rb index 2cbfab3b413..9d0a5e159e0 100644 --- a/qa/qa/resource/issue.rb +++ b/qa/qa/resource/issue.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'securerandom' + module QA module Resource class Issue < Base @@ -20,6 +22,7 @@ module QA def initialize @assignee_ids = [] @labels = [] + @title = "Issue title #{SecureRandom.hex(8)}" end def fabricate! @@ -27,10 +30,10 @@ module QA Page::Project::Show.perform(&:go_to_new_issue) - Page::Project::Issue::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName - page.add_title(@title) - page.add_description(@description) - page.create_new_issue + Page::Project::Issue::New.perform do |new_page| + new_page.add_title(@title) + new_page.add_description(@description) + new_page.create_new_issue end end diff --git a/qa/qa/support/page/logging.rb b/qa/qa/support/page/logging.rb index 606e8d7be93..6b6e12f86de 100644 --- a/qa/qa/support/page/logging.rb +++ b/qa/qa/support/page/logging.rb @@ -59,9 +59,10 @@ module QA elements end - def click_element(name, page = nil) + def click_element(name, page = nil, **kwargs) msg = ["clicking :#{name}"] msg << ", expecting to be at #{page.class}" if page + msg << "with args #{kwargs}" log(msg.compact.join(' ')) |