diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f60343a96f..a5f07b312fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,6 +119,9 @@ workflow: variables: <<: *default-ruby-variables PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch pipeline' + - if: '$CI_PROJECT_PATH == "gitlab/gitaly" && $CI_PIPELINE_SOURCE == "parent_pipeline" && $GITALY_TEST' + variables: + PIPELINE_NAME: 'Gitaly Rails Test Pipeline' variables: PG_VERSION: "14" diff --git a/.rubocop.yml b/.rubocop.yml index 8edba38cc65..dcd66eeea92 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -40,6 +40,7 @@ AllCops: TargetRubyVersion: <%= RUBY_VERSION[/^\d+\.\d+/, 0] %> TargetRailsVersion: 6.0 Exclude: + - 'gems/**/*' - 'vendor/**/*' - 'node_modules/**/*' - 'db/fixtures/**/*' diff --git a/app/assets/javascripts/admin/users/components/actions/ban.vue b/app/assets/javascripts/admin/users/components/actions/ban.vue index d7bdceb4798..36dcde619cf 100644 --- a/app/assets/javascripts/admin/users/components/actions/ban.vue +++ b/app/assets/javascripts/admin/users/components/actions/ban.vue @@ -12,7 +12,7 @@ const messageHtml = `
  • ${s__("AdminUsers|The user can't log in.")}
  • ${s__("AdminUsers|The user can't access git repositories.")}
  • ${s__( - 'AdminUsers|Issues and merge requests authored by this user are hidden from other users.', + 'AdminUsers|Projects, issues, merge requests, and comments of this user are hidden from other users.', )}
  • ${s__('AdminUsers|You can unban their account in the future. Their data remains intact.')}

    diff --git a/app/assets/javascripts/analytics/shared/constants.js b/app/assets/javascripts/analytics/shared/constants.js index 25699c17b10..7ec7eac24ec 100644 --- a/app/assets/javascripts/analytics/shared/constants.js +++ b/app/assets/javascripts/analytics/shared/constants.js @@ -39,8 +39,8 @@ export const DORA_METRICS = { }; const VSA_FLOW_METRICS_GROUP = { - key: 'key_metrics', - title: s__('ValueStreamAnalytics|Key metrics'), + key: 'lifecycle_metrics', + title: s__('ValueStreamAnalytics|Lifecycle metrics'), keys: Object.values(FLOW_METRICS), }; diff --git a/app/assets/javascripts/content_editor/components/suggestions_dropdown.vue b/app/assets/javascripts/content_editor/components/suggestions_dropdown.vue index 4074e50a706..947a952de3c 100644 --- a/app/assets/javascripts/content_editor/components/suggestions_dropdown.vue +++ b/app/assets/javascripts/content_editor/components/suggestions_dropdown.vue @@ -1,9 +1,8 @@