Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-21

# Conflicts:
#	spec/javascripts/environments/environments_app_spec.js

[ci skip]

.gitlab-ci.yml

@@ -156,6 +156,23 @@ stages:
   <<: *dedicated-no-docs-pull-cache-job
   <<: *except-docs-and-qa
 
+.single-script-job: &single-script-job
+  image: ruby:2.4-alpine
+  before_script: []
+  stage: build
+  cache: {}
+  dependencies: []
+  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).
+    - export SCRIPT_NAME="${SCRIPT_NAME:-$CI_JOB_NAME}"
+    - apk add --update openssl
+    - wget $CI_PROJECT_URL/raw/$CI_COMMIT_SHA/scripts/$SCRIPT_NAME
+    - chmod 755 $SCRIPT_NAME
+
 .rake-exec: &rake-exec
   <<: *dedicated-no-docs-no-db-pull-cache-job
   script:
@@ -295,19 +312,10 @@ stages:
 .review-docs: &review-docs
   <<: *dedicated-runner
   <<: *except-qa
-  image: ruby:2.4-alpine
-  before_script:
-    - gem install gitlab --no-doc
-    # We need to download the script rather than clone the repo since the
-    # review-docs-cleanup job will not be able to run when the branch gets
-    # deleted (when merging the MR).
-    - apk add --update openssl
-    - wget https://gitlab.com/gitlab-org/gitlab-ce/raw/master/scripts/trigger-build-docs
-    - chmod 755 trigger-build-docs
-  cache: {}
-  dependencies: []
+  <<: *single-script-job
   variables:
-    GIT_STRATEGY: none
+    <<: *single-script-job-variables
+    SCRIPT_NAME: trigger-build-docs
   when: manual
   only:
     - branches
@@ -359,23 +367,14 @@ stages:
 # Trigger a package build in omnibus-gitlab repository
 #
 package-and-qa:
-  image: ruby:2.4-alpine
-  before_script: []
-  stage: build
-  cache: {}
-  when: manual
+  <<: *single-script-job
   variables:
-    GIT_STRATEGY: none
+    <<: *single-script-job-variables
+    SCRIPT_NAME: trigger-build-omnibus
   retry: 0
-  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).
-    - apk add --update openssl
-    - wget https://gitlab.com/$CI_PROJECT_PATH/raw/$CI_COMMIT_SHA/scripts/trigger-build-omnibus
-    - chmod 755 trigger-build-omnibus
   script:
-    - ./trigger-build-omnibus
+    - ./$SCRIPT_NAME
+  when: manual
   only:
     - //@gitlab-org/gitlab-ce
     - //@gitlab-org/gitlab-ee
@@ -392,7 +391,8 @@ review-docs-deploy:
     url: http://$DOCS_GITLAB_REPO_SUFFIX-$CI_COMMIT_REF_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
     on_stop: review-docs-cleanup
   script:
-    - ./trigger-build-docs deploy
+    - gem install gitlab --no-ri --no-rdoc
+    - ./$SCRIPT_NAME deploy
 
 # Cleanup remote environment of gitlab-docs
 review-docs-cleanup:
@@ -402,7 +402,26 @@ review-docs-cleanup:
     name: review-docs/$CI_COMMIT_REF_NAME
     action: stop
   script:
-    - ./trigger-build-docs cleanup
+    - gem install gitlab --no-ri --no-rdoc
+    - ./SCRIPT_NAME cleanup
+
+##
+# Trigger a docker image build in CNG (Cloud Native GitLab) repository
+#
+cloud-native-image:
+  image: ruby:2.4-alpine
+  before_script: []
+  stage: build
+  allow_failure: true
+  cache: {}
+  before_script:
+    - gem install gitlab --no-rdoc --no-ri
+    - chmod 755 ./scripts/trigger-build-cloud-native
+  script:
+    - ./scripts/trigger-build-cloud-native
+  only:
+    - tags@gitlab-org/gitlab-ce
+    - tags@gitlab-org/gitlab-ee
 
 # Retrieve knapsack and rspec_flaky reports
 retrieve-tests-metadata:
@@ -458,7 +477,7 @@ update-tests-metadata:
       - rspec_flaky/
     policy: push
   script:
-    - retry gem install fog-aws mime-types activesupport
+    - retry gem install fog-aws mime-types activesupport --no-ri --no-rdoc
     - scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json
     - scripts/merge-reports ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg-ee_node_*.json
     - scripts/merge-reports ${FLAKY_RSPEC_SUITE_REPORT_PATH} rspec_flaky/all_*_*.json

app/models/ci/build.rb

@@ -665,7 +665,7 @@ module Ci
       Gitlab::Ci::Variables::Collection.new.tap do |variables|
         break variables unless gitlab_deploy_token
 
-        variables.append(key: 'CI_DEPLOY_USER', value: gitlab_deploy_token.name)
+        variables.append(key: 'CI_DEPLOY_USER', value: gitlab_deploy_token.username)
         variables.append(key: 'CI_DEPLOY_PASSWORD', value: gitlab_deploy_token.token, public: false)
       end
     end

app/views/help/_shortcuts.html.haml

@@ -231,6 +231,17 @@
                   %td.shortcut
                     .key y
                   %td Go to file permalink
+              %tbody
+                %tr
+                  %th
+                  %th Web IDE
+                %tr
+                  %td.shortcut
+                    - if browser.platform.mac?
+                      .key ⌘ p
+                    - else
+                      .key ctrl p
+                  %td Go to file
           .col-lg-4
             %table.shortcut-mappings
               %tbody.hidden-shortcut.network{ style: 'display:none' }

changelogs/unreleased/46454-wrong-value-in-ci-deploy-user.yml

+---
+title: Fixes deploy token variables on Ci::Build
+merge_request: 19047
+author:
+type: fixed

changelogs/unreleased/jr-web-ide-shortcuts.yml

+---
+title: Add shortcuts to Web IDE docs and modal
+merge_request: 19044
+author:
+type: changed

doc/administration/monitoring/prometheus/gitlab_metrics.md

 # GitLab Prometheus metrics
 
 >**Note:**
-Available since [Omnibus GitLab 9.3][29118]. Currently experimental. For
+Available since [Omnibus GitLab 9.3][29118]. For
 installations from source you'll have to configure it yourself.
 
 To enable the GitLab Prometheus metrics:
@@ -24,7 +24,7 @@ server, because the embedded server configuration is overwritten once every
 
 ## Unicorn Metrics available
 
-In this experimental phase, only a few metrics are available:
+The following metrics are available:
 
 | Metric                            | Type      | Since | Description |
 |:--------------------------------- |:--------- |:----- |:----------- |

doc/administration/monitoring/prometheus/index.md

@@ -120,7 +120,7 @@ To disable the monitoring of Kubernetes:
 
 ## GitLab Prometheus metrics
 
-> Introduced as an experimental feature in GitLab 9.3.
+> Introduced in GitLab 9.3.
 
 GitLab monitors its own internal service metrics, and makes them available at the `/-/metrics` endpoint. Unlike other exporters, this endpoint requires authentication as it is available on the same URL and port as user traffic.
 

doc/user/project/deploy_tokens/index.md

@@ -76,7 +76,7 @@ pull images from your Container Registry.
 > [Introduced][ce-18414] in GitLab 10.8.
 
 There's a special case when it comes to Deploy Tokens, if a user creates one
-named `gitlab-deploy-token`, the name and token of the Deploy Token will be 
+named `gitlab-deploy-token`, the username and token of the Deploy Token will be 
 automatically exposed to the CI/CD jobs as environment variables: `CI_DEPLOY_USER` and 
 `CI_DEPLOY_PASSWORD`, respectively.
 

doc/workflow/shortcuts.md

@@ -88,3 +88,9 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
 | Keyboard Shortcut | Description |
 | ----------------- | ----------- |
 | <kbd>e</kbd> | Edit wiki page|
+
+## Web IDE
+
+| Keyboard Shortcut | Description |
+| ----------------- | ----------- |
+| <kbd>⌘</kbd> + <kbd>p</kbd> | Go to file |

qa/qa/specs/features/project/deploy_key_clone_spec.rb

@@ -33,13 +33,15 @@ module QA
     end
 
     keys = [
-      Runtime::Key::RSA.new(8192),
-      Runtime::Key::ECDSA.new(521),
-      Runtime::Key::ED25519.new
+      [Runtime::Key::RSA, 8192],
+      [Runtime::Key::ECDSA, 521],
+      [Runtime::Key::ED25519]
     ]
 
-    keys.each do |key|
-      scenario "user sets up a deploy key with #{key.name}(#{key.bits}) to clone code using pipelines" do
+    keys.each do |(key_class, bits)|
+      scenario "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines" do
+        key = key_class.new(*bits)
+
         login
 
         Factory::Resource::DeployKey.fabricate! do |resource|

scripts/prepare_build.sh

@@ -11,7 +11,7 @@ fi
 
 # Only install knapsack after bundle install! Otherwise oddly some native
 # gems could not be found under some circumstance. No idea why, hours wasted.
-retry gem install knapsack
+retry gem install knapsack --no-ri --no-rdoc
 
 cp config/gitlab.yml.example config/gitlab.yml
 sed -i 's/bin_path: \/usr\/bin\/git/bin_path: \/usr\/local\/bin\/git/' config/gitlab.yml

scripts/trigger-build-cloud-native

+#!/usr/bin/env ruby
+
+require 'gitlab'
+
+#
+# Configure credentials to be used with gitlab gem
+#
+Gitlab.configure do |config|
+  config.endpoint = 'https://gitlab.com/api/v4'
+end
+
+#
+# The remote project
+#
+GITLAB_CNG_REPO = 'gitlab-org/build/CNG'.freeze
+
+def ee?
+  ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md')
+end
+
+def read_file_version(filename)
+  raw_version = File.read(filename).strip
+
+  # if the version matches semver format, treat it as a tag and prepend `v`
+  if raw_version =~ Regexp.compile(/^\d+\.\d+\.\d+(-rc\d+)?(-ee)?$/)
+    "v#{raw_version}"
+  else
+    raw_version
+  end
+end
+
+def params
+  params = {
+    'GITLAB_SHELL_VERSION' => read_file_version('GITLAB_SHELL_VERSION'),
+    'GITALY_VERSION' => read_file_version('GITALY_SERVER_VERSION'),
+    'TRIGGERED_USER' => ENV['GITLAB_USER_NAME'],
+    'TRIGGER_SOURCE' => "https://gitlab.com/gitlab-org/#{ENV['CI_PROJECT_NAME']}/-/jobs/#{ENV['CI_JOB_ID']}"
+  }
+
+  if ee?
+    params['EE_PIPELINE'] = 'true'
+    params['GITLAB_EE_VERSION'] = ENV['CI_COMMIT_REF_NAME']
+  else
+    params['CE_PIPELINE'] = 'true'
+    params['GITLAB_CE_VERSION'] = ENV['CI_COMMIT_REF_NAME']
+  end
+
+  params
+end
+
+#
+# Trigger a pipeline
+#
+def trigger_pipeline
+  # Create the cross project pipeline using CI_JOB_TOKEN
+  pipeline = Gitlab.run_trigger(GITLAB_CNG_REPO, ENV['CI_JOB_TOKEN'], 'master', params)
+
+  puts "Triggered https://gitlab.com/#{GITLAB_CNG_REPO}/pipelines/#{pipeline.id}"
+end
+
+trigger_pipeline

spec/javascripts/environments/environments_app_spec.js

@@ -107,6 +107,7 @@ describe('Environment', () => {
             expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
             done();
           }, 0);
+<<<<<<< HEAD
         });
       });
 
@@ -118,6 +119,8 @@ describe('Environment', () => {
             ).toBeDefined();
             done();
           }, 0);
+=======
+>>>>>>> upstream/master
         });
       });
     });

spec/models/ci/build_spec.rb

@@ -2104,7 +2104,7 @@ describe Ci::Build do
 
       let(:deploy_token_variables) do
         [
-          { key: 'CI_DEPLOY_USER', value: deploy_token.name, public: true },
+          { key: 'CI_DEPLOY_USER', value: deploy_token.username, public: true },
           { key: 'CI_DEPLOY_PASSWORD', value: deploy_token.token, public: false }
         ]
       end