Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-25

# Conflicts:
#	app/serializers/issue_sidebar_basic_entity.rb
#	app/serializers/issue_sidebar_entity.rb
#	app/serializers/issue_sidebar_extras_entity.rb
#	ee/app/serializers/draft_note_serializer.rb
#	spec/serializers/issue_serializer_spec.rb

[ci skip]

GITALY_SERVER_VERSION

-1.9.0
+1.12.0

PROCESS.md

@@ -58,6 +58,18 @@ their contributions accepted by meeting our [Definition of done][done].
 
 What you can expect from them is described at https://about.gitlab.com/roles/merge-request-coach/.
 
+### Milestones on community contribution issues
+
+The milestone of an issue that is currently being worked on by a community contributor
+should not be set to a named GitLab milestone (e.g. 11.7, 11.8), until the associated
+merge request is very close to being merged, and we will likely know in which named
+GitLab milestone the issue will land. There are many factors that influence when
+a community contributor finishes an issue, or even at all. So we should set this 
+milestone only when we have more certainty.
+
+Note this only applies to issues currently assigned to community contributors. For
+issues assigned to GitLabbers, we are [ambitious in assigning milestones to issues](https://about.gitlab.com/direction/#how-we-plan-releases).
+
 ## Assigning issues
 
 If an issue is complex and needs the attention of a specific person, assignment is a good option but assigning issues might discourage other people from contributing to that issue. We need all the contributions we can get so this should never be discouraged. Also, an assigned person might not have time for a few weeks, so others should feel free to takeover.

app/assets/javascripts/serverless/components/functions.vue

@@ -81,7 +81,7 @@ export default {
           </p>
           <ul>
             <li>Your repository does not have a corresponding <code>serverless.yml</code> file.</li>
-            <li>Your <code>gitlab-ci.yml</code> file is not properly configured.</li>
+            <li>Your <code>.gitlab-ci.yml</code> file is not properly configured.</li>
             <li>
               The functions listed in the <code>serverless.yml</code> file don't match the namespace
               of your cluster.

app/helpers/application_settings_helper.rb

@@ -26,6 +26,18 @@ module ApplicationSettingsHelper
     end
   end
 
+  def all_protocols_enabled?
+    Gitlab::CurrentSettings.enabled_git_access_protocol.blank?
+  end
+
+  def ssh_enabled?
+    all_protocols_enabled? || enabled_protocol == 'ssh'
+  end
+
+  def http_enabled?
+    all_protocols_enabled? || enabled_protocol == 'http'
+  end
+
   def enabled_project_button(project, protocol)
     case protocol
     when 'ssh'

app/serializers/issue_sidebar_basic_entity.rb

@@ -4,5 +4,8 @@ class IssueSidebarBasicEntity < IssuableSidebarBasicEntity
   expose :due_date
   expose :confidential
 end
+<<<<<<< HEAD
 
 IssueSidebarBasicEntity.prepend(EE::IssueSidebarBasicEntity)
+=======
+>>>>>>> upstream/master

app/serializers/issue_sidebar_extras_entity.rb

-# frozen_string_literal: true
-
-class IssueSidebarExtrasEntity < IssuableSidebarExtrasEntity
-  expose :assignees, using: API::Entities::UserBasic
-end
-
-IssueSidebarExtrasEntity.prepend(EE::IssueSidebarExtrasEntity)

app/views/projects/buttons/_clone.html.haml

 - project = project || @project
 
 .git-clone-holder.js-git-clone-holder.input-group
-  - if allowed_protocols_present?
-    .input-group-text.clone-dropdown-btn.btn
-      %span.js-clone-dropdown-label
-        = enabled_project_button(project, enabled_protocol)
-  - else
   %a#clone-dropdown.input-group-text.btn.btn-primary.btn-xs.clone-dropdown-btn.qa-clone-dropdown{ href: '#', data: { toggle: 'dropdown' } }
     %span.append-right-4.js-clone-dropdown-label
       = _('Clone')
     = sprite_icon("arrow-down", css_class: "icon")
     %form.p-3.dropdown-menu.dropdown-menu-right.dropdown-menu-large.dropdown-menu-selectable.clone-options-dropdown.qa-clone-options
+      - if ssh_enabled?
         %li.pb-2
           %label.label-bold
             = _('Clone with SSH')
@@ -20,6 +16,7 @@
               = clipboard_button(target: '#ssh_project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-default btn-clipboard")
               = render_if_exists 'projects/buttons/geo'
         %li
+      - if http_enabled?
         %label.label-bold
           = _('Clone with %{http_label}') % { http_label: gitlab_config.protocol.upcase }
         .input-group

app/views/shared/_mobile_clone_panel.html.haml

@@ -7,7 +7,9 @@
   %button.btn.btn-primary.dropdown-toggle.js-dropdown-toggle{ type: "button", data: { toggle: "dropdown" } }
     = sprite_icon("arrow-down", css_class: "dropdown-btn-icon icon")
   %ul.dropdown-menu.dropdown-menu-selectable.dropdown-menu-right.clone-options-dropdown{ data: { dropdown: true } }
+    - if ssh_enabled?
       %li
         = dropdown_item_with_description(ssh_copy_label, project.ssh_url_to_repo, href: project.ssh_url_to_repo, data: { clone_type: 'ssh' }, default: true)
+    - if http_enabled?
       %li
         = dropdown_item_with_description(http_copy_label, project.http_url_to_repo, href: project.http_url_to_repo, data: { clone_type: 'http' })

changelogs/unreleased/sh-fix-http-clone-panel.yml

+---
+title: Fix missing Git clone button when protocol restriction setting enabled
+merge_request: 24015
+author:
+type: fixed

changelogs/unreleased/spec-positional-arguments.yml

+---
+title: 'Fix deprecation: Using positional arguments in integration tests'
+merge_request: 24009
+author: Jasper Maes
+type: other

doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md

@@ -254,7 +254,7 @@ To ensure our changes don't break the build and all tests still pass, we utilize
 Continuous Integration (CI) to run these checks automatically for every push.
 Read through this article to understand [Continuous Integration, Continuous Delivery, and Continuous Deployment](https://about.gitlab.com/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/),
 and how these methods are leveraged by GitLab.
-From the [last tutorial](https://ryanhallcs.wordpress.com/2017/03/15/devops-and-game-dev/) we already have a `gitlab-ci.yml` file set up for building our app from
+From the [last tutorial](https://ryanhallcs.wordpress.com/2017/03/15/devops-and-game-dev/) we already have a `.gitlab-ci.yml` file set up for building our app from
 every push. We need to set up a new CI job for testing, which GitLab CI/CD will run after the build job using our generated artifacts from gulp.
 
 Please read through the [documentation on CI/CD configuration](../../../ci/yaml/README.md) file to explore its contents and adjust it to your needs.

doc/install/kubernetes/gitlab_chart.md

@@ -47,8 +47,9 @@ In order to deploy GitLab on Kubernetes, the following are required:
 
 1. `helm` and `kubectl` [installed on your computer](preparation/tools_installation.md).
 1. A Kubernetes cluster, version 1.8 or higher. 6vCPU and 16GB of RAM is recommended.
-   - [Google GKE](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-container-cluster)
    - [Amazon EKS](https://docs.aws.amazon.com/eks/latest/userguide/getting-started.html)
+   - [Google GKE](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-container-cluster)
+   - [IBM IKS](https://console.bluemix.net/docs/tutorials/scalable-webapp-kubernetes.html#create_kube_cluster)
    - [Microsoft AKS](https://docs.microsoft.com/en-us/azure/aks/kubernetes-walkthrough-portal)
 1. A [wildcard DNS entry and external IP address](preparation/networking.md)
 1. [Authenticate and connect](preparation/connect.md) to the cluster

doc/user/project/clusters/serverless/index.md

@@ -94,7 +94,7 @@ In order to deploy functions to your Knative instance, the following files must
    functions:
      stage: deploy
      environment: test
-     image: gcr.io/triggermesh/tm:v0.0.6
+     image: gcr.io/triggermesh/tm:v0.0.7
      script:
        - tm -n "$KUBE_NAMESPACE" set registry-auth gitlab-registry --registry "$CI_REGISTRY" --username "$CI_REGISTRY_USER" --password "$CI_JOB_TOKEN"
        - tm -n "$KUBE_NAMESPACE" --registry-host "$CI_REGISTRY_IMAGE" deploy --wait

doc/user/project/repository/index.md

@@ -29,7 +29,7 @@ You can either use the user interface (UI), or connect your local computer
 with GitLab [through the command line](../../../gitlab-basics/command-line-commands.md#start-working-on-your-project).
 
 To configure [GitLab CI/CD](../../../ci/README.md) to build, test, and deploy
-you code, add a file called [.`gitlab-ci.yml`](../../../ci/quick_start/README.md)
+you code, add a file called [`.gitlab-ci.yml`](../../../ci/quick_start/README.md)
 to your repository's root.
 
 **From the user interface:**

lib/api/helpers.rb

@@ -175,10 +175,12 @@ module API
     end
 
     def find_branch!(branch_name)
+      if Gitlab::GitRefValidator.validate(branch_name)
         user_project.repository.find_branch(branch_name) || not_found!('Branch')
-    rescue Gitlab::Git::CommandError
+      else
         render_api_error!('The branch refname is invalid', 400)
       end
+    end
 
     def find_project_label(id)
       labels = available_labels_for(user_project)

spec/features/admin/admin_disables_git_access_protocol_spec.rb

 require 'rails_helper'
 
-describe 'Admin disables Git access protocol' do
+describe 'Admin disables Git access protocol', :js do
   include StubENV
+  include MobileHelpers
 
   let(:project) { create(:project, :empty_repo) }
   let(:admin) { create(:admin) }
@@ -20,7 +21,24 @@ describe 'Admin disables Git access protocol' do
       visit_project
 
       expect(page).to have_content("git clone #{project.ssh_url_to_repo}")
-      expect(page).not_to have_selector('#clone-dropdown')
+
+      find('.clone-dropdown-btn').click
+
+      within('.git-clone-holder') do
+        expect(page).to have_content('Clone with SSH')
+        expect(page).not_to have_content('Clone with HTTP')
+      end
+    end
+
+    context 'mobile component' do
+      it 'shows only the SSH clone information' do
+        resize_screen_xs
+        visit_project
+        find('.dropdown-toggle').click
+
+        expect(page).to have_content('Copy SSH clone URL')
+        expect(page).not_to have_content('Copy HTTP clone URL')
+      end
     end
   end
 
@@ -31,9 +49,25 @@ describe 'Admin disables Git access protocol' do
 
     it 'shows only HTTP url' do
       visit_project
+      find('.clone-dropdown-btn').click
 
       expect(page).to have_content("git clone #{project.http_url_to_repo}")
-      expect(page).not_to have_selector('#clone-dropdown')
+
+      within('.git-clone-holder') do
+        expect(page).to have_content('Clone with HTTP')
+        expect(page).not_to have_content('Clone with SSH')
+      end
+    end
+
+    context 'mobile component' do
+      it 'shows only the HTTP clone information' do
+        resize_screen_xs
+        visit_project
+        find('.dropdown-toggle').click
+
+        expect(page).to have_content('Copy HTTP clone URL')
+        expect(page).not_to have_content('Copy SSH clone URL')
+      end
     end
   end
 
@@ -46,7 +80,24 @@ describe 'Admin disables Git access protocol' do
       visit_project
 
       expect(page).to have_content("git clone #{project.ssh_url_to_repo}")
-      expect(page).to have_selector('#clone-dropdown')
+
+      find('.clone-dropdown-btn').click
+
+      within('.git-clone-holder') do
+        expect(page).to have_content('Clone with SSH')
+        expect(page).to have_content('Clone with HTTP')
+      end
+    end
+
+    context 'mobile component' do
+      it 'shows both SSH and HTTP clone information' do
+        resize_screen_xs
+        visit_project
+        find('.dropdown-toggle').click
+
+        expect(page).to have_content('Copy HTTP clone URL')
+        expect(page).to have_content('Copy SSH clone URL')
+      end
     end
   end
 

spec/requests/rack_attack_global_spec.rb

@@ -345,7 +345,7 @@ describe 'Rack Attack global throttles' do
   end
 
   def api_get_args_with_token_headers(partial_url, token_headers)
-    ["/api/#{API::API.version}#{partial_url}", nil, token_headers]
+    ["/api/#{API::API.version}#{partial_url}", params: nil, headers: token_headers]
   end
 
   def rss_url(user)

spec/serializers/issue_serializer_spec.rb

@@ -37,6 +37,7 @@ describe IssueSerializer do
     end
   end
 
+<<<<<<< HEAD
   context 'board issue serialization' do
     let(:serializer) { 'board' }
 
@@ -45,6 +46,8 @@ describe IssueSerializer do
     end
   end
 
+=======
+>>>>>>> upstream/master
   context 'board issue serialization' do
     let(:serializer) { 'board' }
 

spec/support/shared_examples/requests/api/diff_discussions.rb

@@ -27,7 +27,8 @@ shared_examples 'diff discussions API' do |parent_type, noteable_type, id_name|
     it "creates a new diff note" do
       position = diff_note.position.to_h
 
-      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user), body: 'hi!', position: position
+      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user),
+        params: { body: 'hi!', position: position }
 
       expect(response).to have_gitlab_http_status(201)
       expect(json_response['notes'].first['body']).to eq('hi!')
@@ -38,7 +39,8 @@ shared_examples 'diff discussions API' do |parent_type, noteable_type, id_name|
     it "returns a 400 bad request error when position is invalid" do
       position = diff_note.position.to_h.merge(new_line: '100000')
 
-      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user), body: 'hi!', position: position
+      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user),
+        params: { body: 'hi!', position: position }
 
       expect(response).to have_gitlab_http_status(400)
     end
@@ -47,7 +49,7 @@ shared_examples 'diff discussions API' do |parent_type, noteable_type, id_name|
   describe "POST /#{parent_type}/:id/#{noteable_type}/:noteable_id/discussions/:discussion_id/notes" do
     it 'adds a new note to the diff discussion' do
       post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\
-               "discussions/#{diff_note.discussion_id}/notes", user), body: 'hi!'
+               "discussions/#{diff_note.discussion_id}/notes", user), params: { body: 'hi!' }
 
       expect(response).to have_gitlab_http_status(201)
       expect(json_response['body']).to eq('hi!')

spec/support/shared_examples/requests/api/discussions.rb

@@ -42,7 +42,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name|
 
   describe "POST /#{parent_type}/:id/#{noteable_type}/:noteable_id/discussions" do
     it "creates a new note" do
-      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user), body: 'hi!'
+      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user), params: { body: 'hi!' }
 
       expect(response).to have_gitlab_http_status(201)
       expect(json_response['notes'].first['body']).to eq('hi!')
@@ -56,7 +56,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name|
     end
 
     it "returns a 401 unauthorized error if user not authenticated" do
-      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions"), body: 'hi!'
+      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions"), params: { body: 'hi!' }
 
       expect(response).to have_gitlab_http_status(401)
     end
@@ -65,7 +65,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name|
       it 'accepts the creation date to be set' do
         creation_time = 2.weeks.ago
         post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user),
-          body: 'hi!', created_at: creation_time
+          params: { body: 'hi!', created_at: creation_time }
 
         expect(response).to have_gitlab_http_status(201)
         expect(json_response['notes'].first['body']).to eq('hi!')
@@ -81,7 +81,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name|
 
       it 'responds with 404' do
         post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", private_user),
-          body: 'Foo'
+          params: { body: 'Foo' }
 
         expect(response).to have_gitlab_http_status(404)
       end
@@ -91,7 +91,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name|
   describe "POST /#{parent_type}/:id/#{noteable_type}/:noteable_id/discussions/:discussion_id/notes" do
     it 'adds a new note to the discussion' do
       post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\
-               "discussions/#{note.discussion_id}/notes", user), body: 'Hello!'
+               "discussions/#{note.discussion_id}/notes", user), params: { body: 'Hello!' }
 
       expect(response).to have_gitlab_http_status(201)
       expect(json_response['body']).to eq('Hello!')
@@ -109,7 +109,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name|
       note.update_attribute(:type, nil)
 
       post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\
-               "discussions/#{note.discussion_id}/notes", user), body: 'hi!'
+               "discussions/#{note.discussion_id}/notes", user), params: { body: 'hi!' }
 
       expect(response).to have_gitlab_http_status(400)
     end
@@ -118,7 +118,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name|
   describe "PUT /#{parent_type}/:id/#{noteable_type}/:noteable_id/discussions/:discussion_id/notes/:note_id" do
     it 'returns modified note' do
       put api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\
-              "discussions/#{note.discussion_id}/notes/#{note.id}", user), body: 'Hello!'
+              "discussions/#{note.discussion_id}/notes/#{note.id}", user), params: { body: 'Hello!' }
 
       expect(response).to have_gitlab_http_status(200)
       expect(json_response['body']).to eq('Hello!')
@@ -127,7 +127,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name|
     it 'returns a 404 error when note id not found' do
       put api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\
               "discussions/#{note.discussion_id}/notes/12345", user),
-              body: 'Hello!'
+              params: { body: 'Hello!' }
 
       expect(response).to have_gitlab_http_status(404)
     end

spec/support/shared_examples/requests/api/notes.rb

@@ -86,7 +86,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
 
   describe "POST /#{parent_type}/:id/#{noteable_type}/:noteable_id/notes" do
     it "creates a new note" do
-      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), body: 'hi!'
+      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: { body: 'hi!' }
 
       expect(response).to have_gitlab_http_status(201)
       expect(json_response['body']).to eq('hi!')
@@ -100,7 +100,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
     end
 
     it "returns a 401 unauthorized error if user not authenticated" do
-      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes"), body: 'hi!'
+      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes"), params: { body: 'hi!' }
 
       expect(response).to have_gitlab_http_status(401)
     end
@@ -108,7 +108,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
     it "creates an activity event when a note is created" do
       expect(Event).to receive(:create!)
 
-      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), body: 'hi!'
+      post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: { body: 'hi!' }
     end
 
     context 'setting created_at' do
@@ -190,7 +190,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
     context 'when the user is posting an award emoji on a noteable created by someone else' do
       it 'creates a new note' do
         parent.add_developer(private_user)
-        post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", private_user), body: ':+1:'
+        post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", private_user), params: { body: ':+1:' }
 
         expect(response).to have_gitlab_http_status(201)
         expect(json_response['body']).to eq(':+1:')
@@ -199,7 +199,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
 
     context 'when the user is posting an award emoji on his/her own noteable' do
       it 'creates a new note' do
-        post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), body: ':+1:'
+        post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: { body: ':+1:' }
 
         expect(response).to have_gitlab_http_status(201)
         expect(json_response['body']).to eq(':+1:')
@@ -213,7 +213,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
 
       it 'responds with 404' do
         post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", private_user),
-          body: 'Foo'
+          params: { body: 'Foo' }
 
         expect(response).to have_gitlab_http_status(404)
       end
@@ -223,7 +223,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
   describe "PUT /#{parent_type}/:id/#{noteable_type}/:noteable_id/notes/:note_id" do
     it 'returns modified note' do
       put api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\
-                "notes/#{note.id}", user), body: 'Hello!'
+                "notes/#{note.id}", user), params: { body: 'Hello!' }
 
       expect(response).to have_gitlab_http_status(200)
       expect(json_response['body']).to eq('Hello!')
@@ -231,7 +231,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
 
     it 'returns a 404 error when note id not found' do
       put api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes/12345", user),
-              body: 'Hello!'
+              params: { body: 'Hello!' }
 
       expect(response).to have_gitlab_http_status(404)
     end

spec/support/shared_examples/requests/api/resolvable_discussions.rb

@@ -65,7 +65,7 @@ shared_examples 'resolvable discussions API' do |parent_type, noteable_type, id_
     it 'returns a 404 error when note id not found' do
       put api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/"\
               "discussions/#{note.discussion_id}/notes/12345", user),
-              body: 'Hello!'
+              params: { body: 'Hello!' }
 
       expect(response).to have_gitlab_http_status(404)
     end