Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
807d57c18f
commit
618be8f52d
|
|
@ -1109,7 +1109,7 @@ GEM
|
|||
i18n
|
||||
ruby-fogbugz (0.2.1)
|
||||
crack (~> 0.4)
|
||||
ruby-magic-static (0.3.0)
|
||||
ruby-magic-static (0.3.1)
|
||||
ruby-prof (1.3.1)
|
||||
ruby-progressbar (1.11.0)
|
||||
ruby-saml (1.7.2)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<script>
|
||||
import { GlButton } from '@gitlab/ui';
|
||||
import { __ } from '~/locale';
|
||||
import StatusIcon from '~/vue_merge_request_widget/components/mr_widget_status_icon.vue';
|
||||
import Popover from '~/vue_shared/components/help_popover.vue';
|
||||
|
|
@ -8,9 +9,10 @@ import IssuesList from './issues_list.vue';
|
|||
export default {
|
||||
name: 'ReportSection',
|
||||
components: {
|
||||
GlButton,
|
||||
IssuesList,
|
||||
StatusIcon,
|
||||
Popover,
|
||||
StatusIcon,
|
||||
},
|
||||
props: {
|
||||
alwaysOpen: {
|
||||
|
|
@ -186,16 +188,15 @@ export default {
|
|||
|
||||
<slot name="action-buttons" :is-collapsible="isCollapsible"></slot>
|
||||
|
||||
<button
|
||||
<gl-button
|
||||
v-if="isCollapsible"
|
||||
type="button"
|
||||
class="js-collapse-btn"
|
||||
data-testid="report-section-expand-button"
|
||||
class="js-collapse-btn btn float-right btn-sm align-self-center"
|
||||
data-qa-selector="expand_report_button"
|
||||
@click="toggleCollapsed"
|
||||
>
|
||||
{{ collapseText }}
|
||||
</button>
|
||||
</gl-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
.event-user-info {
|
||||
margin-bottom: $gl-padding-4;
|
||||
|
||||
.author_name {
|
||||
.author-name {
|
||||
a {
|
||||
color: $gl-text-color;
|
||||
font-weight: $gl-font-weight-bold;
|
||||
|
|
@ -118,26 +118,11 @@
|
|||
}
|
||||
}
|
||||
|
||||
.event_icon {
|
||||
position: relative;
|
||||
float: right;
|
||||
border: 1px solid $gray-darker;
|
||||
padding: 5px;
|
||||
border-radius: 5px;
|
||||
background: $gray-light;
|
||||
margin-left: 10px;
|
||||
top: -6px;
|
||||
|
||||
img {
|
||||
width: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.event_commits {
|
||||
.event-commits {
|
||||
li {
|
||||
&.commit {
|
||||
background: transparent;
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ module EventsHelper
|
|||
|
||||
def event_user_info(event)
|
||||
content_tag(:div, class: "event-user-info") do
|
||||
concat content_tag(:span, link_to_author(event), class: "author_name")
|
||||
concat content_tag(:span, link_to_author(event), class: "author-name")
|
||||
concat " ".html_safe
|
||||
concat content_tag(:span, event.author.to_reference, class: "username")
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
module Clusters
|
||||
module Applications
|
||||
class Runner < ApplicationRecord
|
||||
VERSION = '0.26.0'
|
||||
VERSION = '0.27.0'
|
||||
|
||||
self.table_name = 'clusters_applications_runners'
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
- if event.push_with_commits?
|
||||
.event-body
|
||||
%ul.content-list.event_commits
|
||||
%ul.content-list.event-commits
|
||||
= render "events/commit", project: project, event: event
|
||||
|
||||
- create_mr = event.new_ref? && create_mr_button?(from: project.default_branch, to: event.ref_name, source_project: project, target_project: project) && event.authored_by?(current_user)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Migrates the expand button in MR reports to GitLab UI
|
||||
merge_request: 57021
|
||||
author:
|
||||
type: other
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Update GitLab Runner Helm Chart to 0.27.0
|
||||
merge_request: 57048
|
||||
author:
|
||||
type: other
|
||||
|
|
@ -1,14 +1,3 @@
|
|||
- title: "Admin Mode: Re-authenticate for GitLab administration"
|
||||
body: |
|
||||
GitLab now includes Admin Mode, which helps admins work safely from one account. When Admin Mode is not active, admins have the same privileges as a regular user. Before running administrative commands, admin users must reverify their credentials. Admin mode increases instance security by protecting sensitive operations and data.
|
||||
stage: Manage
|
||||
self-managed: true
|
||||
gitlab-com: false
|
||||
packages: [Free, Premium, Ultimate]
|
||||
url: https://docs.gitlab.com/ee/user/admin_area/settings/sign_in_restrictions.html#admin-mode
|
||||
image_url: https://about.gitlab.com/images/13_10/manage_reauth_admin.png
|
||||
published_at: 2021-03-22
|
||||
release: 13.10
|
||||
- title: "GitLab Runner for Red Hat OpenShift GA"
|
||||
body: |
|
||||
The GitLab Runner Operator is generally available in the [Red Hat OpenShift Container Platform](https://www.openshift.com/products/container-platform). To install GitLab Runner on OpenShift, you can use the [GitLab Runner Operator](https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator), which is available from the stable channel in the OperatorHub. The Container Platform is a web console for OpenShift cluster administrators to discover and select Operators to install on their cluster. We are also developing an [Operator](https://gitlab.com/groups/gitlab-org/-/epics/3444) for GitLab, so stay tuned to future release posts for those announcements.
|
||||
|
|
@ -23,7 +12,7 @@
|
|||
- title: "View epics on a board (MVC)"
|
||||
body: |
|
||||
If you work on epics in GitLab, it can be tough to visualize your epics' workflow status. Often, when drafting or writing epics, you might want to use labels (like `Open`, `Doing`, or `Done`) to keep tabs on the next steps when creating your project plan.
|
||||
|
||||
|
||||
In this release, we took our awesome [Issue Boards](https://docs.gitlab.com/ee/user/project/issue_board.html) feature and optimized it for viewing epics. You can now visualize the workflow status of your epics on an epic board by applying [labels](https://docs.gitlab.com/ee/user/project/labels.html#label-management) or [scoped labels](https://docs.gitlab.com/ee/user/project/labels.html#scoped-labels) to them.
|
||||
|
||||
We are releasing this early version of Epic Boards in 13.10, so we can start [gathering customer feedback](https://gitlab.com/gitlab-org/gitlab/-/issues/324677). We will follow it up with [MVC 2](https://gitlab.com/groups/gitlab-org/-/epics/5069) and [MVC 3](https://gitlab.com/groups/gitlab-org/-/epics/5079), which will achieve parity with Issue Boards. Please leave feedback about your experience in the [feedback issue](https://gitlab.com/gitlab-org/gitlab/-/issues/324677).
|
||||
|
|
@ -31,7 +20,7 @@
|
|||
self-managed: true
|
||||
gitlab-com: true
|
||||
packages: [Premium, Ultimate]
|
||||
url: https://docs.gitlab.com/ee/user/group/epics/epic_boards.html
|
||||
url: https://docs.gitlab.com/ee/user/group/epics/epic_boards.html
|
||||
image_url: https://about.gitlab.com/images/13_10/view-epics-on-a-board-mvc-1.png
|
||||
published_at: 2021-03-22
|
||||
release: 13.10
|
||||
|
|
@ -52,7 +41,7 @@
|
|||
release: 13.10
|
||||
- title: "DORA4-based lead time for changes"
|
||||
body: |
|
||||
Measuring the efficiency of your software development lifecycle is an important step to grow DevOps adoption for any organization. In the previous milestone, we added support for [DORA4-based Deployment Frequency](https://docs.gitlab.com/ee/api/dora4_project_analytics.html). In this release, we are excited to announce the support of a new API for lead time for changes (via merge requests) on the project level. The lead time for changes gives you an indication of how long it takes for code to be committed and deployed to your production environment. Understanding and tracking this data is a great starting point in your journey to continuous improvement in your DevOps process.
|
||||
Measuring the efficiency of your software development lifecycle is an important step to grow DevOps adoption for any organization. In the previous milestone, we added support for [DORA4-based Deployment Frequency](https://docs.gitlab.com/ee/api/dora4_project_analytics.html). In this release, we are excited to announce the support of a new API for lead time for changes (via merge requests) on the project level. The lead time for changes gives you an indication of how long it takes for code to be committed and deployed to your production environment. Understanding and tracking this data is a great starting point in your journey to continuous improvement in your DevOps process.
|
||||
stage: Release
|
||||
self-managed: true
|
||||
gitlab-com: true
|
||||
|
|
@ -90,7 +79,7 @@
|
|||
Increasing the number of tests or custom metrics in a pipeline gives you additional confidence and information. However, increasing these to a large number has also come with a degraded visual experience of the Merge Request page. The Merge Request test summary widget has been improved so you can better differentiate between the different test jobs in the widget, making it easier to identify which job contains failed tests.
|
||||
|
||||
It has also been challenging to understand why a `junit.xml` file was not parsed without errors being presented. Now you can see parsing errors in the Test Summary widget, as well as the Unit Test report, to identify and resolve structural issues and see test results in GitLab.
|
||||
|
||||
|
||||
The [Metrics Reports](https://docs.gitlab.com/ee/ci/metrics_reports.html) widget [(Premium and Ultimate)](https://about.gitlab.com/pricing/) is now sorted so new, changed, and unchanged metrics are all together, making the experience of finding metrics that have changed as part of the Merge Request more intuitive.
|
||||
stage: Verify
|
||||
self-managed: true
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@babel/plugin-transform-modules-commonjs": "^7.10.1",
|
||||
"@gitlab/eslint-plugin": "8.1.0",
|
||||
"@gitlab/eslint-plugin": "8.2.0",
|
||||
"@gitlab/stylelint-config": "2.3.0",
|
||||
"@testing-library/dom": "^7.16.2",
|
||||
"@vue/test-utils": "1.1.2",
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
import { shallowMount } from '@vue/test-utils';
|
||||
import { mount } from '@vue/test-utils';
|
||||
import Vue from 'vue';
|
||||
import mountComponent, { mountComponentWithSlots } from 'helpers/vue_mount_component_helper';
|
||||
import { extendedWrapper } from 'helpers/vue_test_utils_helper';
|
||||
import reportSection from '~/reports/components/report_section.vue';
|
||||
|
||||
describe('Report section', () => {
|
||||
let vm;
|
||||
let wrapper;
|
||||
const ReportSection = Vue.extend(reportSection);
|
||||
const findCollapseButton = () => wrapper.findByTestId('report-section-expand-button');
|
||||
|
||||
const resolvedIssues = [
|
||||
{
|
||||
|
|
@ -30,12 +32,14 @@ describe('Report section', () => {
|
|||
};
|
||||
|
||||
const createComponent = (props) => {
|
||||
wrapper = shallowMount(reportSection, {
|
||||
propsData: {
|
||||
...defaultProps,
|
||||
...props,
|
||||
},
|
||||
});
|
||||
wrapper = extendedWrapper(
|
||||
mount(reportSection, {
|
||||
propsData: {
|
||||
...defaultProps,
|
||||
...props,
|
||||
},
|
||||
}),
|
||||
);
|
||||
return wrapper;
|
||||
};
|
||||
|
||||
|
|
@ -182,7 +186,7 @@ describe('Report section', () => {
|
|||
|
||||
expect(wrapper.emitted().toggleEvent).toBeUndefined();
|
||||
|
||||
wrapper.vm.$el.querySelector('button').click();
|
||||
findCollapseButton().trigger('click');
|
||||
return wrapper.vm
|
||||
.$nextTick()
|
||||
.then(() => {
|
||||
|
|
@ -197,7 +201,7 @@ describe('Report section', () => {
|
|||
|
||||
expect(wrapper.emitted().toggleEvent).toBeUndefined();
|
||||
|
||||
wrapper.vm.$el.querySelector('button').click();
|
||||
findCollapseButton().trigger('click');
|
||||
return wrapper.vm
|
||||
.$nextTick()
|
||||
.then(() => {
|
||||
|
|
|
|||
|
|
@ -867,10 +867,10 @@
|
|||
resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e"
|
||||
integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg==
|
||||
|
||||
"@gitlab/eslint-plugin@8.1.0":
|
||||
version "8.1.0"
|
||||
resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.1.0.tgz#a98ac4219da3316d30ee717ef0603c8fa0c4d5d8"
|
||||
integrity sha512-PU2ldrF59dhunMcEMzSqwG9RfTZRPmW8/pXwcXhJNi61g9lkdHQn8CiQGazepDlBwjEHl5habv/cs52gUc06+w==
|
||||
"@gitlab/eslint-plugin@8.2.0":
|
||||
version "8.2.0"
|
||||
resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.2.0.tgz#caccf2777febd89420c0225e000a789376ecaba2"
|
||||
integrity sha512-14VJEOmAx8MpsxlYdloWD9KG9+AVX8HLKWAo2M5cz57Ji6AiJtdCAfFCrVetcvzDyeiFA7gt4k1fSKbTjuVgBQ==
|
||||
dependencies:
|
||||
babel-eslint "^10.0.3"
|
||||
eslint-config-airbnb-base "^14.2.1"
|
||||
|
|
|
|||
Loading…
Reference in New Issue