diff options
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | content/_data/navigation.yaml | 51 | ||||
| -rw-r--r-- | lib/filters/badges.rb | 6 | ||||
| -rw-r--r-- | lib/helpers/blueprints.rb | 2 |
4 files changed, 40 insertions, 33 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 8b47e5ac..9914236d 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -63,7 +63,7 @@ default: # .rules_scheduled: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never - if: '$CI_PIPELINE_SOURCE != "schedule"' when: never @@ -80,7 +80,7 @@ default: .rules_scheduled_manual: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never - if: '$CI_PIPELINE_SOURCE == "schedule"' when: manual @@ -88,15 +88,13 @@ default: .rules_chores: rules: - - if: '$CLEAN_REVIEW_APPS_DAYS' - when: never - if: '$CI_PIPELINE_SOURCE == "schedule" && $CHORES_PIPELINE == "true"' when: manual allow_failure: true .rules_site_tests: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never # Don't run site tests for review apps. - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' @@ -108,7 +106,7 @@ default: .rules_global_nav_test: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' when: never @@ -119,7 +117,7 @@ default: .rules_prod: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never # Don't deploy to production for trigerred pipelines (usually review apps) - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' @@ -145,7 +143,7 @@ default: .rules_pages: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never # Don't deploy to production for trigerred pipelines (usually review apps) - if: '$CI_PIPELINE_SOURCE == "pipeline"|| $CI_PIPELINE_SOURCE == "trigger"' diff --git a/content/_data/navigation.yaml b/content/_data/navigation.yaml index 12400788..943aa3ce 100644 --- a/content/_data/navigation.yaml +++ b/content/_data/navigation.yaml @@ -1119,6 +1119,12 @@ sections: docs: - doc_title: License Compliance doc_url: 'ee/user/compliance/license_compliance/' + - doc_title: License approval policies + doc_url: 'ee/user/compliance/license_approval_policies.html' + - doc_title: License check rules + doc_url: 'ee/user/compliance/license_check_rules.html' + - doc_title: License list + doc_url: 'ee/user/compliance/license_list.html' - doc_title: License scanning of CycloneDX files doc_url: 'ee/user/compliance/license_scanning_of_cyclonedx_files/' - doc_title: SPDX license list import Rake task @@ -2030,6 +2036,8 @@ sections: - doc_title: GitOps workflow doc_url: 'ee/user/clusters/agent/gitops.html' docs: + - doc_title: Flux + doc_url: 'ee/user/clusters/agent/gitops/flux.html' - doc_title: Use Helm charts doc_url: 'ee/user/clusters/agent/gitops/helm.html' - doc_title: Manage Kubernetes secrets @@ -2153,11 +2161,11 @@ sections: doc_url: 'ee/integration/arkose.html' - doc_title: Asana doc_url: 'ee/user/project/integrations/asana.html' - - doc_title: Bamboo CI + - doc_title: Atlassian Bamboo doc_url: 'ee/user/project/integrations/bamboo.html' - doc_title: Datadog doc_url: 'ee/integration/datadog.html' - - doc_title: Discord + - doc_title: Discord Notifications doc_url: 'ee/user/project/integrations/discord_notifications.html' - doc_title: Elasticsearch doc_url: 'ee/integration/advanced_search/elasticsearch.html' @@ -2173,40 +2181,40 @@ sections: doc_url: 'ee/user/project/integrations/bugzilla.html' - doc_title: Custom issue tracker doc_url: 'ee/user/project/integrations/custom_issue_tracker.html' - - doc_title: IBM Engineering Workflow Management + - doc_title: Engineering Workflow Management (EWM) doc_url: 'ee/user/project/integrations/ewm.html' - doc_title: Redmine doc_url: 'ee/user/project/integrations/redmine.html' - doc_title: YouTrack doc_url: 'ee/user/project/integrations/youtrack.html' - - doc_title: ZenTao + - doc_title: ZenTao (deprecated) doc_url: 'ee/user/project/integrations/zentao.html' - doc_title: GitHub doc_url: 'ee/user/project/integrations/github.html' + - doc_title: GitLab for Slack app + doc_url: 'ee/user/project/integrations/gitlab_slack_application.html' - doc_title: Gitpod doc_url: 'ee/integration/gitpod.html' - - doc_title: Gmail actions buttons + - doc_title: Gmail actions doc_url: 'ee/integration/gmail_action_buttons_for_gitlab.html' - doc_title: Google Chat doc_url: 'ee/user/project/integrations/hangouts_chat.html' - doc_title: Harbor doc_url: 'ee/user/project/integrations/harbor.html' - - doc_title: Irker + - doc_title: irker (IRC gateway) doc_url: 'ee/user/project/integrations/irker.html' - doc_title: Jenkins doc_url: 'ee/integration/jenkins.html' - doc_title: Jira integrations doc_url: 'ee/integration/jira/' docs: - - doc_title: Configure the Jira integration + - doc_title: Configure Jira integration doc_url: 'ee/integration/jira/configure.html' - doc_title: Create Jira Cloud API token doc_url: 'ee/integration/jira/jira_cloud_configuration.html' - - doc_title: Create Jira Server user - doc_url: 'ee/integration/jira/jira_server_configuration.html' - - doc_title: GitLab for Jira app + - doc_title: GitLab for Jira Cloud app doc_url: 'ee/integration/jira/connect-app.html' - - doc_title: Jira Development Panel + - doc_title: Jira development panel doc_url: 'ee/integration/jira/development_panel.html' - doc_title: Jira DVCS connector doc_url: 'ee/integration/jira/dvcs/' @@ -2215,17 +2223,21 @@ sections: doc_url: 'ee/integration/jira/dvcs/troubleshooting.html' - doc_title: Jira integration issue management doc_url: 'ee/integration/jira/issues.html' + - doc_title: Jira Server credentials + doc_url: 'ee/integration/jira/jira_server_configuration.html' - doc_title: Troubleshooting doc_url: 'ee/integration/jira/troubleshooting.html' - - doc_title: Kroki diagrams + - doc_title: Kroki doc_url: 'ee/administration/integration/kroki.html' - doc_title: Mailgun doc_url: 'ee/administration/integration/mailgun.html' + - doc_title: Marketplace partners + doc_url: 'ee/integration/partner_marketplace.html' - doc_title: Mattermost notifications doc_url: 'ee/user/project/integrations/mattermost.html' - doc_title: Mattermost slash commands doc_url: 'ee/user/project/integrations/mattermost_slash_commands.html' - - doc_title: Microsoft Teams + - doc_title: Microsoft Teams notifications doc_url: 'ee/user/project/integrations/microsoft_teams.html' - doc_title: Mock CI doc_url: 'ee/user/project/integrations/mock_ci.html' @@ -2242,7 +2254,7 @@ sections: - doc_title: Prometheus doc_url: 'ee/user/project/integrations/prometheus.html' docs: - - doc_title: Sample Prometheus data Rake task + - doc_title: Sample data Rake task doc_url: 'ee/raketasks/generate_sample_prometheus_data.html' - doc_title: Pumble doc_url: 'ee/user/project/integrations/pumble.html' @@ -2252,20 +2264,17 @@ sections: doc_url: 'ee/integration/security_partners/' - doc_title: ServiceNow doc_url: 'ee/user/project/integrations/servicenow.html' - - doc_title: Shimo + - doc_title: Shimo (deprecated) doc_url: 'ee/user/project/integrations/shimo.html' - - doc_title: Slack application - doc_url: 'ee/user/project/integrations/gitlab_slack_application.html' - doc_title: Slack notifications doc_url: 'ee/user/project/integrations/slack.html' - doc_title: Slack slash commands doc_url: 'ee/user/project/integrations/slack_slash_commands.html' - docs: - - doc_title: Slash commands - doc_url: 'ee/integration/slash_commands.html' + - doc_title: Slash commands in Mattermost and Slack + doc_url: 'ee/integration/slash_commands.html' - doc_title: Sourcegraph doc_url: 'ee/integration/sourcegraph.html' - - doc_title: Trello + - doc_title: Trello Power-Ups doc_url: 'ee/integration/trello_power_up.html' - doc_title: Unify Circuit doc_url: 'ee/user/project/integrations/unify_circuit.html' diff --git a/lib/filters/badges.rb b/lib/filters/badges.rb index bf88f854..9fd8540b 100644 --- a/lib/filters/badges.rb +++ b/lib/filters/badges.rb @@ -42,10 +42,10 @@ class BadgesFilter < Nanoc::Filter end def generate(tier, type) - if !type.nil? - %(<span class="badge-trigger #{tier}-#{type.downcase}"></span>) - else + if type.nil? %(<span class="badge-trigger #{tier}"></span>) + else + %(<span class="badge-trigger #{tier}-#{type.downcase}"></span>) end end end diff --git a/lib/helpers/blueprints.rb b/lib/helpers/blueprints.rb index 7e3cc7b7..b97c436c 100644 --- a/lib/helpers/blueprints.rb +++ b/lib/helpers/blueprints.rb @@ -2,7 +2,7 @@ module Nanoc::Helpers module Blueprints - BLUEPRINTS_PATH = '/ee/architecture/blueprints/*/index.md'.freeze + BLUEPRINTS_PATH = '/ee/architecture/blueprints/*/index.md' def all_blueprints blueprints = @items.find_all(BLUEPRINTS_PATH).sort_by do |i| |