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

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuzanne Selhorn <sselhorn@gitlab.com>2022-09-27 23:10:59 +0300
committerSuzanne Selhorn <sselhorn@gitlab.com>2022-09-27 23:10:59 +0300
commit2298d26f4b8d0f3d2e9a099f5db1c995c824d09b (patch)
tree12052d69be72cf79f84c8e9a7683c864b9c73347
parent48acee2c93f3c5dd44e769621e666f0159030025 (diff)
Just playing aroundselhorn-test-deps-ignore
Not doing anything other than a placeholder
-rw-r--r--content/_data/navigation.yaml4
-rw-r--r--content/assets/javascripts/badges.js4
-rw-r--r--content/assets/stylesheets/stylesheet.scss1
-rw-r--r--content/frontend/deprecations/components/deprecation_filters.vue10
4 files changed, 9 insertions, 10 deletions
diff --git a/content/_data/navigation.yaml b/content/_data/navigation.yaml
index 924deed6..9524ff47 100644
--- a/content/_data/navigation.yaml
+++ b/content/_data/navigation.yaml
@@ -406,10 +406,8 @@ sections:
doc_url: 'ee/downgrade_ee_to_ce/'
- doc_title: Releases and maintenance
doc_url: 'ee/policy/maintenance.html'
- - doc_title: Deprecations by version
+ - doc_title: Release notes
doc_url: 'ee/update/deprecations.html'
- - doc_title: Removals by version
- doc_url: 'ee/update/removals.html'
- doc_title: What's new
doc_url: 'ee/administration/whats-new.html'
diff --git a/content/assets/javascripts/badges.js b/content/assets/javascripts/badges.js
index fba7fe17..d46d20c0 100644
--- a/content/assets/javascripts/badges.js
+++ b/content/assets/javascripts/badges.js
@@ -7,7 +7,7 @@ version: 7
const BADGES_TITLES = {
// Free
- free: 'Available in GitLab Free self-managed, GitLab Free SaaS, and higher tiers.',
+ free: 'Heyooo this is going to break stuff so be careful.',
'free-self':
'Available in GitLab Free self-managed and higher tiers. Not available in GitLab SaaS.',
'free-only':
@@ -48,7 +48,7 @@ version: 7
const BADGES_MAPPING = {
// Free
core: ['all tiers'],
- free: ['all tiers'],
+ free: ['breaking'],
'core-only': ['all tiers', 'self-managed'],
'free-self': ['all tiers', 'self-managed'],
'free-only': ['all tiers', 'saas'],
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss
index ad211677..e0c3d8a8 100644
--- a/content/assets/stylesheets/stylesheet.scss
+++ b/content/assets/stylesheets/stylesheet.scss
@@ -326,6 +326,7 @@ ol {
.badge-tier {
&::after {
background: $badge-tier;
+ color: red;
}
}
diff --git a/content/frontend/deprecations/components/deprecation_filters.vue b/content/frontend/deprecations/components/deprecation_filters.vue
index b8381d8d..1e81c03b 100644
--- a/content/frontend/deprecations/components/deprecation_filters.vue
+++ b/content/frontend/deprecations/components/deprecation_filters.vue
@@ -23,10 +23,10 @@ export default {
created() {
// Pre-filter the page if the URL includes a valid version parameter.
const searchParams = new URLSearchParams(window.location.search);
- if (!searchParams.has('removal_milestone')) {
+ if (!searchParams.has('announcement_milestone')) {
return;
}
- const version = searchParams.get('removal_milestone').replace(/\./g, '');
+ const version = searchParams.get('announcement_milestone').replace(/\./g, '');
if (this.isValidVersion(version)) {
this.filterDeprecationList(version);
this.selected = version;
@@ -41,9 +41,9 @@ export default {
const url = new URL(window.location);
if (item.text.length > 0 && item.text !== this.showAllText) {
- url.searchParams.set('removal_milestone', item.text);
+ url.searchParams.set('announcement_milestone', item.text);
} else {
- url.searchParams.delete('removal_milestone');
+ url.searchParams.delete('announcement_milestone');
}
window.history.pushState(null, '', url.toString());
},
@@ -91,7 +91,7 @@ export default {
<template>
<div class="mt-3 row">
<div class="col-4">
- <label for="milestone" class="d-block col-form-label">Filter by removal version:</label>
+ <label for="milestone" class="d-block col-form-label">Show only breaking changes:</label>
<gl-form-select
v-model="selected"
name="milestone"