diff options
34 files changed, 92 insertions, 39 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3aa901463d1..891551cd41e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ stages: # in cases where jobs require Docker-in-Docker, the job # definition must be extended with `.use-docker-in-docker` default: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36" tags: - gitlab-org # All jobs are interruptible by default diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index e89b886df83..ed32f26583e 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -137,7 +137,7 @@ MergeRequest.hideCloseButton = function () { MergeRequest.toggleDraftStatus = function (title, isReady) { if (isReady) { createFlash({ - message: __('The merge request can now be merged.'), + message: __('Marked as ready. Merging is now allowed.'), type: 'notice', }); } diff --git a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue index d3cadcd2bd5..ecd2288eb2f 100644 --- a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue +++ b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue @@ -199,6 +199,16 @@ export default { }, ]; }, + chartOptions() { + return { + ...this.$options.timesChartOptions, + yAxis: { + axisLabel: { + formatter: (value) => value, + }, + }, + }; + }, }, methods: { hideAlert() { @@ -314,7 +324,7 @@ export default { <strong>{{ __('Pipeline durations for the last 30 commits') }}</strong> <gl-column-chart :height="$options.chartContainerHeight" - :option="$options.timesChartOptions" + :option="chartOptions" :bars="timesChartTransformedData" :y-axis-title="__('Minutes')" :x-axis-title="__('Commit')" diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue index a1eb77479bd..393c599c7e8 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue @@ -124,7 +124,7 @@ export default { }, }) => { createFlash({ - message: __('The merge request can now be merged.'), + message: __('Marked as ready. Merging is now allowed.'), type: 'notice', }); $('.merge-request .detail-page-description .title').text(title); diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss index 222e10f51ad..0aeb7208c59 100644 --- a/app/assets/stylesheets/framework/icons.scss +++ b/app/assets/stylesheets/framework/icons.scss @@ -36,6 +36,7 @@ } } +.ci-status-icon-notification, .ci-status-icon-preparing, .ci-status-icon-created, .ci-status-icon-skipped, diff --git a/doc/administration/consul.md b/doc/administration/consul.md index 9289fc7cc61..72b3487a549 100644 --- a/doc/administration/consul.md +++ b/doc/administration/consul.md @@ -21,7 +21,7 @@ Before configuring Consul: 1. Review the [reference architecture](reference_architectures/index.md#available-reference-architectures) documentation to determine the number of Consul server nodes you should have. -1. If necessary, ensure the [appropriate ports are open](package-information/defaults.md#ports) in your firewall. +1. If necessary, ensure the [appropriate ports are open](package_information/defaults.md#ports) in your firewall. ## Configure the Consul nodes diff --git a/doc/administration/geo/index.md b/doc/administration/geo/index.md index 82f13fe1e38..48091967189 100644 --- a/doc/administration/geo/index.md +++ b/doc/administration/geo/index.md @@ -138,7 +138,7 @@ The following table lists basic ports that must be open between the **primary** | 22 | 22 | TCP | | 5432 | | PostgreSQL | -See the full list of ports used by GitLab in [Package defaults](../package-information/defaults.md) +See the full list of ports used by GitLab in [Package defaults](../package_information/defaults.md) NOTE: [Web terminal](../../ci/environments/index.md#web-terminals) support requires your load balancer to correctly handle WebSocket connections. diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md index e9edc031e13..24ffee088f3 100644 --- a/doc/administration/instance_limits.md +++ b/doc/administration/instance_limits.md @@ -397,6 +397,31 @@ To set this limit for a self-managed installation, run the following in the Plan.default.actual_limits.update!(ci_pipeline_schedules: 100) ``` +### Limit the number of pipelines created by a pipeline schedule per day + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/323066) in GitLab 14.0. + +You can limit the number of pipelines that pipeline schedules can trigger per day. + +Schedules that try to run pipelines more frequently than the limit are slowed to a maximum frequency. +The frequency is calculated by dividing 1440 (the number minutes in a day) by the +limit value. For example, for a maximum frequency of: + +- Once per minute, the limit must be `1440`. +- Once per 10 minutes, the limit must be `144`. +- Once per 60 minutes, the limit must be `24` + +There is no limit for self-managed instances by default. + +To set this limit to `1440` on a self-managed installation, run the following in the +[GitLab Rails console](operations/rails_console.md#starting-a-rails-console-session): + +```ruby +Plan.default.actual_limits.update!(ci_daily_pipeline_schedule_triggers: 1440) +``` + +This limit is [enabled on GitLab.com](../user/gitlab_com/index.md#gitlab-cicd). + ### Number of instance level variables > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216097) in GitLab 13.1. diff --git a/doc/administration/package-information/defaults.md b/doc/administration/package_information/defaults.md index 45bea065995..45bea065995 100644 --- a/doc/administration/package-information/defaults.md +++ b/doc/administration/package_information/defaults.md diff --git a/doc/administration/package-information/deprecated_os.md b/doc/administration/package_information/deprecated_os.md index 251dbe1e20e..251dbe1e20e 100644 --- a/doc/administration/package-information/deprecated_os.md +++ b/doc/administration/package_information/deprecated_os.md diff --git a/doc/administration/package-information/deprecation_policy.md b/doc/administration/package_information/deprecation_policy.md index cc16661442a..cc16661442a 100644 --- a/doc/administration/package-information/deprecation_policy.md +++ b/doc/administration/package_information/deprecation_policy.md diff --git a/doc/administration/package-information/index.md b/doc/administration/package_information/index.md index e18fb621b89..e18fb621b89 100644 --- a/doc/administration/package-information/index.md +++ b/doc/administration/package_information/index.md diff --git a/doc/administration/package-information/licensing.md b/doc/administration/package_information/licensing.md index 8557a94bf93..8557a94bf93 100644 --- a/doc/administration/package-information/licensing.md +++ b/doc/administration/package_information/licensing.md diff --git a/doc/administration/package-information/omnibus_packages.md b/doc/administration/package_information/omnibus_packages.md index aa73534fc55..aa73534fc55 100644 --- a/doc/administration/package-information/omnibus_packages.md +++ b/doc/administration/package_information/omnibus_packages.md diff --git a/doc/administration/package-information/postgresql_versions.md b/doc/administration/package_information/postgresql_versions.md index 89da4864872..89da4864872 100644 --- a/doc/administration/package-information/postgresql_versions.md +++ b/doc/administration/package_information/postgresql_versions.md diff --git a/doc/administration/package-information/signed_packages.md b/doc/administration/package_information/signed_packages.md index fb994809460..fb994809460 100644 --- a/doc/administration/package-information/signed_packages.md +++ b/doc/administration/package_information/signed_packages.md diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index d516bde9a5d..8b7af5ee170 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -1278,7 +1278,7 @@ in all of your GitLab Pages instances. ### 500 error with `securecookie: failed to generate random iv` and `Failed to save the session` -This problem most likely results from an [out-dated operating system](../package-information/deprecated_os.md). +This problem most likely results from an [out-dated operating system](../package_information/deprecated_os.md). The [Pages daemon uses the `securecookie` library](https://gitlab.com/search?group_id=9970&project_id=734943&repository_ref=master&scope=blobs&search=securecookie&snippets=false) to get random strings via [`crypto/rand` in Go](https://golang.org/pkg/crypto/rand/#pkg-variables). This requires the `getrandom` system call or `/dev/urandom` to be available on the host OS. Upgrading to an [officially supported operating system](https://about.gitlab.com/install/) is recommended. diff --git a/doc/administration/postgresql/replication_and_failover.md b/doc/administration/postgresql/replication_and_failover.md index 747833798bc..2e0820b69c9 100644 --- a/doc/administration/postgresql/replication_and_failover.md +++ b/doc/administration/postgresql/replication_and_failover.md @@ -72,13 +72,13 @@ the PgBouncer service. ### Connection flow -Each service in the package comes with a set of [default ports](../package-information/defaults.md#ports). You may need to make specific firewall rules for the connections listed below: +Each service in the package comes with a set of [default ports](../package_information/defaults.md#ports). You may need to make specific firewall rules for the connections listed below: -- Application servers connect to either PgBouncer directly via its [default port](../package-information/defaults.md) or via a configured Internal Load Balancer (TCP) that serves multiple PgBouncers. -- PgBouncer connects to the primary database servers [PostgreSQL default port](../package-information/defaults.md) +- Application servers connect to either PgBouncer directly via its [default port](../package_information/defaults.md) or via a configured Internal Load Balancer (TCP) that serves multiple PgBouncers. +- PgBouncer connects to the primary database servers [PostgreSQL default port](../package_information/defaults.md) - Patroni actively manages the running PostgreSQL processes and configuration. -- PostgreSQL secondaries connect to the primary database servers [PostgreSQL default port](../package-information/defaults.md) -- Consul servers and agents connect to each others [Consul default ports](../package-information/defaults.md) +- PostgreSQL secondaries connect to the primary database servers [PostgreSQL default port](../package_information/defaults.md) +- Consul servers and agents connect to each others [Consul default ports](../package_information/defaults.md) ## Setting it up @@ -306,7 +306,7 @@ If you enable Monitoring, it must be enabled on **all** database servers. #### Enable TLS support for the Patroni API By default, Patroni's [REST API](https://patroni.readthedocs.io/en/latest/rest_api.html#rest-api) is served over HTTP. -You have the option to enable TLS and use HTTPS over the same [port](../package-information/defaults.md). +You have the option to enable TLS and use HTTPS over the same [port](../package_information/defaults.md). To enable TLS, you need PEM-formatted certificate and private key files. Both files must be readable by the PostgreSQL user (`gitlab-psql` by default, or the one set by `postgresql['username']`): @@ -789,7 +789,7 @@ You do not need any special consideration for Patroni while provisioning your da Patroni monitors the cluster and handles any failover. When the primary node fails it works with Consul to notify PgBouncer. On failure, Patroni handles the transitioning of the old primary to a replica and rejoins it to the cluster automatically. -With Patroni, the connection flow is slightly different. Patroni on each node connects to Consul agent to join the cluster. Only after this point it decides if the node is the primary or a replica. Based on this decision, it configures and starts PostgreSQL which it communicates with directly over a Unix socket. This means that if the Consul cluster is not functional or does not have a leader, Patroni and by extension PostgreSQL does not start. Patroni also exposes a REST API which can be accessed via its [default port](../package-information/defaults.md) +With Patroni, the connection flow is slightly different. Patroni on each node connects to Consul agent to join the cluster. Only after this point it decides if the node is the primary or a replica. Based on this decision, it configures and starts PostgreSQL which it communicates with directly over a Unix socket. This means that if the Consul cluster is not functional or does not have a leader, Patroni and by extension PostgreSQL does not start. Patroni also exposes a REST API which can be accessed via its [default port](../package_information/defaults.md) on each node. ### Check replication status diff --git a/doc/administration/raketasks/check.md b/doc/administration/raketasks/check.md index ea780072ca3..7cd7ecc26f7 100644 --- a/doc/administration/raketasks/check.md +++ b/doc/administration/raketasks/check.md @@ -286,7 +286,7 @@ To delete these references to missing local artifacts (`job.log` files): ```ruby artifacts_deleted = 0 - ::Ci::JobArtifact.all.each do |artifact| ### Iterate artifacts + ::Ci::JobArtifact.find_each do |artifact| ### Iterate artifacts # next if artifact.file.filename != "job.log" ### Uncomment if only `job.log` files' references are to be processed next if artifact.file.exists? ### Skip if the file reference is valid artifacts_deleted += 1 diff --git a/doc/development/deprecation_guidelines/index.md b/doc/development/deprecation_guidelines/index.md index 4ffb993d0ae..f8ee29e6904 100644 --- a/doc/development/deprecation_guidelines/index.md +++ b/doc/development/deprecation_guidelines/index.md @@ -32,6 +32,6 @@ It also should be [deprecated in advance](https://about.gitlab.com/handbook/mark For API removals, see the [GraphQL](../../api/graphql/index.md#deprecation-and-removal-process) and [GitLab API](../../api/index.md#compatibility-guidelines) guidelines. -For configuration removals, see the [Omnibus deprecation policy](../../administration/package-information/deprecation_policy.md). +For configuration removals, see the [Omnibus deprecation policy](../../administration/package_information/deprecation_policy.md). For versioning and upgrade details, see our [Release and Maintenance policy](../../policy/maintenance.md). diff --git a/doc/development/experiment_guide/index.md b/doc/development/experiment_guide/index.md index ee871bc3ea7..4de272fec20 100644 --- a/doc/development/experiment_guide/index.md +++ b/doc/development/experiment_guide/index.md @@ -31,6 +31,10 @@ run) shouldn't impact GitLab availability. To avoid or identify issues, experiments are initially deployed to a small number of users. Regardless, experiments still need tests. +Experiments must have corresponding [frontend or feature tests](../testing_guide/index.md) to ensure they +exist in the application. These tests should help prevent the experiment code from +being removed before the [experiment cleanup process](https://about.gitlab.com/handbook/engineering/development/growth/experimentation/#experiment-cleanup-issue) starts. + If, as a reviewer or maintainer, you find code that would usually fail review but is acceptable for now, mention your concerns with a note that there's no need to change the code. The author can then add a comment to this piece of code diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index 2dc7be0356d..dd45091a31b 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -450,7 +450,7 @@ In addition, there are a few circumstances where we would always run the full Je ### PostgreSQL versions testing Our test suite runs against PG12 as GitLab.com runs on PG12 and -[Omnibus defaults to PG12 for new installs and upgrades](../administration/package-information/postgresql_versions.md), +[Omnibus defaults to PG12 for new installs and upgrades](../administration/package_information/postgresql_versions.md), Our test suite is currently running against PG11, since GitLab.com still runs on PG11. We do run our test suite against PG11 on nightly scheduled pipelines as well as upon specific @@ -467,7 +467,7 @@ database library changes in MRs and `main` pipelines (with the `rspec db-library #### Long-term plan -We follow the [PostgreSQL versions shipped with Omnibus GitLab](../administration/package-information/postgresql_versions.md): +We follow the [PostgreSQL versions shipped with Omnibus GitLab](../administration/package_information/postgresql_versions.md): | PostgreSQL version | 13.11 (April 2021) | 13.12 (May 2021) | 14.0 (June 2021?) | | -------------------| ---------------------- | ---------------------- | ---------------------- | diff --git a/doc/install/docker.md b/doc/install/docker.md index c182682fe0f..b611f87938e 100644 --- a/doc/install/docker.md +++ b/doc/install/docker.md @@ -368,7 +368,7 @@ You can then access your GitLab instance at `http://198.51.100.1/` and `https:// ### Expose GitLab on different ports -GitLab will occupy [some ports](../administration/package-information/defaults.md) +GitLab will occupy [some ports](../administration/package_information/defaults.md) inside the container. If you want to use a different host port than `80` (HTTP) or `443` (HTTPS), diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 212bd40dfac..641b092e1e3 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -36,7 +36,7 @@ For the installation options, see [the main installation page](index.md). Installation of GitLab on these operating systems is possible, but not supported. Please see the [installation from source guide](installation.md) and the [installation guides](https://about.gitlab.com/install/) for more information. -Please see [OS versions that are no longer supported](../administration/package-information/deprecated_os.md) for Omnibus installs page +Please see [OS versions that are no longer supported](../administration/package_information/deprecated_os.md) for Omnibus installs page for a list of supported and unsupported OS versions as well as the last support GitLab version for that OS. ### Microsoft Windows diff --git a/doc/update/package/index.md b/doc/update/package/index.md index d34396d7b84..44be79f22fb 100644 --- a/doc/update/package/index.md +++ b/doc/update/package/index.md @@ -183,7 +183,7 @@ To download and install GitLab: ### GitLab 13.7 and later unavailable on Amazon Linux 2 -Amazon Linux 2 is not an [officially supported operating system](../../administration/package-information/deprecated_os.md#supported-operating-systems). +Amazon Linux 2 is not an [officially supported operating system](../../administration/package_information/deprecated_os.md#supported-operating-systems). However, in past the [official package installation script](https://packages.gitlab.com/gitlab/gitlab-ee/install) installed the `el/6` package repository if run on Amazon Linux. From GitLab 13.7, we no longer provide `el/6` packages so administrators must run the [installation script](https://packages.gitlab.com/gitlab/gitlab-ee/install) diff --git a/doc/update/plan_your_upgrade.md b/doc/update/plan_your_upgrade.md index 63ce9e00d97..406f8322218 100644 --- a/doc/update/plan_your_upgrade.md +++ b/doc/update/plan_your_upgrade.md @@ -18,7 +18,7 @@ General notes: to create your plan, share details of your architecture, including: - How is GitLab installed? - What is the operating system of the node? - (check [OS versions that are no longer supported](../administration/package-information/deprecated_os.md) to confirm that later updates are available). + (check [OS versions that are no longer supported](../administration/package_information/deprecated_os.md) to confirm that later updates are available). - Is it a single-node or a multi-node setup? If multi-node, share any architectural details about each node with us. - Are you using [GitLab Geo](../administration/geo/index.md)? If so, share any architectural details about each secondary node. - What else might be unique or interesting in your setup that might be important for us to understand? @@ -112,7 +112,7 @@ to your instance and then upgrade it for any relevant features you're using. - [Determine what upgrade path](index.md#upgrade-paths) to follow. - Account for any [version-specific update instructions](index.md#version-specific-upgrading-instructions). - Account for any [version-specific changes](package/index.md#version-specific-changes). - - Check the [OS compatibility with the target GitLab version](../administration/package-information/deprecated_os.md). + - Check the [OS compatibility with the target GitLab version](../administration/package_information/deprecated_os.md). - Due to background migrations, plan to pause any further upgrades after upgrading to a new major version. [All migrations must finish running](index.md#checking-for-background-migrations-before-upgrading) @@ -123,7 +123,7 @@ to your instance and then upgrade it for any relevant features you're using. - About PostgreSQL: - On the top bar, select **Menu > Admin**, and look for the version of PostgreSQL you are using. - If [a PostgreSQL upgrade is needed](../administration/package-information/postgresql_versions.md), + If [a PostgreSQL upgrade is needed](../administration/package_information/postgresql_versions.md), account for the relevant [packaged](https://docs.gitlab.com/omnibus/settings/database.html#upgrade-packaged-postgresql-server) or [non-packaged](https://docs.gitlab.com/omnibus/settings/database.html#upgrade-a-non-packaged-postgresql-database) steps. diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index 3379460cccc..72058a7e8d2 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -136,6 +136,7 @@ the related documentation. | [Max jobs in active pipelines](../../administration/instance_limits.md#number-of-jobs-in-active-pipelines) | `500` for Free tier, unlimited otherwise | Unlimited | | [Max CI/CD subscriptions to a project](../../administration/instance_limits.md#number-of-cicd-subscriptions-to-a-project) | `2` | Unlimited | | [Max pipeline schedules in projects](../../administration/instance_limits.md#number-of-pipeline-schedules) | `10` for Free tier, `50` for all paid tiers | Unlimited | +| [Max pipelines per schedule](../../administration/instance_limits.md#limit-the-number-of-pipelines-created-by-a-pipeline-schedule-per-day) | `24` for Free tier, `288` for all paid tiers | Unlimited | | [Scheduled Job Archival](../../user/admin_area/settings/continuous_integration.md#archive-jobs) | 3 months | Never | | Max test cases per [unit test report](../../ci/unit_test_reports.md) | `500_000` | Unlimited | | [Max registered runners](../../administration/instance_limits.md#number-of-registered-runners-per-scope) | `50` per-project and per-group for Free tier,<br/>`1_000` per-group for all paid tiers / `1_000` per-project for all paid tiers | `1_000` per-group / `1_000` per-project | diff --git a/doc/user/permissions.md b/doc/user/permissions.md index bc13ef15d15..f240a9fd407 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -196,7 +196,10 @@ The following table lists project permissions available for each role: | [Test cases](../ci/test_cases/index.md):<br>Move | | ✓ | ✓ | ✓ | ✓ | | [Test cases](../ci/test_cases/index.md):<br>Reopen | | ✓ | ✓ | ✓ | ✓ | -1. Guest users are able to perform this action on public and internal projects, but not private projects. This doesn't apply to [external users](#external-users) where explicit access must be given even if the project is internal. +1. On self-managed GitLab instances, guest users are able to perform this action only on + public and internal projects (not on private projects). [External users](#external-users) + must be given explicit access even if the project is internal. For GitLab.com, see the + [GitLab.com visibility settings](gitlab_com/index.md#visibility-settings). 1. Guest users can only view the [confidential issues](project/issues/confidential_issues.md) they created themselves. 1. If **Public pipelines** is enabled in **Project Settings > CI/CD**. 1. Not allowed for Guest, Reporter, Developer, Maintainer, or Owner. See [protected branches](project/protected_branches.md). diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 467a81130ae..65e1eafa477 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -76,7 +76,7 @@ a self-managed instance from an old server to a new server. The backups produced don't depend on the operating system running GitLab. You can therefore use the restore method to switch between different operating system distributions or versions, as long -as the same GitLab version [is available for installation](../../../administration/package-information/deprecated_os.md). +as the same GitLab version [is available for installation](../../../administration/package_information/deprecated_os.md). To instead merge two self-managed GitLab instances together, use the instructions in [Migrate from self-managed GitLab to GitLab.com](#migrate-from-self-managed-gitlab-to-gitlabcom). diff --git a/locale/gitlab.pot b/locale/gitlab.pot index ae414a639a1..163bbae2692 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -20681,6 +20681,9 @@ msgstr "" msgid "Marked For Deletion At - %{deletion_time}" msgstr "" +msgid "Marked as ready. Merging is now allowed." +msgstr "" + msgid "Marked this %{noun} as a draft." msgstr "" @@ -32501,6 +32504,12 @@ msgstr "" msgid "Subscriptions" msgstr "" +msgid "Subscription|Renew your subscription" +msgstr "" + +msgid "Subscription|Your subscription for %{strong}%{namespace_name}%{strong_close} has expired and you are now on %{pricing_link_start}the GitLab Free tier%{pricing_link_end}. Don't worry, your data is safe. Get in touch with our support team (%{support_email}). They'll gladly help with your subscription renewal." +msgstr "" + msgid "Subtracted" msgstr "" @@ -33707,9 +33716,6 @@ msgstr "" msgid "The merge conflicts for this merge request have already been resolved. Please return to the merge request." msgstr "" -msgid "The merge request can now be merged." -msgstr "" - msgid "The metric must be one of %{metrics}." msgstr "" @@ -38632,9 +38638,6 @@ msgstr "" msgid "You could not create a new trigger." msgstr "" -msgid "You didn't renew your subscription for %{strong}%{namespace_name}%{strong_close} so it was downgraded to the free plan." -msgstr "" - msgid "You do not have any subscriptions yet" msgstr "" @@ -39223,9 +39226,6 @@ msgstr "" msgid "Your subscription expired!" msgstr "" -msgid "Your subscription has been downgraded." -msgstr "" - msgid "Your subscription will expire in %{remaining_days} day." msgid_plural "Your subscription will expire in %{remaining_days} days." msgstr[0] "" @@ -40187,6 +40187,9 @@ msgstr "" msgid "mrWidget| Please restore it or use a different %{missingBranchName} branch" msgstr "" +msgid "mrWidget|%{linkStart}Set up now%{linkEnd} to analyze your source code for known security vulnerabilities." +msgstr "" + msgid "mrWidget|%{mergeError}." msgstr "" @@ -40279,6 +40282,9 @@ msgstr "" msgid "mrWidget|Did not close" msgstr "" +msgid "mrWidget|Dismiss" +msgstr "" + msgid "mrWidget|Email patches" msgstr "" @@ -40395,6 +40401,9 @@ msgstr "" msgid "mrWidget|Revoke approval" msgstr "" +msgid "mrWidget|SAST and Secret Detection is not enabled." +msgstr "" + msgid "mrWidget|Set by %{merge_author} to be added to the merge train when the pipeline succeeds" msgstr "" diff --git a/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js b/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js index b5ee62f2042..6ef49390c47 100644 --- a/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js +++ b/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js @@ -60,7 +60,7 @@ describe('~/projects/pipelines/charts/components/pipeline_charts.vue', () => { expect(chart.props('yAxisTitle')).toBe('Minutes'); expect(chart.props('xAxisTitle')).toBe('Commit'); expect(chart.props('bars')).toBe(wrapper.vm.timesChartTransformedData); - expect(chart.props('option')).toBe(wrapper.vm.$options.timesChartOptions); + expect(chart.props('option')).toBe(wrapper.vm.chartOptions); }); }); diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js index 0609086997b..61e44140efc 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js @@ -64,7 +64,7 @@ describe('Wip', () => { expect(vm.isMakingRequest).toBeTruthy(); expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj); expect(createFlash).toHaveBeenCalledWith({ - message: 'The merge request can now be merged.', + message: 'Marked as ready. Merging is now allowed.', type: 'notice', }); done(); diff --git a/spec/migrations/active_record/schema_spec.rb b/spec/migrations/active_record/schema_spec.rb index 4a505c51a16..042b5710dce 100644 --- a/spec/migrations/active_record/schema_spec.rb +++ b/spec/migrations/active_record/schema_spec.rb @@ -7,7 +7,7 @@ require 'spec_helper' RSpec.describe ActiveRecord::Schema, schema: :latest do let(:all_migrations) do - migrations_directories = %w[db/migrate db/post_migrate].map { |path| Rails.root.join(path).to_s } + migrations_directories = Rails.application.paths["db/migrate"].paths.map(&:to_s) migrations_paths = migrations_directories.map { |path| File.join(path, '*') } migrations = Dir[*migrations_paths] - migrations_directories diff --git a/spec/support/helpers/session_helpers.rb b/spec/support/helpers/session_helpers.rb index f58df2f438b..4ef099a393e 100644 --- a/spec/support/helpers/session_helpers.rb +++ b/spec/support/helpers/session_helpers.rb @@ -13,7 +13,7 @@ module SessionHelpers session_keys = get_session_keys expect(session_keys.size).to eq(1) - expect(get_ttl(session_keys.first)).to eq expiration + expect(get_ttl(session_keys.first)).to be_within(5).of(expiration) end def get_session_keys |