Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
2ee7cff13b
commit
483700e50d
|
|
@ -1 +1 @@
|
|||
69984aee4bae5d28182946aba78737e0acbc635c
|
||||
1c364e717ce8fdc4a6603f7369756785c146c898
|
||||
|
|
|
|||
|
|
@ -8,8 +8,12 @@ import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link
|
|||
|
||||
export default {
|
||||
i18n: {
|
||||
copyTrigger: s__('Pipelines|Copy trigger token'),
|
||||
editButton: s__('Pipelines|Edit'),
|
||||
revokeButton: s__('Pipelines|Revoke'),
|
||||
revokeButton: s__('Pipelines|Revoke trigger'),
|
||||
revokeButtonConfirm: s__(
|
||||
'Pipelines|By revoking a trigger you will break any processes making use of it. Are you sure?',
|
||||
),
|
||||
},
|
||||
components: {
|
||||
GlTable,
|
||||
|
|
@ -72,7 +76,7 @@ export default {
|
|||
:text="item.token"
|
||||
data-testid="clipboard-btn"
|
||||
data-qa-selector="clipboard_button"
|
||||
:title="s__('Pipelines|Copy trigger token')"
|
||||
:title="$options.i18n.copyTrigger"
|
||||
css-class="gl-border-none gl-py-0 gl-px-2"
|
||||
/>
|
||||
<div class="label-container">
|
||||
|
|
@ -122,13 +126,9 @@ export default {
|
|||
:title="$options.i18n.revokeButton"
|
||||
:aria-label="$options.i18n.revokeButton"
|
||||
icon="remove"
|
||||
variant="warning"
|
||||
:data-confirm="
|
||||
s__(
|
||||
'Pipelines|By revoking a trigger you will break any processes making use of it. Are you sure?',
|
||||
)
|
||||
"
|
||||
:data-confirm="$options.i18n.revokeButtonConfirm"
|
||||
data-method="delete"
|
||||
data-confirm-btn-variant="danger"
|
||||
rel="nofollow"
|
||||
class="gl-ml-3"
|
||||
data-testid="trigger_revoke_button"
|
||||
|
|
|
|||
|
|
@ -108,6 +108,7 @@ export default {
|
|||
class="gl-mx-5! gl-mb-2!"
|
||||
autofocus
|
||||
debounce="500"
|
||||
:aria-label="__('Search for an emoji')"
|
||||
@input="onSearchInput"
|
||||
/>
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -199,12 +199,15 @@ export default {
|
|||
<div v-if="canAwardEmoji" class="award-menu-holder gl-my-2">
|
||||
<emoji-picker
|
||||
v-if="glFeatures.improvedEmojiPicker"
|
||||
v-gl-tooltip.viewport
|
||||
:title="__('Add reaction')"
|
||||
:toggle-class="['add-reaction-button btn-icon gl-relative!', { 'is-active': isMenuOpen }]"
|
||||
@click="handleAward"
|
||||
@shown="setIsMenuOpen(true)"
|
||||
@hidden="setIsMenuOpen(false)"
|
||||
>
|
||||
<template #button-content>
|
||||
<span class="gl-sr-only">{{ __('Add reaction') }}</span>
|
||||
<span class="reaction-control-icon reaction-control-icon-neutral">
|
||||
<gl-icon name="slight-smile" />
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@ module Types
|
|||
class RunnerWebUrlEdge < ::Types::BaseEdge
|
||||
include FindClosest
|
||||
|
||||
field :edit_url, GraphQL::Types::String, null: true,
|
||||
description: 'Web URL of the runner edit page. The value depends on where you put this field in the query. You can use it for projects or groups.',
|
||||
extras: [:parent]
|
||||
field :web_url, GraphQL::Types::String, null: true,
|
||||
description: 'Web URL of the runner. The value depends on where you put this field in the query. You can use it for projects or groups.',
|
||||
extras: [:parent]
|
||||
|
|
@ -16,14 +19,26 @@ module Types
|
|||
@runner = node.node
|
||||
end
|
||||
|
||||
def edit_url(parent:)
|
||||
runner_url(parent: parent, url_type: :edit_url)
|
||||
end
|
||||
|
||||
def web_url(parent:)
|
||||
runner_url(parent: parent, url_type: :default)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def runner_url(parent:, url_type: :default)
|
||||
owner = closest_parent([::Types::ProjectType, ::Types::GroupType], parent)
|
||||
|
||||
# Only ::Group is supported at the moment, future iterations will include ::Project.
|
||||
# See https://gitlab.com/gitlab-org/gitlab/-/issues/16338
|
||||
case owner
|
||||
when ::Group
|
||||
return Gitlab::Routing.url_helpers.edit_group_runner_url(owner, @runner) if url_type == :edit_url
|
||||
|
||||
Gitlab::Routing.url_helpers.group_runner_url(owner, @runner)
|
||||
when ::Project
|
||||
Gitlab::Routing.url_helpers.project_runner_url(owner, @runner)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -5756,6 +5756,7 @@ The edge type for [`CiRunner`](#cirunner).
|
|||
| Name | Type | Description |
|
||||
| ---- | ---- | ----------- |
|
||||
| <a id="cirunneredgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
|
||||
| <a id="cirunneredgeediturl"></a>`editUrl` | [`String`](#string) | Web URL of the runner edit page. The value depends on where you put this field in the query. You can use it for projects or groups. |
|
||||
| <a id="cirunneredgenode"></a>`node` | [`CiRunner`](#cirunner) | The item at the end of the edge. |
|
||||
| <a id="cirunneredgeweburl"></a>`webUrl` | [`String`](#string) | Web URL of the runner. The value depends on where you put this field in the query. You can use it for projects or groups. |
|
||||
|
||||
|
|
|
|||
|
|
@ -2758,6 +2758,7 @@ with the API scope enabled.
|
|||
|--------------|---------|------------------------|-------------|
|
||||
| `import_url` | string | **{check-circle}** Yes | URL of remote repository being mirrored (with `user:token` if needed). |
|
||||
| `mirror` | boolean | **{check-circle}** Yes | Enables pull mirroring on project when set to `true`. |
|
||||
| `mirror_trigger_builds`| boolean | **{dotted-circle}** No | Trigger pipelines for mirror updates when set to `true`. |
|
||||
| `only_mirror_protected_branches`| boolean | **{dotted-circle}** No | Limits mirroring to only protected branches when set to `true`. |
|
||||
|
||||
## Start the pull mirroring process for a Project **(PREMIUM)**
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -28,6 +28,65 @@ For removal reviewers (Technical Writers only):
|
|||
https://about.gitlab.com/handbook/marketing/blog/release-posts/#update-the-removals-doc
|
||||
-->
|
||||
|
||||
## 14.6
|
||||
|
||||
### Limit the number of triggered pipeline to 25K in free tier
|
||||
|
||||
A large amount of triggered pipelines in a single project impacts the performance of GitLab.com. In GitLab 14.6, we are limiting the number of triggered pipelines in a single project on GitLab.com at any given moment to 25,000. This change applies to projects in the free tier only, Premium and Ultimate are not affected by this change.
|
||||
|
||||
### Release CLI distributed as a generic package
|
||||
|
||||
The [release-cli](https://gitlab.com/gitlab-org/release-cli) will be released as a [generic package](https://gitlab.com/gitlab-org/release-cli/-/packages) starting in GitLab 14.2. We will continue to deploy it as a binary to S3 until GitLab 14.5 and stop distributing it in S3 in GitLab 14.6.
|
||||
|
||||
## 14.3
|
||||
|
||||
### Introduced limit of 50 tags for jobs
|
||||
|
||||
GitLab values efficiency and is prioritizing reliability for [GitLab.com in FY22](https://about.gitlab.com/direction/#gitlab-hosted-first). In 14.3, GitLab CI/CD jobs must have less than 50 [tags](https://docs.gitlab.com/ee/ci/yaml/index.html#tags). If a pipeline contains a job with 50 or more tags, you will receive an error and the pipeline will not be created.
|
||||
|
||||
### List project pipelines API endpoint removes `name` support in 14.3
|
||||
|
||||
In GitLab 14.3, we will remove the ability to filter by `name` in the [list project pipelines API endpoint](https://docs.gitlab.com/ee/api/pipelines.html#list-project-pipelines) to improve performance. If you currently use this parameter with this endpoint, you must switch to `username`.
|
||||
|
||||
### Use of legacy storage setting
|
||||
|
||||
The support for [`gitlab_pages['use_legacy_storage']` setting](https://docs.gitlab.com/ee/administration/pages/index.html#domain-source-configuration-before-140) in Omnibus installations has been removed.
|
||||
|
||||
In 14.0 we removed [`domain_config_source`](https://docs.gitlab.com/ee/administration/pages/index.html#domain-source-configuration-before-140) which had been previously deprecated, and allowed users to specify disk storage. In 14.0 we added `use_legacy_storage` as a **temporary** flag to unblock upgrades, and allow us to debug issues with our users and it was deprecated and communicated for removal in 14.3.
|
||||
|
||||
## 14.2
|
||||
|
||||
### Max job log file size of 100 MB
|
||||
|
||||
GitLab values efficiency for all users in our wider community of contributors, so we're always working hard to make sure the application performs at a high level with a lovable UX.
|
||||
In GitLab 14.2, we have introduced a [job log file size limit](https://docs.gitlab.com/ee/administration/instance_limits.html#maximum-file-size-for-job-logs), set to 100 megabytes by default. Administrators of self-managed GitLab instances can customize this to any value. All jobs that exceed this limit are dropped and marked as failed, helping prevent performance impacts or over-use of resources. This ensures that everyone using GitLab has the best possible experience.
|
||||
|
||||
## 14.1
|
||||
|
||||
### Remove support for `prometheus.listen_address` and `prometheus.enable`
|
||||
|
||||
The support for `prometheus.listen_address` and `prometheus.enable` has been removed from `gitlab.yml`. Use `prometheus.enabled` and `prometheus.server_address` to set up Prometheus server that GitLab instance connects to. Refer to [our documentation](https://docs.gitlab.com/ee/install/installation.html#prometheus-server-setup) for details.
|
||||
|
||||
This only affects new installations from source where users might use the old configurations.
|
||||
|
||||
### Remove support for older browsers
|
||||
|
||||
In GitLab 14.1, we are cleaning up and [removing old code](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63994) that was specific for browsers that we no longer support. This has no impact on users when one of our [supported web browsers](https://docs.gitlab.com/ee/install/requirements.html#supported-web-browsers) is used.
|
||||
|
||||
Most notably, support for the following browsers has been removed:
|
||||
|
||||
- Apple Safari 13 and older.
|
||||
- Mozilla Firefox 68.
|
||||
- Pre-Chromium Microsoft Edge.
|
||||
|
||||
The minimum supported browser versions are:
|
||||
|
||||
- Apple Safari 13.1.
|
||||
- Mozilla Firefox 78.
|
||||
- Google Chrome 84.
|
||||
- Chromium 84.
|
||||
- Microsoft Edge 84.
|
||||
|
||||
## 14.0
|
||||
|
||||
### Auto Deploy CI template v1
|
||||
|
|
@ -671,62 +730,3 @@ Before updating GitLab, review the details carefully to determine if you need to
|
|||
changes to your code, settings, or workflow.
|
||||
|
||||
GitLab Runner was updated in GitLab 13.4 to internally stop passing the `trace` parameter to the `/api/jobs/:id` endpoint. GitLab 14.0 deprecates the `trace` parameter entirely for all other requests of this endpoint. Make sure your [GitLab Runner version matches your GitLab version](https://docs.gitlab.com/runner/#gitlab-runner-versions) to ensure consistent behavior.
|
||||
|
||||
## 14.1
|
||||
|
||||
### Remove support for `prometheus.listen_address` and `prometheus.enable`
|
||||
|
||||
The support for `prometheus.listen_address` and `prometheus.enable` has been removed from `gitlab.yml`. Use `prometheus.enabled` and `prometheus.server_address` to set up Prometheus server that GitLab instance connects to. Refer to [our documentation](https://docs.gitlab.com/ee/install/installation.html#prometheus-server-setup) for details.
|
||||
|
||||
This only affects new installations from source where users might use the old configurations.
|
||||
|
||||
### Remove support for older browsers
|
||||
|
||||
In GitLab 14.1, we are cleaning up and [removing old code](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63994) that was specific for browsers that we no longer support. This has no impact on users when one of our [supported web browsers](https://docs.gitlab.com/ee/install/requirements.html#supported-web-browsers) is used.
|
||||
|
||||
Most notably, support for the following browsers has been removed:
|
||||
|
||||
- Apple Safari 13 and older.
|
||||
- Mozilla Firefox 68.
|
||||
- Pre-Chromium Microsoft Edge.
|
||||
|
||||
The minimum supported browser versions are:
|
||||
|
||||
- Apple Safari 13.1.
|
||||
- Mozilla Firefox 78.
|
||||
- Google Chrome 84.
|
||||
- Chromium 84.
|
||||
- Microsoft Edge 84.
|
||||
|
||||
## 14.2
|
||||
|
||||
### Max job log file size of 100 MB
|
||||
|
||||
GitLab values efficiency for all users in our wider community of contributors, so we're always working hard to make sure the application performs at a high level with a lovable UX.
|
||||
In GitLab 14.2, we have introduced a [job log file size limit](https://docs.gitlab.com/ee/administration/instance_limits.html#maximum-file-size-for-job-logs), set to 100 megabytes by default. Administrators of self-managed GitLab instances can customize this to any value. All jobs that exceed this limit are dropped and marked as failed, helping prevent performance impacts or over-use of resources. This ensures that everyone using GitLab has the best possible experience.
|
||||
|
||||
## 14.3
|
||||
|
||||
### Introduced limit of 50 tags for jobs
|
||||
|
||||
GitLab values efficiency and is prioritizing reliability for [GitLab.com in FY22](https://about.gitlab.com/direction/#gitlab-hosted-first). In 14.3, GitLab CI/CD jobs must have less than 50 [tags](https://docs.gitlab.com/ee/ci/yaml/index.html#tags). If a pipeline contains a job with 50 or more tags, you will receive an error and the pipeline will not be created.
|
||||
|
||||
### List project pipelines API endpoint removes `name` support in 14.3
|
||||
|
||||
In GitLab 14.3, we will remove the ability to filter by `name` in the [list project pipelines API endpoint](https://docs.gitlab.com/ee/api/pipelines.html#list-project-pipelines) to improve performance. If you currently use this parameter with this endpoint, you must switch to `username`.
|
||||
|
||||
### Use of legacy storage setting
|
||||
|
||||
The support for [`gitlab_pages['use_legacy_storage']` setting](https://docs.gitlab.com/ee/administration/pages/index.html#domain-source-configuration-before-140) in Omnibus installations has been removed.
|
||||
|
||||
In 14.0 we removed [`domain_config_source`](https://docs.gitlab.com/ee/administration/pages/index.html#domain-source-configuration-before-140) which had been previously deprecated, and allowed users to specify disk storage. In 14.0 we added `use_legacy_storage` as a **temporary** flag to unblock upgrades, and allow us to debug issues with our users and it was deprecated and communicated for removal in 14.3.
|
||||
|
||||
## 14.6
|
||||
|
||||
### Limit the number of triggered pipeline to 25K in free tier
|
||||
|
||||
A large amount of triggered pipelines in a single project impacts the performance of GitLab.com. In GitLab 14.6, we are limiting the number of triggered pipelines in a single project on GitLab.com at any given moment to 25,000. This change applies to projects in the free tier only, Premium and Ultimate are not affected by this change.
|
||||
|
||||
### Release CLI distributed as a generic package
|
||||
|
||||
The [release-cli](https://gitlab.com/gitlab-org/release-cli) will be released as a [generic package](https://gitlab.com/gitlab-org/release-cli/-/packages) starting in GitLab 14.2. We will continue to deploy it as a binary to S3 until GitLab 14.5 and stop distributing it in S3 in GitLab 14.6.
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
|
|||
NOTE:
|
||||
In 14.4, Requirements was moved under **Issues**.
|
||||
|
||||
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2703) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.10.
|
||||
> - The ability to add and edit a requirement's long description [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/224622) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.5.
|
||||
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2703) in GitLab 12.10.
|
||||
> - The ability to add and edit a requirement's long description [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/224622) in GitLab 13.5.
|
||||
> - [Moved under Issues](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70748) in 14.4
|
||||
|
||||
With requirements, you can set criteria to check your products against. They can be based on users,
|
||||
|
|
@ -64,7 +64,7 @@ next to the requirement title.
|
|||
|
||||
## Edit a requirement
|
||||
|
||||
> The ability to mark a requirement as Satisfied [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/218607) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.5.
|
||||
> The ability to mark a requirement as Satisfied [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/218607) in GitLab 13.5.
|
||||
|
||||
You can edit a requirement from the requirements list page.
|
||||
|
||||
|
|
@ -108,7 +108,7 @@ As soon as a requirement is reopened, it no longer appears in the **Archived** t
|
|||
|
||||
## Search for a requirement
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/212543) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.1.
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/212543) in GitLab 13.1.
|
||||
> - Searching by status [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/224614) in GitLab 13.10.
|
||||
|
||||
You can search for a requirement from the requirements list page based on the following criteria:
|
||||
|
|
@ -131,8 +131,8 @@ You can also sort the requirements list by:
|
|||
|
||||
## Allow requirements to be satisfied from a CI job
|
||||
|
||||
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2859) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.1.
|
||||
> - [Added](https://gitlab.com/gitlab-org/gitlab/-/issues/215514) ability to specify individual requirements and their statuses in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.2.
|
||||
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2859) in GitLab 13.1.
|
||||
> - [Added](https://gitlab.com/gitlab-org/gitlab/-/issues/215514) ability to specify individual requirements and their statuses in GitLab 13.2.
|
||||
|
||||
GitLab supports [requirements test reports](../../../ci/yaml/artifacts_reports.md#artifactsreportsrequirements) now.
|
||||
You can add a job to your CI pipeline that, when triggered, marks all existing
|
||||
|
|
|
|||
|
|
@ -26948,7 +26948,7 @@ msgstr ""
|
|||
msgid "Pipelines|Project cache successfully reset."
|
||||
msgstr ""
|
||||
|
||||
msgid "Pipelines|Revoke"
|
||||
msgid "Pipelines|Revoke trigger"
|
||||
msgstr ""
|
||||
|
||||
msgid "Pipelines|Something went wrong while cleaning runners cache."
|
||||
|
|
@ -32040,6 +32040,9 @@ msgstr ""
|
|||
msgid "Search for a user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Search for an emoji"
|
||||
msgstr ""
|
||||
|
||||
msgid "Search for projects, issues, etc."
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
RSpec.describe Types::Ci::RunnerWebUrlEdge do
|
||||
specify { expect(described_class.graphql_name).to eq('RunnerWebUrlEdge') }
|
||||
|
||||
it 'contains URL attributes' do
|
||||
expected_fields = %w[edit_url web_url]
|
||||
|
||||
expect(described_class).to include_graphql_fields(*expected_fields)
|
||||
end
|
||||
end
|
||||
|
|
@ -196,39 +196,6 @@ RSpec.describe 'Query.runner(id)' do
|
|||
it_behaves_like 'runner details fetch', :inactive_instance_runner
|
||||
end
|
||||
|
||||
describe 'for runner inside group request' do
|
||||
let(:query) do
|
||||
%(
|
||||
query {
|
||||
group(fullPath: "#{group.full_path}") {
|
||||
runners {
|
||||
edges {
|
||||
webUrl
|
||||
node {
|
||||
id
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
end
|
||||
|
||||
it 'retrieves webUrl field with expected value' do
|
||||
post_graphql(query, current_user: user)
|
||||
|
||||
runner_data = graphql_data_at(:group, :runners, :edges)
|
||||
expect(runner_data).to match_array [
|
||||
a_hash_including(
|
||||
'webUrl' => "http://localhost/groups/#{group.full_path}/-/runners/#{active_group_runner.id}",
|
||||
'node' => {
|
||||
'id' => active_group_runner.to_global_id.to_s
|
||||
}
|
||||
)
|
||||
]
|
||||
end
|
||||
end
|
||||
|
||||
describe 'for group runner request' do
|
||||
let(:query) do
|
||||
%(
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
# frozen_string_literal: true
|
||||
require 'spec_helper'
|
||||
|
||||
RSpec.describe 'RunnerWebUrlEdge' do
|
||||
include GraphqlHelpers
|
||||
|
||||
describe 'inside a Query.group' do
|
||||
let_it_be(:group) { create(:group) }
|
||||
let_it_be(:group_runner) { create(:ci_runner, :group, groups: [group]) }
|
||||
|
||||
let(:edges_graphql_data) { graphql_data.dig('group', 'runners', 'edges') }
|
||||
|
||||
let(:query) do
|
||||
<<~GQL
|
||||
query($path: ID!) {
|
||||
group(fullPath: $path) {
|
||||
runners {
|
||||
edges {
|
||||
editUrl
|
||||
webUrl
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
GQL
|
||||
end
|
||||
|
||||
before do
|
||||
post_graphql(query, current_user: user, variables: { path: group.full_path })
|
||||
end
|
||||
|
||||
context 'with an authorized user' do
|
||||
let(:user) { create_default(:user, :admin) }
|
||||
|
||||
it_behaves_like 'a working graphql query'
|
||||
|
||||
it 'returns correct URLs' do
|
||||
expect(edges_graphql_data).to match_array [
|
||||
{
|
||||
'editUrl' => Gitlab::Routing.url_helpers.edit_group_runner_url(group, group_runner),
|
||||
'webUrl' => Gitlab::Routing.url_helpers.group_runner_url(group, group_runner)
|
||||
}
|
||||
]
|
||||
end
|
||||
end
|
||||
|
||||
context 'with an unauthorized user' do
|
||||
let(:user) { create(:user) }
|
||||
|
||||
it_behaves_like 'a working graphql query'
|
||||
|
||||
it 'returns no edges' do
|
||||
expect(edges_graphql_data).to be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -28,7 +28,7 @@ RSpec.describe Docs::DeprecationHandling do
|
|||
milestones = arguments[:milestones]
|
||||
entries = arguments[:entries]
|
||||
|
||||
expect(milestones).to eq(['14.2', '14.10'])
|
||||
expect(milestones).to eq(['14.10', '14.2'])
|
||||
expect(entries.map { |e| e['name'] }).to eq(['a.yml', 'b.yml', 'c.yml'])
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ module Docs
|
|||
entries = entries.sort_by { |d| d["name"] }
|
||||
|
||||
milestones = entries.map { |entry| entry[milestone_key_name] }.uniq
|
||||
milestones = VersionSorter.sort(milestones)
|
||||
milestones = VersionSorter.rsort(milestones)
|
||||
|
||||
load_template(template_path)
|
||||
.result_with_hash(entries: entries, milestones: milestones)
|
||||
|
|
|
|||
Loading…
Reference in New Issue