.gitlab-ci.yml

@@ -12,7 +12,9 @@ stages:
   - post-qa
   - pages
 
-# always use `gitlab-org` runners
+# always use `gitlab-org` runners, however
+# in cases where jobs require Docker-in-Docker, the job
+# definition must be extended with `.use-docker-in-docker`
 default:
   tags:
     - gitlab-org
@@ -49,6 +51,7 @@ variables:
   BUILD_ASSETS_IMAGE: "false"
   ES_JAVA_OPTS: "-Xms256m -Xmx256m"
   ELASTIC_URL: "http://elastic:changeme@elasticsearch:9200"
+  DOCKER_VERSION: "19.03.0"
 
 include:
   - local: .gitlab/ci/cache-repo.gitlab-ci.yml

.gitlab/ci/frontend.gitlab-ci.yml

@@ -15,10 +15,9 @@
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
+    - .use-docker-in-docker
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1
   stage: prepare
-  services:
-    - docker:19.03.0-dind
   variables:
     NODE_ENV: "production"
     RAILS_ENV: "production"
@@ -27,8 +26,6 @@
     WEBPACK_REPORT: "true"
     # we override the max_old_space_size to prevent OOM errors
     NODE_OPTIONS: --max_old_space_size=3584
-    DOCKER_DRIVER: overlay2
-    DOCKER_HOST: tcp://docker:2375
   cache:
     key: "assets-compile:production:v1"
   artifacts:
@@ -53,9 +50,6 @@
     - time scripts/build_assets_image
     - scripts/clean-old-cached-assets
     - rm -f /etc/apt/sources.list.d/google*.list  # We don't need to update Chrome here
-  tags:
-    - gitlab-org
-    - docker
 
 gitlab:assets:compile pull-push-cache:
   extends:

.gitlab/ci/global.gitlab-ci.yml

@@ -101,3 +101,15 @@
 .as-if-foss:
   variables:
     FOSS_ONLY: '1'
+
+.use-docker-in-docker:
+  image: docker:${DOCKER_VERSION}
+  services:
+    - docker:${DOCKER_VERSION}-dind
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
+  tags:
+    # See https://gitlab.com/gitlab-com/www-gitlab-com/-/issues/7019 for tag descriptions
+    - gitlab-org-docker

.gitlab/ci/reports.gitlab-ci.yml

@@ -11,15 +11,14 @@ code_quality:
   extends:
     - .default-retry
     - .reports:rules:code_quality
+    - .use-docker-in-docker
   stage: test
   needs: []
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
+    # emptying DOCKER_HOST so it can be detected properly on kubernetes executor
+    # with the script below
+    DOCKER_HOST: ""
     CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/ci-cd/codequality:0.85.9"
   script:
     - |
@@ -50,6 +49,7 @@ sast:
   extends:
     - .default-retry
     - .reports:rules:sast
+    - .use-docker-in-docker
   stage: test
   allow_failure: true
   needs: []
@@ -59,14 +59,12 @@ sast:
     reports:
       sast: gl-sast-report.json
     expire_in: 1 week  # GitLab-specific
-  image: docker:stable
   variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
+    # emptying DOCKER_HOST so it can be detected properly on kubernetes executor
+    # with the script below
+    DOCKER_HOST: ""
     SAST_BRAKEMAN_LEVEL: 2  # GitLab-specific
     SAST_EXCLUDED_PATHS: qa,spec,doc,ee/spec  # GitLab-specific
-  services:
-    - docker:stable-dind
   script:
     - export SAST_VERSION=${SP_VERSION:-$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')}
     - |
@@ -89,16 +87,15 @@ dependency_scanning:
   extends:
     - .default-retry
     - .reports:rules:dependency_scanning
+    - .use-docker-in-docker
   stage: test
   needs: []
-  image: docker:stable
   variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
+    # emptying DOCKER_HOST so it can be detected properly on kubernetes executor
+    # with the script below
+    DOCKER_HOST: ""
     DS_EXCLUDED_PATHS: "qa/qa/ee/fixtures/secure_premade_reports,spec,ee/spec"  # GitLab-specific
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
     - export DS_VERSION=${SP_VERSION:-$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')}
     - |

.gitlab/ci/review.gitlab-ci.yml

 .review-docker:
   extends:
     - .default-retry
+    - .use-docker-in-docker
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6
-  services:
-    - docker:19.03.0-dind
-  tags:
-    - gitlab-org
-    - docker
   variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_HOST: tcp://docker:2375
     GITLAB_EDITION: "ce"
 
 build-qa-image:

.gitlab/issue_templates/Migrations.md

@@ -63,5 +63,5 @@ Here is an example of what this list might look like once populated: https://git
  
 ------
 
-/label ~Open-Source ~movingtogitlab
+/label ~"Open Source" ~movingtogitlab
 /cc @nuritzi 
\ No newline at end of file

.markdownlint.json

@@ -102,6 +102,7 @@
       "Redis",
       "Redmine",
       "reCAPTCHA",
+      "Ruby",
       "runit",
       "Salesforce",
       "SAML",

.rubocop_todo.yml

@@ -269,14 +269,6 @@ RSpec/ScatteredSetup:
     - 'spec/requests/api/jobs_spec.rb'
     - 'spec/services/projects/create_service_spec.rb'
 
-# Offense count: 4
-RSpec/VoidExpect:
-  Exclude:
-    - 'spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb'
-    - 'spec/models/ci/group_spec.rb'
-    - 'spec/models/ci/runner_spec.rb'
-    - 'spec/services/users/destroy_service_spec.rb'
-
 # Offense count: 10
 # Cop supports --auto-correct.
 Rails/ApplicationController:

Gemfile

@@ -457,9 +457,9 @@ end
 # Gitaly GRPC protocol definitions
 gem 'gitaly', '~> 12.9.0.pre.rc4'
 
-gem 'grpc', '~> 1.27.0'
+gem 'grpc', '~> 1.24.0'
 
-gem 'google-protobuf', '~> 3.11.2'
+gem 'google-protobuf', '~> 3.8.0'
 
 gem 'toml-rb', '~> 1.0.0'
 

Gemfile.lock

@@ -427,7 +427,7 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.11.4)
+    google-protobuf (3.8.0)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     googleauth (0.6.6)
@@ -468,8 +468,8 @@ GEM
       graphql (~> 1.6)
       html-pipeline (~> 2.8)
       sass (~> 3.4)
-    grpc (1.27.0)
-      google-protobuf (~> 3.11)
+    grpc (1.24.0)
+      google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -1251,7 +1251,7 @@ DEPENDENCIES
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)
   google-api-client (~> 0.23)
-  google-protobuf (~> 3.11.2)
+  google-protobuf (~> 3.8.0)
   gpgme (~> 2.0.19)
   grape (~> 1.1.0)
   grape-entity (~> 0.7.1)
@@ -1260,7 +1260,7 @@ DEPENDENCIES
   graphiql-rails (~> 1.4.10)
   graphql (~> 1.10.5)
   graphql-docs (~> 1.6.0)
-  grpc (~> 1.27.0)
+  grpc (~> 1.24.0)
   gssapi
   guard-rspec
   haml_lint (~> 0.34.0)

app/assets/javascripts/dropzone_input.js

@@ -23,7 +23,7 @@ function getErrorMessage(res) {
   return res.message;
 }
 
-export default function dropzoneInput(form) {
+export default function dropzoneInput(form, config = { parallelUploads: 2 }) {
   const divHover = '<div class="div-dropzone-hover"></div>';
   const iconPaperclip = '<i class="fa fa-paperclip div-dropzone-icon"></i>';
   const $attachButton = form.find('.button-attach-file');
@@ -69,6 +69,7 @@ export default function dropzoneInput(form) {
     uploadMultiple: false,
     headers: csrf.headers,
     previewContainer: false,
+    ...config,
     processing: () => $('.div-dropzone-alert').alert('close'),
     dragover: () => {
       $mdArea.addClass('is-dropzone-hover');

app/assets/javascripts/gl_form.js

@@ -45,7 +45,7 @@ export default class GLForm {
       );
       this.autoComplete = new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources);
       this.autoComplete.setup(this.form.find('.js-gfm-input'), this.enableGFM);
-      dropzoneInput(this.form);
+      dropzoneInput(this.form, { parallelUploads: 1 });
       autosize(this.textarea);
     }
     // form and textarea event listeners

app/assets/javascripts/ide/components/external_link.vue

-<script>
-import Icon from '~/vue_shared/components/icon.vue';
-
-export default {
-  components: {
-    Icon,
-  },
-  props: {
-    file: {
-      type: Object,
-      required: true,
-    },
-  },
-  computed: {
-    showButtons() {
-      return this.file.permalink;
-    },
-  },
-};
-</script>
-
-<template>
-  <div v-if="showButtons" class="pull-right ide-btn-group">
-    <a
-      :href="file.permalink"
-      :title="s__('IDE|Open in file view')"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      <span class="vertical-align-middle">{{ __('Open in file view') }}</span>
-      <icon :size="16" name="external-link" class="vertical-align-middle space-right" />
-    </a>
-  </div>
-</template>

app/assets/javascripts/logs/components/environment_logs.vue

@@ -56,7 +56,6 @@ export default {
       required: true,
     },
   },
-  traceHeight: 600,
   data() {
     return {
       isElasticStackCalloutDismissed: false,
@@ -94,6 +93,9 @@ export default {
       'showEnvironment',
       'fetchEnvironments',
       'fetchMoreLogsPrepend',
+      'dismissRequestEnvironmentsError',
+      'dismissInvalidTimeRangeWarning',
+      'dismissRequestLogsError',
     ]),
 
     isCurrentEnvironment(envName) {
@@ -115,7 +117,7 @@ export default {
 };
 </script>
 <template>
-  <div class="environment-logs-viewer mt-3">
+  <div class="environment-logs-viewer d-flex flex-column py-3">
     <gl-alert
       v-if="shouldShowElasticStackCallout"
       class="mb-3 js-elasticsearch-alert"
@@ -132,6 +134,31 @@ export default {
         </strong>
       </a>
     </gl-alert>
+    <gl-alert
+      v-if="environments.fetchError"
+      class="mb-3"
+      variant="danger"
+      @dismiss="dismissRequestEnvironmentsError"
+    >
+      {{ s__('Metrics|There was an error fetching the environments data, please try again') }}
+    </gl-alert>
+    <gl-alert
+      v-if="timeRange.invalidWarning"
+      class="mb-3"
+      variant="warning"
+      @dismiss="dismissInvalidTimeRangeWarning"
+    >
+      {{ s__('Metrics|Invalid time range, please verify.') }}
+    </gl-alert>
+    <gl-alert
+      v-if="logs.fetchError"
+      class="mb-3"
+      variant="danger"
+      @dismiss="dismissRequestLogsError"
+    >
+      {{ s__('Environments|There was an error fetching the logs. Please try again.') }}
+    </gl-alert>
+
     <div class="top-bar d-md-flex border bg-secondary-50 pt-2 pr-1 pb-0 pl-2">
       <div class="flex-grow-0">
         <gl-dropdown
@@ -183,16 +210,15 @@ export default {
 
     <gl-infinite-scroll
       ref="infiniteScroll"
-      class="log-lines"
-      :style="{ height: `${$options.traceHeight}px` }"
-      :max-list-height="$options.traceHeight"
+      class="log-lines overflow-auto flex-grow-1 min-height-0"
       :fetched-items="logs.lines.length"
       @topReached="topReached"
       @scroll="scroll"
     >
       <template #items>
         <pre
-          class="build-trace js-log-trace"
+          ref="logTrace"
+          class="build-trace"
         ><code class="bash js-build-output"><div v-if="showLoader" class="build-loader-animation js-build-loader-animation">
           <div class="dot"></div>
           <div class="dot"></div>
@@ -205,7 +231,7 @@ export default {
       ></template>
     </gl-infinite-scroll>
 
-    <div ref="logFooter" class="log-footer py-2 px-3">
+    <div ref="logFooter" class="py-2 px-3 text-white bg-secondary-900">
       <gl-sprintf :message="s__('Environments|Logs from %{start} to %{end}.')">
         <template #start>{{ timeRange.current.start | formatDate }}</template>
         <template #end>{{ timeRange.current.end | formatDate }}</template>

app/assets/javascripts/logs/stores/actions.js

 import { backOff } from '~/lib/utils/common_utils';
 import httpStatusCodes from '~/lib/utils/http_status';
 import axios from '~/lib/utils/axios_utils';
-import flash from '~/flash';
-import { s__ } from '~/locale';
 import { convertToFixedRange } from '~/lib/utils/datetime_range';
 
 import * as types from './mutation_types';
 
-const flashTimeRangeWarning = () => {
-  flash(s__('Metrics|Invalid time range, please verify.'), 'warning');
-};
-
-const flashLogsError = () => {
-  flash(s__('Metrics|There was an error fetching the logs, please try again'));
-};
-
 const requestUntilData = (url, params) =>
   backOff((next, stop) => {
     axios
@@ -31,7 +21,7 @@ const requestUntilData = (url, params) =>
       });
   });
 
-const requestLogsUntilData = state => {
+const requestLogsUntilData = ({ commit, state }) => {
   const params = {};
   const { logs_api_path } = state.environments.options.find(
     ({ name }) => name === state.environments.current,
@@ -49,7 +39,7 @@ const requestLogsUntilData = state => {
       params.start_time = start;
       params.end_time = end;
     } catch {
-      flashTimeRangeWarning();
+      commit(types.SHOW_TIME_RANGE_INVALID_WARNING);
     }
   }
   if (state.logs.cursor) {
@@ -101,26 +91,22 @@ export const fetchEnvironments = ({ commit, dispatch }, environmentsPath) => {
     })
     .catch(() => {
       commit(types.RECEIVE_ENVIRONMENTS_DATA_ERROR);
-      flash(s__('Metrics|There was an error fetching the environments data, please try again'));
     });
 };
 
 export const fetchLogs = ({ commit, state }) => {
   commit(types.REQUEST_LOGS_DATA);
 
-  return requestLogsUntilData(state)
+  return requestLogsUntilData({ commit, state })
     .then(({ data }) => {
       const { pod_name, pods, logs, cursor } = data;
       commit(types.RECEIVE_LOGS_DATA_SUCCESS, { logs, cursor });
-
       commit(types.SET_CURRENT_POD_NAME, pod_name);
-
       commit(types.RECEIVE_PODS_DATA_SUCCESS, pods);
     })
     .catch(() => {
       commit(types.RECEIVE_PODS_DATA_ERROR);
       commit(types.RECEIVE_LOGS_DATA_ERROR);
-      flashLogsError();
     });
 };
 
@@ -132,16 +118,27 @@ export const fetchMoreLogsPrepend = ({ commit, state }) => {
 
   commit(types.REQUEST_LOGS_DATA_PREPEND);
 
-  return requestLogsUntilData(state)
+  return requestLogsUntilData({ commit, state })
     .then(({ data }) => {
       const { logs, cursor } = data;
       commit(types.RECEIVE_LOGS_DATA_PREPEND_SUCCESS, { logs, cursor });
     })
     .catch(() => {
       commit(types.RECEIVE_LOGS_DATA_PREPEND_ERROR);
-      flashLogsError();
     });
 };
 
+export const dismissRequestEnvironmentsError = ({ commit }) => {
+  commit(types.HIDE_REQUEST_ENVIRONMENTS_ERROR);
+};
+
+export const dismissRequestLogsError = ({ commit }) => {
+  commit(types.HIDE_REQUEST_LOGS_ERROR);
+};
+
+export const dismissInvalidTimeRangeWarning = ({ commit }) => {
+  commit(types.HIDE_TIME_RANGE_INVALID_WARNING);
+};
+
 // prevent babel-plugin-rewire from generating an invalid default during karma tests
 export default () => {};