Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/assets/javascripts/behaviors/shortcuts/keybindings.js43
-rw-r--r--app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js2
-rw-r--r--app/assets/javascripts/monitoring/components/dashboard.vue34
-rw-r--r--config/feature_flags/development/bitbucket_server_parallel_importer.yml2
-rw-r--r--doc/ci/testing/code_quality.md24
-rw-r--r--doc/development/documentation/versions.md4
-rw-r--r--doc/user/shortcuts.md12
-rw-r--r--locale/gitlab.pot6
-rw-r--r--qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb6
-rw-r--r--spec/frontend/monitoring/components/dashboard_spec.js11
10 files changed, 27 insertions, 117 deletions
diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
index a88cc1834ac..bd13bcb35fc 100644
--- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js
+++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
@@ -321,12 +321,6 @@ export const GO_TO_PROJECT_JOBS = {
defaultKeys: ['g j'], // eslint-disable-line @gitlab/require-i18n-strings
};
-export const GO_TO_PROJECT_METRICS = {
- id: 'project.goToMetrics',
- description: __('Go to metrics'),
- defaultKeys: ['g l'], // eslint-disable-line @gitlab/require-i18n-strings
-};
-
export const GO_TO_PROJECT_ENVIRONMENTS = {
id: 'project.goToEnvironments',
description: __('Go to environments'),
@@ -506,30 +500,6 @@ const WEB_IDE_COMMIT = {
customizable: false,
};
-export const METRICS_EXPAND_PANEL = {
- id: 'metrics.expandPanel',
- description: __('Expand panel'),
- defaultKeys: ['e'],
-};
-
-export const METRICS_DOWNLOAD_CSV = {
- id: 'metrics.downloadCSV',
- description: __('Download CSV'),
- defaultKeys: ['d'],
-};
-
-export const METRICS_COPY_LINK_TO_CHART = {
- id: 'metrics.copyLinkToChart',
- description: __('Copy link to chart'),
- defaultKeys: ['c'],
-};
-
-export const METRICS_SHOW_ALERTS = {
- id: 'metrics.showAlerts',
- description: __('Alerts'),
- defaultKeys: ['a'],
-};
-
// All keybinding groups
const GLOBAL_SHORTCUTS_GROUP = {
id: 'globalShortcuts',
@@ -606,7 +576,6 @@ const PROJECT_SHORTCUTS_GROUP = {
GO_TO_PROJECT_MERGE_REQUESTS,
GO_TO_PROJECT_PIPELINES,
GO_TO_PROJECT_JOBS,
- ...(gon.features?.removeMonitorMetrics ? [] : [GO_TO_PROJECT_METRICS]),
GO_TO_PROJECT_ENVIRONMENTS,
GO_TO_PROJECT_KUBERNETES,
GO_TO_PROJECT_SNIPPETS,
@@ -670,17 +639,6 @@ const WEB_IDE_SHORTCUTS_GROUP = {
keybindings: [WEB_IDE_GO_TO_FILE, WEB_IDE_COMMIT],
};
-const METRICS_SHORTCUTS_GROUP = {
- id: 'metrics',
- name: __('Metrics'),
- keybindings: [
- METRICS_EXPAND_PANEL,
- METRICS_DOWNLOAD_CSV,
- METRICS_COPY_LINK_TO_CHART,
- METRICS_SHOW_ALERTS,
- ],
-};
-
export const MISC_SHORTCUTS_GROUP = {
id: 'misc',
name: __('Miscellaneous'),
@@ -701,7 +659,6 @@ export const keybindingGroups = [
MR_COMMITS_SHORTCUTS_GROUP,
ISSUES_SHORTCUTS_GROUP,
WEB_IDE_SHORTCUTS_GROUP,
- ...(gon.features?.removeMonitorMetrics ? [] : [METRICS_SHORTCUTS_GROUP]),
MISC_SHORTCUTS_GROUP,
];
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js
index 9e6c9c2e08e..d9dc3aae808 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js
@@ -17,7 +17,6 @@ import {
GO_TO_PROJECT_SNIPPETS,
GO_TO_PROJECT_KUBERNETES,
GO_TO_PROJECT_ENVIRONMENTS,
- GO_TO_PROJECT_METRICS,
GO_TO_PROJECT_WEBIDE,
NEW_ISSUE,
} from './keybindings';
@@ -44,7 +43,6 @@ export default class ShortcutsNavigation extends Shortcuts {
[GO_TO_PROJECT_SNIPPETS, () => findAndFollowLink('.shortcuts-snippets')],
[GO_TO_PROJECT_KUBERNETES, () => findAndFollowLink('.shortcuts-kubernetes')],
[GO_TO_PROJECT_ENVIRONMENTS, () => findAndFollowLink('.shortcuts-environments')],
- [GO_TO_PROJECT_METRICS, () => findAndFollowLink('.shortcuts-metrics')],
[GO_TO_PROJECT_WEBIDE, ShortcutsNavigation.navigateToWebIDE],
[NEW_ISSUE, () => findAndFollowLink('.shortcuts-new-issue')],
]);
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index 752ba4241d8..cfc20b7b95f 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -11,16 +11,8 @@ import {
import VueDraggable from 'vuedraggable';
import { mapActions, mapState, mapGetters } from 'vuex';
import { createAlert } from '~/alert';
-import {
- keysFor,
- METRICS_COPY_LINK_TO_CHART,
- METRICS_DOWNLOAD_CSV,
- METRICS_EXPAND_PANEL,
- METRICS_SHOW_ALERTS,
-} from '~/behaviors/shortcuts/keybindings';
import invalidUrl from '~/lib/utils/invalid_url';
import { ESC_KEY } from '~/lib/utils/keys';
-import { Mousetrap } from '~/lib/mousetrap';
import { mergeUrlParams, updateHistory } from '~/lib/utils/url_utility';
import { s__ } from '~/locale';
import { defaultTimeRange } from '~/vue_shared/constants';
@@ -218,32 +210,6 @@ export default {
}
},
},
- created() {
- window.addEventListener('keyup', this.onKeyup);
-
- Mousetrap.bind(keysFor(METRICS_EXPAND_PANEL), () =>
- this.runShortcut('onExpandFromKeyboardShortcut'),
- );
- Mousetrap.bind(keysFor(METRICS_SHOW_ALERTS), () =>
- this.runShortcut('showAlertModalFromKeyboardShortcut'),
- );
- Mousetrap.bind(keysFor(METRICS_DOWNLOAD_CSV), () =>
- this.runShortcut('downloadCsvFromKeyboardShortcut'),
- );
- Mousetrap.bind(keysFor(METRICS_COPY_LINK_TO_CHART), () =>
- this.runShortcut('copyChartLinkFromKeyboardShotcut'),
- );
- },
- destroyed() {
- window.removeEventListener('keyup', this.onKeyup);
-
- [
- METRICS_COPY_LINK_TO_CHART,
- METRICS_DOWNLOAD_CSV,
- METRICS_EXPAND_PANEL,
- METRICS_SHOW_ALERTS,
- ].forEach((command) => Mousetrap.unbind(keysFor(command)));
- },
mounted() {
if (!this.hasMetrics) {
this.setGettingStartedEmptyState();
diff --git a/config/feature_flags/development/bitbucket_server_parallel_importer.yml b/config/feature_flags/development/bitbucket_server_parallel_importer.yml
index 0e5315d5d7a..be553a5e6da 100644
--- a/config/feature_flags/development/bitbucket_server_parallel_importer.yml
+++ b/config/feature_flags/development/bitbucket_server_parallel_importer.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/411796
milestone: '16.1'
type: development
group: group::import and integrate
-default_enabled: false
+default_enabled: true
diff --git a/doc/ci/testing/code_quality.md b/doc/ci/testing/code_quality.md
index 367777960b5..62058e4f1cb 100644
--- a/doc/ci/testing/code_quality.md
+++ b/doc/ci/testing/code_quality.md
@@ -492,6 +492,23 @@ Example:
]
```
+## Integrate multiple tools
+
+Code Quality combines the results from all jobs in a pipeline into a single `gl-code-quality-report.json` file. As a result, multiple individual tools can be used in a pipeline, either alongside, or in place of, the supported `Code-Quality.gitlab-ci.yml` template.
+
+Here is an example that returns ESLint output in the necessary format:
+
+```yaml
+eslint:
+ image: node:18-alpine
+ script:
+ - npm ci
+ - npx eslint --format gitlab .
+ artifacts:
+ reports:
+ codequality: gl-code-quality-report.json
+```
+
## Using Analysis Plugins
Code Quality functionality can be extended by using Code Climate
@@ -549,12 +566,9 @@ This can be due to multiple reasons:
### Only a single Code Quality report is displayed, but more are defined
-Starting [in GitLab 15.7](https://gitlab.com/gitlab-org/gitlab/-/issues/340525), Code Quality combines the results from all jobs in a pipeline.
-
-In previous versions, GitLab only uses the Code Quality artifact from the latest created job (with the largest job ID).
-If multiple jobs in a pipeline generate a code quality artifact, those of earlier jobs are ignored.
+Code Quality automatically [combines multiple reports](#integrate-multiple-tools).
-To avoid confusion, configure only one job to generate a `gl-code-quality-report.json` file.
+In GitLab 15.6 and earlier, Code Quality used only the artifact from the latest created job (with the largest job ID). Code Quality artifacts from earlier jobs were ignored.
### RuboCop errors
diff --git a/doc/development/documentation/versions.md b/doc/development/documentation/versions.md
index 5ce52414c42..dadae134f4c 100644
--- a/doc/development/documentation/versions.md
+++ b/doc/development/documentation/versions.md
@@ -201,8 +201,8 @@ This content is removed from the documentation as part of the Technical Writing
## Which versions are removed
GitLab supports the current major version and two previous major versions.
-For example, if 15.0 is the current major version, all major and minor releases of
-GitLab 15.0, 14.0, and 13.0 are supported.
+For example, if 16.0 is the current major version, all major and minor releases of
+GitLab 16.0, 15.0, and 14.0 are supported.
[View the list of supported versions](https://about.gitlab.com/support/statement-of-support/#version-support).
diff --git a/doc/user/shortcuts.md b/doc/user/shortcuts.md
index 3b6c6105315..6216a1630b2 100644
--- a/doc/user/shortcuts.md
+++ b/doc/user/shortcuts.md
@@ -310,18 +310,6 @@ These shortcuts are available when viewing [epics](group/epics/index.md):
| <kbd>e</kbd> | Edit description. |
| <kbd>l</kbd> | Change label. |
-## Metrics
-
-These shortcuts are available when using metrics:
-
-| Keyboard shortcut | Description |
-|-------------------|---------------------|
-| <kbd>e</kbd> | Expand panel. |
-| <kbd>l</kbd> | View logs. |
-| <kbd>d</kbd> | Download CSV. |
-| <kbd>c</kbd> | Copy link to chart. |
-| <kbd>a</kbd> | Alerts. |
-
## Disable keyboard shortcuts
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22113) in GitLab 12.8.
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5fb7860ebf0..487cc4e1a4d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -18020,9 +18020,6 @@ msgstr ""
msgid "Expand milestones"
msgstr ""
-msgid "Expand panel"
-msgstr ""
-
msgid "Expand settings section"
msgstr ""
@@ -20699,9 +20696,6 @@ msgstr ""
msgid "Go to merge requests"
msgstr ""
-msgid "Go to metrics"
-msgstr ""
-
msgid "Go to next page"
msgstr ""
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
index 745879cf12f..1a8f07ba621 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_tabs_spec.rb
@@ -84,7 +84,11 @@ module QA
context 'when CI has invalid syntax' do
it(
'shows invalid validations',
- testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/368333'
+ testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/368333',
+ quarantine: {
+ issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/412769',
+ type: :broken
+ }
) do
invalid_msg = 'syntax is invalid'
diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js
index 1f995965003..d7f1d4873bb 100644
--- a/spec/frontend/monitoring/components/dashboard_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_spec.js
@@ -6,7 +6,6 @@ import { TEST_HOST } from 'helpers/test_constants';
import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
import { createAlert } from '~/alert';
import axios from '~/lib/utils/axios_utils';
-import { ESC_KEY } from '~/lib/utils/keys';
import { objectToQuery } from '~/lib/utils/url_utility';
import Dashboard from '~/monitoring/components/dashboard.vue';
import DashboardHeader from '~/monitoring/components/dashboard_header.vue';
@@ -479,8 +478,6 @@ describe('Dashboard', () => {
let group;
let panel;
- const mockKeyup = (key) => window.dispatchEvent(new KeyboardEvent('keyup', { key }));
-
const MockPanel = {
template: `<div><slot name="top-left"/></div>`,
};
@@ -531,14 +528,6 @@ describe('Dashboard', () => {
undefined,
);
});
-
- it('restores dashboard from full screen by typing the Escape key', () => {
- mockKeyup(ESC_KEY);
- expect(store.dispatch).toHaveBeenCalledWith(
- `monitoringDashboard/clearExpandedPanel`,
- undefined,
- );
- });
});
});
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 20:11:05 +0300