Commit 77a72746 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖
Browse files

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]
parents 77f0b417 dd26a9ad

.gitlab-ci.yml

+20 −19
Original line number Diff line number Diff line
@@ -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 −1
Original line number Diff line number Diff line 
1.14.1
 
1.17.0

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

+3 −1
Original line number Diff line number Diff line
@@ -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

+4 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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>