Add latest changes from gitlab-org/gitlab@master

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) }

changelogs/unreleased/32390-some-board-lists-missing-for-some-users-minimal.yml

+---
+title: Fix missing board lists when other users collapse / expand the list
+merge_request: 17318
+author:
+type: fixed

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.

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"

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.
 

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
 

qa/qa/resource/issue.rb

 # 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
 

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(' '))