Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
a6808e1619
commit
190ad3b237
|
@ -1,10 +1,5 @@
|
|||
<script>
|
||||
import {
|
||||
GlPath,
|
||||
GlPopover,
|
||||
GlDeprecatedSkeletonLoading as GlSkeletonLoading,
|
||||
GlSafeHtmlDirective as SafeHtml,
|
||||
} from '@gitlab/ui';
|
||||
import { GlPath, GlPopover, GlSkeletonLoader, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
|
||||
import Tracking from '~/tracking';
|
||||
import { OVERVIEW_STAGE_ID } from '../constants';
|
||||
import FormattedStageCount from './formatted_stage_count.vue';
|
||||
|
@ -13,7 +8,7 @@ export default {
|
|||
name: 'PathNavigation',
|
||||
components: {
|
||||
GlPath,
|
||||
GlSkeletonLoading,
|
||||
GlSkeletonLoader,
|
||||
GlPopover,
|
||||
FormattedStageCount,
|
||||
},
|
||||
|
@ -57,7 +52,7 @@ export default {
|
|||
};
|
||||
</script>
|
||||
<template>
|
||||
<gl-skeleton-loading v-if="loading" :lines="2" />
|
||||
<gl-skeleton-loader v-if="loading" :width="235" :lines="2" />
|
||||
<gl-path v-else :key="selectedStage.id" :items="stages" @selected="onSelectStage">
|
||||
<template #default="{ pathItem, pathId }">
|
||||
<gl-popover
|
||||
|
|
|
@ -44,8 +44,8 @@ export default {
|
|||
<gl-button
|
||||
v-if="resolutionPath"
|
||||
:href="resolutionPath"
|
||||
variant="info"
|
||||
class="gl-mr-5 gl-alert-action"
|
||||
variant="confirm"
|
||||
class="gl-mr-3 gl-alert-action"
|
||||
>
|
||||
{{ __('Resolve conflicts') }}
|
||||
</gl-button>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script>
|
||||
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
|
||||
import { GlSkeletonLoader } from '@gitlab/ui';
|
||||
import { sprintf, formatNumber } from '~/locale';
|
||||
import { createAlert } from '~/flash';
|
||||
import runnerProjectsQuery from '../graphql/show/runner_projects.query.graphql';
|
||||
|
@ -17,7 +17,7 @@ import RunnerPagination from './runner_pagination.vue';
|
|||
export default {
|
||||
name: 'RunnerProjects',
|
||||
components: {
|
||||
GlSkeletonLoading,
|
||||
GlSkeletonLoader,
|
||||
RunnerAssignedItem,
|
||||
RunnerPagination,
|
||||
},
|
||||
|
@ -86,7 +86,9 @@ export default {
|
|||
{{ heading }}
|
||||
</h3>
|
||||
|
||||
<gl-skeleton-loading v-if="loading" class="gl-py-5" />
|
||||
<div v-if="loading" class="gl-py-5">
|
||||
<gl-skeleton-loader />
|
||||
</div>
|
||||
<template v-else-if="projects.items.length">
|
||||
<runner-assigned-item
|
||||
v-for="(project, i) in projects.items"
|
||||
|
|
|
@ -411,3 +411,22 @@ copy-code {
|
|||
@include gl-opacity-10;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-link {
|
||||
padding: 0;
|
||||
background-color: transparent;
|
||||
color: $blue-600;
|
||||
font-weight: normal;
|
||||
border-radius: 0;
|
||||
border-color: transparent;
|
||||
border-width: 0;
|
||||
|
||||
&:hover,
|
||||
&:active,
|
||||
&:focus {
|
||||
color: $blue-800;
|
||||
text-decoration: underline;
|
||||
background-color: transparent;
|
||||
border-color: transparent;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
# NOTE: Please read the following to check if and which aggregate the metric should be added to.
|
||||
#
|
||||
# code_review_extension_category_monthly_active_users
|
||||
# This is only metrics related to the VS Code Extension for now.
|
||||
#
|
||||
|
|
|
@ -182,7 +182,28 @@ load balancer to latest GitLab version.
|
|||
Gitaly and the Praefect component. It has its own PostgreSQL database, independent of the rest of
|
||||
the application.
|
||||
|
||||
Before you update the main application you need to update Praefect.
|
||||
Before you update the main GitLab application you need to update the Gitaly nodes
|
||||
and then Praefect.
|
||||
|
||||
**Gitaly nodes**
|
||||
|
||||
Upgrade the Gitaly nodes in your Gitaly cluster one at a time
|
||||
to ensure access to Git repositories is maintained.
|
||||
|
||||
Update the GitLab package:
|
||||
|
||||
```shell
|
||||
# Debian/Ubuntu
|
||||
sudo apt-get update && sudo apt-get install gitlab-ee
|
||||
|
||||
# Centos/RHEL
|
||||
sudo yum install gitlab-ee
|
||||
```
|
||||
|
||||
If you are a Community Edition user, replace `gitlab-ee` with `gitlab-ce` in the above command.
|
||||
|
||||
**Praefect**
|
||||
|
||||
Out of your Praefect nodes, pick one to be your Praefect deploy node.
|
||||
This is where you install the new Omnibus package first and run
|
||||
database migrations.
|
||||
|
|
|
@ -4,6 +4,8 @@ group: Provision
|
|||
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
|
||||
---
|
||||
|
||||
<!-- To promote the workflow described in license.md, this page is not included in global left nav. -->
|
||||
|
||||
# Activate GitLab EE with a license file or key
|
||||
|
||||
If you receive a license file from GitLab (for example, for a trial), you can
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { GlPath, GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
|
||||
import { GlPath, GlSkeletonLoader } from '@gitlab/ui';
|
||||
import { mount } from '@vue/test-utils';
|
||||
import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
|
||||
import { extendedWrapper } from 'helpers/vue_test_utils_helper';
|
||||
|
@ -73,7 +73,7 @@ describe('Project PathNavigation', () => {
|
|||
});
|
||||
|
||||
it('hides the gl-skeleton-loading component', () => {
|
||||
expect(wrapper.find(GlSkeletonLoading).exists()).toBe(false);
|
||||
expect(wrapper.find(GlSkeletonLoader).exists()).toBe(false);
|
||||
});
|
||||
|
||||
it('renders each stage', () => {
|
||||
|
@ -116,7 +116,7 @@ describe('Project PathNavigation', () => {
|
|||
});
|
||||
|
||||
it('displays the gl-skeleton-loading component', () => {
|
||||
expect(wrapper.find(GlSkeletonLoading).exists()).toBe(true);
|
||||
expect(wrapper.find(GlSkeletonLoader).exists()).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
|
||||
import { GlSkeletonLoader } from '@gitlab/ui';
|
||||
import Vue from 'vue';
|
||||
import VueApollo from 'vue-apollo';
|
||||
import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
|
||||
|
@ -34,7 +34,7 @@ describe('RunnerProjects', () => {
|
|||
let mockRunnerProjectsQuery;
|
||||
|
||||
const findHeading = () => wrapper.find('h3');
|
||||
const findGlSkeletonLoading = () => wrapper.findComponent(GlSkeletonLoading);
|
||||
const findGlSkeletonLoading = () => wrapper.findComponent(GlSkeletonLoader);
|
||||
const findRunnerAssignedItems = () => wrapper.findAllComponents(RunnerAssignedItem);
|
||||
const findRunnerPagination = () => wrapper.findComponent(RunnerPagination);
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
# If this spec fails, we need to add the new code review event to the correct aggregated metric
|
||||
# NOTE: ONLY user related metrics to be added to the aggregates - otherwise add it to the exception list
|
||||
RSpec.describe 'Code review events' do
|
||||
it 'the aggregated metrics contain all the code review metrics' do
|
||||
path = Rails.root.join('config/metrics/aggregates/code_review.yml')
|
||||
|
|
Loading…
Reference in New Issue