Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-11

doc/administration/pages/index.md

@@ -259,6 +259,24 @@ verification requirement. Navigate to `Admin area ➔ Settings` and uncheck
 **Require users to prove ownership of custom domains** in the Pages section.
 This setting is enabled by default.
 
+## Activate verbose logging for daemon
+
+Verbose logging was [introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/2533) in
+Omnibus GitLab 11.1.
+
+Follow the steps below to configure verbose logging of GitLab Pages daemon.
+
+1. By default the daemon only logs with `INFO` level.
+
+   If you wish to make it log events with level `DEBUG` you must configure this in
+   `/etc/gitlab/gitlab.rb`:
+
+     ```shell
+     gitlab_pages['log_verbose'] = true
+     ```
+
+1. [Reconfigure GitLab][reconfigure]
+
 ## Change storage path
 
 Follow the steps below to change the default path where GitLab Pages' contents

doc/user/project/clusters/index.md

@@ -96,8 +96,9 @@ To add an existing Kubernetes cluster to your project:
       you can follow the
       [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/)
       to create one. You can also view or create service tokens in the
-      [Kubernetes dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/#config)
-      (under **Config > Secrets**).
+      [Kubernetes dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/)
+      (under **Config > Secrets**). **The account that will issue the service token
+      must have admin privileges on the cluster.**
     - **Project namespace** (optional) - You don't have to fill it in; by leaving
       it blank, GitLab will create one for you. Also:
       - Each project should have a unique namespace.

lib/gitlab/ee_compat_check.rb

@@ -138,15 +138,23 @@ module Gitlab
 
     def ee_branch_presence_check!
       ee_remotes.keys.each do |remote|
-        [ce_branch, ee_branch_prefix, ee_branch_suffix].each do |branch|
-          _, status = step("Fetching #{remote}/#{branch}", %W[git fetch #{remote} #{branch}])
+        output, _ = step(
+          "Searching #{remote}",
+          %W[git ls-remote #{remote} *#{minimal_ee_branch_name}*])
 
-          if status.zero?
-            @ee_remote_with_branch = remote
-            @ee_branch_found = branch
-            return true
-          end
-        end
+        branches =
+          output.scan(%r{(?<=refs/heads/|refs/tags/).+}).sort_by(&:size)
+
+        next if branches.empty?
+
+        branch = branches.first
+
+        step("Fetching #{remote}/#{branch}", %W[git fetch #{remote} #{branch}])
+
+        @ee_remote_with_branch = remote
+        @ee_branch_found = branch
+
+        return true
       end
 
       puts
@@ -271,6 +279,10 @@ module Gitlab
       @ee_patch_full_path ||= patches_dir.join(ee_patch_name)
     end
 
+    def minimal_ee_branch_name
+      @minimal_ee_branch_name ||= ce_branch.sub(/(\Ace\-|\-ce\z)/, '')
+    end
+
     def patch_name_from_branch(branch_name)
       branch_name.parameterize << '.patch'
     end