Merge remote-tracking branch 'upstream/master' into ce-to-ee-2019-02-02

# Conflicts:
#	app/assets/javascripts/monitoring/components/dashboard.vue
#	app/views/admin/application_settings/_account_and_limit.html.haml
#	ee/app/assets/javascripts/geo_nodes/event_hub.js
#	locale/gitlab.pot
#	qa/qa/page/main/login.rb

[ci skip]

.gitlab-ci.yml

@@ -151,9 +151,8 @@ stages:
   variables: &single-script-job-variables
     GIT_STRATEGY: none
   before_script:
-    # We need to download the script rather than clone the repo since the
-    # package-and-qa job will not be able to run when the branch gets
-    # deleted (when merging the MR).
+    # We don't clone the repo by using GIT_STRATEGY: none and only download the
+    # single script we need here so it's much faster than cloning.
     - export SCRIPT_NAME="${SCRIPT_NAME:-$CI_JOB_NAME}"
     - apk add --update openssl
     - wget $CI_PROJECT_URL/raw/$CI_COMMIT_SHA/scripts/$SCRIPT_NAME
@@ -319,20 +318,21 @@ stages:
 # Trigger a package build in omnibus-gitlab repository
 #
 package-and-qa:
-  <<: *single-script-job
+  image: ruby:2.5-alpine
+  stage: test
+  before_script: []
+  dependencies: []
+  cache: {}
   variables:
-    <<: *single-script-job-variables
+    GIT_DEPTH: "1"
     API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
-    SCRIPT_NAME: trigger-build
   retry: 0
   script:
-    - gem install gitlab --no-document
     - apk add --update openssl curl jq
-    - wget $CI_PROJECT_URL/raw/$CI_COMMIT_SHA/scripts/review_apps/review-apps.sh
-    - chmod 755 review-apps.sh
-    - source ./review-apps.sh
+    - gem install gitlab --no-document
+    - source ./scripts/review_apps/review-apps.sh
     - wait_for_job_to_be_done "gitlab:assets:compile"
-    - ./$SCRIPT_NAME omnibus
+    - ./scripts/trigger-build omnibus
   when: manual
   only:
     - //@gitlab-org/gitlab-ce
@@ -1121,20 +1121,21 @@ no_ee_check:
 
 # GitLab Review apps
 review-build-cng:
-  <<: *single-script-job
   <<: *review-only
+  image: ruby:2.5-alpine
+  stage: test
+  before_script: []
+  dependencies: []
+  cache: {}
   variables:
-    <<: *single-script-job-variables
-    SCRIPT_NAME: trigger-build
+    GIT_DEPTH: "1"
     API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
   script:
-    - gem install gitlab --no-document
     - apk add --update openssl curl jq
-    - wget $CI_PROJECT_URL/raw/$CI_COMMIT_SHA/scripts/review_apps/review-apps.sh
-    - chmod 755 review-apps.sh
-    - source ./review-apps.sh
+    - gem install gitlab --no-document
+    - source ./scripts/review_apps/review-apps.sh
     - wait_for_job_to_be_done "gitlab:assets:compile"
-    - BUILD_TRIGGER_TOKEN=$REVIEW_APPS_BUILD_TRIGGER_TOKEN ./$SCRIPT_NAME cng
+    - BUILD_TRIGGER_TOKEN=$REVIEW_APPS_BUILD_TRIGGER_TOKEN ./scripts/trigger-build cng
 
 review-deploy:
   <<: *review-base

GITALY_SERVER_VERSION

-1.14.1
+1.17.0

app/assets/javascripts/jobs/components/stages_dropdown.vue

@@ -39,7 +39,9 @@ export default {
     <ci-icon :status="pipeline.details.status" class="vertical-align-middle" />
 
     <span class="font-weight-bold">{{ __('Pipeline') }}</span>
-    <a :href="pipeline.path" class="js-pipeline-path link-commit">#{{ pipeline.id }}</a>
+    <a :href="pipeline.path" class="js-pipeline-path link-commit qa-pipeline-path"
+      >#{{ pipeline.id }}</a
+    >
     <template v-if="hasRef">
       {{ __('from') }}
       <a :href="pipeline.ref.path" class="link-commit ref-name">{{ pipeline.ref.name }}</a>

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -221,6 +221,7 @@ export default {
         :graph-data="graphData"
         :alert-data="getGraphAlerts(graphData.id)"
         group-id="monitor-area-chart"
+<<<<<<< HEAD
       >
         <!-- EE content -->
         <alert-widget
@@ -233,6 +234,9 @@ export default {
           @setAlerts="setAlerts"
         />
       </monitor-area-chart>
+=======
+      />
+>>>>>>> upstream/master
     </graph-group>
   </div>
   <empty-state

app/assets/javascripts/pipelines/components/graph/job_item.vue

@@ -108,7 +108,7 @@ export default {
       :href="status.details_path"
       :title="tooltipText"
       :class="cssClassJobName"
-      class="js-pipeline-graph-job-link"
+      class="js-pipeline-graph-job-link qa-job-link"
     >
       <job-name-component :name="job.name" :status="job.status" />
     </gl-link>

app/graphql/resolvers/issues_resolver.rb

@@ -4,6 +4,10 @@ module Resolvers
   class IssuesResolver < BaseResolver
     extend ActiveSupport::Concern
 
+    argument :iids, [GraphQL::ID_TYPE],
+              required: false,
+              description: 'The list of IIDs of issues, e.g., [1, 2]'
+
     argument :search, GraphQL::STRING_TYPE,
               required: false
     argument :sort, Types::Sort,

app/views/admin/application_settings/_account_and_limit.html.haml

@@ -49,6 +49,7 @@
         = f.label :user_show_add_ssh_key_message, class: 'form-check-label' do
           Inform users without uploaded SSH keys that they can't push over SSH until one is added
 
+<<<<<<< HEAD
     - if ::Gitlab.dev_env_or_com?
       .form-group
         = f.label :check_namespace_plan, 'Check feature availability on namespace plan', class: 'label-bold'
@@ -58,4 +59,6 @@
             Enabling this will only make licensed EE features available to projects if the project namespace's plan
             includes the feature or if the project is public.
 
+=======
+>>>>>>> upstream/master
   = f.submit 'Save changes', class: 'btn btn-success qa-save-changes-button'

changelogs/unreleased/51913-api-getting-projects-for-users-with-dot-gets-404.yml

+---
+title: 'API: Support username with dots'
+merge_request: 24395
+author: Robert Schilling
+type: fixed

changelogs/unreleased/57063-implement-new-arguments-iid-for-issuesresolver-in-graphql.yml

+---
+title: Add argument iids for issues in GraphQL
+merge_request: 24802
+author:
+type: added

changelogs/unreleased/update-gitaly.yml

+---
+title: Update Gitaly to v1.17.0
+merge_request: 24873
+author:
+type: other

doc/api/merge_requests.md

@@ -183,6 +183,7 @@ Parameters:
 | `source_branch`     | string         | no       | Return merge requests with the given source branch                                                                             |
 | `target_branch`     | string         | no       | Return merge requests with the given target branch                                                                             |
 | `search`            | string         | no       | Search merge requests against their `title` and `description`                                                                  |
+| `wip`               | string         | no       | Filter merge requests against their `wip` status. `yes` to return *only* WIP merge requests, `no` to return *non* WIP merge requests |
 
 ```json
 [

lib/api/api.rb

@@ -9,6 +9,7 @@ module API
     NO_SLASH_URL_PART_REGEX = %r{[^/]+}
     NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze
     COMMIT_ENDPOINT_REQUIREMENTS = NAMESPACE_OR_PROJECT_REQUIREMENTS.merge(sha: NO_SLASH_URL_PART_REGEX).freeze
+    USER_REQUIREMENTS = { user_id: NO_SLASH_URL_PART_REGEX }.freeze
 
     insert_before Grape::Middleware::Error,
                   GrapeLogging::Middleware::RequestLogger,

lib/api/projects.rb

@@ -130,7 +130,7 @@ module API
       end
     end
 
-    resource :users, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
+    resource :users, requirements: API::USER_REQUIREMENTS do
       desc 'Get a user projects' do
         success Entities::BasicProjectDetails
       end

lib/api/users.rb

@@ -139,10 +139,10 @@ module API
 
       desc "Get the status of a user"
       params do
-        requires :id_or_username, type: String, desc: 'The ID or username of the user'
+        requires :user_id, type: String, desc: 'The ID or username of the user'
       end
-      get ":id_or_username/status" do
-        user = find_user(params[:id_or_username])
+      get ":user_id/status", requirements: API::USER_REQUIREMENTS do
+        user = find_user(params[:user_id])
         not_found!('User') unless user && can?(current_user, :read_user, user)
 
         present user.status || {}, with: Entities::UserStatus

locale/gitlab.pot

@@ -5809,6 +5809,7 @@ msgstr ""
 msgid "Metrics|Learn about environments"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Metrics|Legend label (optional)"
 msgstr ""
 
@@ -5821,6 +5822,8 @@ msgstr ""
 msgid "Metrics|New metric"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Metrics|No deployed environments"
 msgstr ""
 
@@ -7304,6 +7307,7 @@ msgstr ""
 msgid "ProjectsDropdown|This feature requires browser localStorage support"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "PrometheusAlerts|Add alert"
 msgstr ""
 
@@ -7334,6 +7338,8 @@ msgstr ""
 msgid "PrometheusAlerts|Threshold"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "PrometheusService|%{exporters} with %{metrics} were found"
 msgstr ""
 

qa/qa/page/main/login.rb

@@ -153,6 +153,7 @@ module QA
         def sign_in_with_github
           set_initial_password_if_present
           click_element :github_login_button
+<<<<<<< HEAD
         end
 
         def sign_in_with_saml
@@ -162,6 +163,25 @@ module QA
 
         private
 
+=======
+        end
+
+        def sign_in_with_saml
+          set_initial_password_if_present
+          click_element :saml_login_button
+        end
+
+        private
+
+        def sign_in_using_ldap_credentials
+          switch_to_ldap_tab
+
+          fill_element :username_field, Runtime::User.ldap_username
+          fill_element :password_field, Runtime::User.ldap_password
+          click_element :sign_in_button
+        end
+
+>>>>>>> upstream/master
         def sign_in_using_gitlab_credentials(user)
           switch_to_sign_in_tab if has_sign_in_tab?
           switch_to_standard_tab if has_standard_tab?

qa/qa/page/project/job/show.rb

@@ -16,11 +16,19 @@ module QA::Page
         element :status_badge
       end
 
+      view 'app/assets/javascripts/jobs/components/stages_dropdown.vue' do
+        element :pipeline_path
+      end
+
       def completed?
         COMPLETED_STATUSES.include?(status_badge)
       end
 
-      def passed?
+      def successful?(timeout: 60)
+        wait(reload: false, max: timeout) do
+          completed? && !trace_loading?
+        end
+
         status_badge == PASSED_STATUS
       end
 

qa/qa/page/project/pipeline/show.rb

@@ -11,7 +11,7 @@ module QA::Page
 
       view 'app/assets/javascripts/pipelines/components/graph/job_item.vue' do
         element :job_component, /class.*ci-job-component.*/ # rubocop:disable QA/ElementWithPattern
-        element :job_link, /class.*js-pipeline-graph-job-link.*/ # rubocop:disable QA/ElementWithPattern
+        element :job_link
       end
 
       view 'app/assets/javascripts/vue_shared/components/ci_icon.vue' do
@@ -32,6 +32,10 @@ module QA::Page
         end
       end
 
+      def go_to_job(job_name)
+        find_element(:job_link, job_name).click
+      end
+
       def go_to_first_job
         css = '.js-pipeline-graph-job-link'
 

qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb

@@ -95,11 +95,7 @@ module QA
           Page::Project::Pipeline::Show.act { go_to_first_job }
 
           Page::Project::Job::Show.perform do |job|
-            job.wait(reload: false) do
-              job.completed? && !job.trace_loading?
-            end
-
-            expect(job.passed?).to be_truthy, "Job status did not become \"passed\"."
+            expect(job).to be_successful, "Job status did not become \"passed\"."
             expect(job.output).to include(sha1sum)
           end
         end

qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb

@@ -75,9 +75,30 @@ module QA
             Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
 
             Page::Project::Pipeline::Show.perform do |pipeline|
-              expect(pipeline).to have_build('build', status: :success, wait: 600)
-              expect(pipeline).to have_build('test', status: :success, wait: 600)
-              expect(pipeline).to have_build('production', status: :success, wait: 1200)
+              pipeline.go_to_job('build')
+            end
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_sucessful(timeout: 600), "Job did not pass"
+
+              job.click_element(:pipeline_path)
+            end
+
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.go_to_job('test')
+            end
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_sucessful(timeout: 600), "Job did not pass"
+
+              job.click_element(:pipeline_path)
+            end
+
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.go_to_job('production')
+            end
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_sucessful(timeout: 1200), "Job did not pass"
+
+              job.click_element(:pipeline_path)
             end
 
             Page::Project::Menu.act { click_operations_environments }
@@ -115,9 +136,30 @@ module QA
             Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
 
             Page::Project::Pipeline::Show.perform do |pipeline|
-              expect(pipeline).to have_build('build', status: :success, wait: 600)
-              expect(pipeline).to have_build('test', status: :success, wait: 600)
-              expect(pipeline).to have_build('production', status: :success, wait: 1200)
+              pipeline.go_to_job('build')
+            end
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_sucessful(timeout: 600), "Job did not pass"
+
+              job.click_element(:pipeline_path)
+            end
+
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.go_to_job('test')
+            end
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_sucessful(timeout: 600), "Job did not pass"
+
+              job.click_element(:pipeline_path)
+            end
+
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.go_to_job('production')
+            end
+            Page::Project::Job::Show.perform do |job|
+              expect(job).to be_sucessful(timeout: 1200), "Job did not pass"
+
+              job.click_element(:pipeline_path)
             end
 
             Page::Project::Menu.act { click_operations_environments }

spec/graphql/resolvers/issues_resolver_spec.rb

@@ -32,6 +32,26 @@ describe Resolvers::IssuesResolver do
 
       expect(resolve_issues).to contain_exactly(issue, issue2)
     end
+
+    it 'finds a specific issue with iids' do
+      expect(resolve_issues(iids: issue.iid)).to contain_exactly(issue)
+    end
+
+    it 'finds multiple issues with iids' do
+      expect(resolve_issues(iids: [issue.iid, issue2.iid]))
+        .to contain_exactly(issue, issue2)
+    end
+
+    it 'finds only the issues within the project we are looking at' do
+      another_project = create(:project)
+      iids = [issue, issue2].map(&:iid)
+
+      iids.each do |iid|
+        create(:issue, project: another_project, iid: iid)
+      end
+
+      expect(resolve_issues(iids: iids)).to contain_exactly(issue, issue2)
+    end
   end
 
   def resolve_issues(args = {}, context = { current_user: current_user })

spec/requests/api/projects_spec.rb

@@ -21,7 +21,7 @@ describe API::Projects do
   let(:project) { create(:project, :repository, namespace: user.namespace) }
   let(:project2) { create(:project, namespace: user.namespace) }
   let(:project_member) { create(:project_member, :developer, user: user3, project: project) }
-  let(:user4) { create(:user) }
+  let(:user4) { create(:user, username: 'user.with.dot') }
   let(:project3) do
     create(:project,
     :private,
@@ -724,7 +724,7 @@ describe API::Projects do
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
-    it 'returns projects filtered by user' do
+    it 'returns projects filtered by user id' do
       get api("/users/#{user4.id}/projects/", user)
 
       expect(response).to have_gitlab_http_status(200)
@@ -733,6 +733,15 @@ describe API::Projects do
       expect(json_response.map { |project| project['id'] }).to contain_exactly(public_project.id)
     end
 
+    it 'returns projects filtered by username' do
+      get api("/users/#{user4.username}/projects/", user)
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to include_pagination_headers
+      expect(json_response).to be_an Array
+      expect(json_response.map { |project| project['id'] }).to contain_exactly(public_project.id)
+    end
+
     it 'returns projects filtered by minimal access level' do
       private_project1 = create(:project, :private, name: 'private_project1', creator_id: user4.id, namespace: user4.namespace)
       private_project2 = create(:project, :private, name: 'private_project2', creator_id: user4.id, namespace: user4.namespace)

spec/requests/api/users_spec.rb

 require 'spec_helper'
 
 describe API::Users do
-  let(:user)  { create(:user) }
+  let(:user)  { create(:user, username: 'user.with.dot') }
   let(:admin) { create(:admin) }
   let(:key) { create(:key, user: user) }
   let(:gpg_key) { create(:gpg_key, user: user) }