Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
3683fb837c
commit
d49d44c810
|
@ -1 +1 @@
|
||||||
13.12.0
|
13.13.0
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Update GitLab Shell to v13.13.0
|
||||||
|
merge_request: 47875
|
||||||
|
author:
|
||||||
|
type: other
|
|
@ -13,7 +13,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
|
||||||
> - It's enabled on GitLab.com.
|
> - It's enabled on GitLab.com.
|
||||||
> - It's able to be enabled or disabled per-group.
|
> - It's able to be enabled or disabled per-group.
|
||||||
> - It's recommended for production use.
|
> - It's recommended for production use.
|
||||||
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#disable-iterations). **(CORE ONLY)**
|
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#disable-iterations). **(STARTER ONLY)**
|
||||||
|
|
||||||
Iterations are a way to track issues over a period of time. This allows teams
|
Iterations are a way to track issues over a period of time. This allows teams
|
||||||
to track velocity and volatility metrics. Iterations can be used with [milestones](../../project/milestones/index.md)
|
to track velocity and volatility metrics. Iterations can be used with [milestones](../../project/milestones/index.md)
|
||||||
|
@ -73,6 +73,19 @@ An iteration report displays a list of all the issues assigned to an iteration a
|
||||||
|
|
||||||
To view an iteration report, go to the iterations list page and click an iteration's title.
|
To view an iteration report, go to the iterations list page and click an iteration's title.
|
||||||
|
|
||||||
|
### Iteration burndown and burnup charts **(STARTER ONLY)**
|
||||||
|
|
||||||
|
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/222750) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.5.
|
||||||
|
> - It was deployed behind a feature flag, disabled by default.
|
||||||
|
> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45492) on GitLab 13.6.
|
||||||
|
> - It's enabled on GitLab.com.
|
||||||
|
> - It's able to be enabled or disabled per-group.
|
||||||
|
> - It's recommended for production use.
|
||||||
|
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#disable-iteration-charts). **(STARTER ONLY)**
|
||||||
|
|
||||||
|
The iteration report includes [burndown and burnup charts](../../project/milestones/burndown_and_burnup_charts.md),
|
||||||
|
similar to how they appear when viewing a [milestone](../../project/milestones/index.md)
|
||||||
|
|
||||||
## Disable Iterations **(STARTER ONLY)**
|
## Disable Iterations **(STARTER ONLY)**
|
||||||
|
|
||||||
GitLab Iterations feature is deployed with a feature flag that is **enabled by default**.
|
GitLab Iterations feature is deployed with a feature flag that is **enabled by default**.
|
||||||
|
@ -97,6 +110,30 @@ Feature.disable(:group_iterations)
|
||||||
Feature.disable(:group_iterations, Group.find(<group ID>))
|
Feature.disable(:group_iterations, Group.find(<group ID>))
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Disable iteration charts **(STARTER ONLY)**
|
||||||
|
|
||||||
|
GitLab iteration charts feature is deployed with a feature flag that is **enabled by default**.
|
||||||
|
[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
|
||||||
|
can disable it for your instance. `:iteration_charts` can be enabled or disabled per-group.
|
||||||
|
|
||||||
|
To enable it:
|
||||||
|
|
||||||
|
```ruby
|
||||||
|
# Instance-wide
|
||||||
|
Feature.enable(:iteration_charts)
|
||||||
|
# or by group
|
||||||
|
Feature.enable(:iteration_charts, Group.find(<group ID>))
|
||||||
|
```
|
||||||
|
|
||||||
|
To disable it:
|
||||||
|
|
||||||
|
```ruby
|
||||||
|
# Instance-wide
|
||||||
|
Feature.disable(:iteration_charts)
|
||||||
|
# or by group
|
||||||
|
Feature.disable(:iteration_charts, Group.find(<group ID>))
|
||||||
|
```
|
||||||
|
|
||||||
<!-- ## Troubleshooting
|
<!-- ## Troubleshooting
|
||||||
|
|
||||||
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
|
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
|
||||||
|
|
|
@ -96,9 +96,10 @@ following steps work only if GitLab is configured for HTTPS:
|
||||||
Create a [personal access token](../../profile/personal_access_tokens.md) with
|
Create a [personal access token](../../profile/personal_access_tokens.md) with
|
||||||
the scope set to `api` or `read_api`.
|
the scope set to `api` or `read_api`.
|
||||||
|
|
||||||
Add it to [`~/.netrc`](https://ec.haxx.se/usingcurl/usingcurl-netrc):
|
Open your [`~/.netrc`](https://ec.haxx.se/usingcurl/usingcurl-netrc) file
|
||||||
|
and add the following text. Replace the variables in `< >` with your values.
|
||||||
|
|
||||||
```shell
|
```plaintext
|
||||||
machine <url> login <username> password <token>
|
machine <url> login <username> password <token>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,10 @@ module Gitlab
|
||||||
@error_message_object ||= ::Gitlab::RepositorySizeErrorMessage.new(self)
|
@error_message_object ||= ::Gitlab::RepositorySizeErrorMessage.new(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def additional_repo_storage_available?
|
||||||
|
false
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
attr_reader :namespace
|
attr_reader :namespace
|
||||||
|
|
|
@ -4,7 +4,7 @@ module Gitlab
|
||||||
class RepositorySizeErrorMessage
|
class RepositorySizeErrorMessage
|
||||||
include ActiveSupport::NumberHelper
|
include ActiveSupport::NumberHelper
|
||||||
|
|
||||||
delegate :current_size, :limit, :exceeded_size, to: :@checker
|
delegate :current_size, :limit, :exceeded_size, :additional_repo_storage_available?, to: :@checker
|
||||||
|
|
||||||
# @param checher [RepositorySizeChecker]
|
# @param checher [RepositorySizeChecker]
|
||||||
def initialize(checker)
|
def initialize(checker)
|
||||||
|
@ -24,7 +24,11 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def new_changes_error
|
def new_changes_error
|
||||||
"Your push to this repository would cause it to exceed the size limit of #{formatted(limit)} so it has been rejected. #{more_info_message}"
|
if additional_repo_storage_available?
|
||||||
|
"Your push to this repository has been rejected because it would exceed storage limits. Please contact your GitLab administrator for more information."
|
||||||
|
else
|
||||||
|
"Your push to this repository would cause it to exceed the size limit of #{formatted(limit)} so it has been rejected. #{more_info_message}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def more_info_message
|
def more_info_message
|
||||||
|
|
|
@ -17900,6 +17900,9 @@ msgid_plural "NamespaceStorageSize|You have reached the free storage limit of %{
|
||||||
msgstr[0] ""
|
msgstr[0] ""
|
||||||
msgstr[1] ""
|
msgstr[1] ""
|
||||||
|
|
||||||
|
msgid "NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To learn more about reducing storage capacity please visit our docs."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To reduce storage capacity, delete unused repositories, artifacts, wikis, issues, and pipelines."
|
msgid "NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To reduce storage capacity, delete unused repositories, artifacts, wikis, issues, and pipelines."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
@ -53,4 +53,10 @@ RSpec.describe Gitlab::RepositorySizeChecker do
|
||||||
describe '#exceeded_size' do
|
describe '#exceeded_size' do
|
||||||
include_examples 'checker size exceeded'
|
include_examples 'checker size exceeded'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe '#additional_repo_storage_available?' do
|
||||||
|
it 'returns false' do
|
||||||
|
expect(subject.additional_repo_storage_available?).to eq(false)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -53,8 +53,18 @@ RSpec.describe Gitlab::RepositorySizeErrorMessage do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#new_changes_error' do
|
describe '#new_changes_error' do
|
||||||
it 'returns the correct message' do
|
context 'when additional repo storage is available' do
|
||||||
expect(message.new_changes_error).to eq("Your push to this repository would cause it to exceed the size limit of 10 MB so it has been rejected. #{message.more_info_message}")
|
it 'returns the correct message' do
|
||||||
|
allow(checker).to receive(:additional_repo_storage_available?).and_return(true)
|
||||||
|
|
||||||
|
expect(message.new_changes_error).to eq('Your push to this repository has been rejected because it would exceed storage limits. Please contact your GitLab administrator for more information.')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when no additional repo storage is available' do
|
||||||
|
it 'returns the correct message' do
|
||||||
|
expect(message.new_changes_error).to eq("Your push to this repository would cause it to exceed the size limit of 10 MB so it has been rejected. #{message.more_info_message}")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue