Add latest changes from gitlab-org/gitlab@master

9 files changed, 78 insertions, 8 deletions

diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 6665a53d3b5..0b704f2a43a 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-13.12.0
+13.13.0
diff --git a/changelogs/unreleased/ashmckenzie-gitlab-shell-release-13-13-0.yml b/changelogs/unreleased/ashmckenzie-gitlab-shell-release-13-13-0.yml
new file mode 100644
index 00000000000..17985531638
--- /dev/null
+++ b/changelogs/unreleased/ashmckenzie-gitlab-shell-release-13-13-0.yml
@@ -0,0 +1,5 @@
+---
+title: Update GitLab Shell to v13.13.0
+merge_request: 47875
+author:
+type: other
diff --git a/doc/user/group/iterations/index.md b/doc/user/group/iterations/index.md
index bd160f2ace8..df2b37ec0ad 100644
--- a/doc/user/group/iterations/index.md
+++ b/doc/user/group/iterations/index.md
@@ -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 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-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
 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.
 
+### 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)**
 
 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>))
 ```
 
+## 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
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues
diff --git a/doc/user/packages/go_proxy/index.md b/doc/user/packages/go_proxy/index.md
index b642a5387c9..81edc3afcfd 100644
--- a/doc/user/packages/go_proxy/index.md
+++ b/doc/user/packages/go_proxy/index.md
@@ -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
 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>
 ```
 
diff --git a/lib/gitlab/repository_size_checker.rb b/lib/gitlab/repository_size_checker.rb
index 64d58c15208..0ed31176dd8 100644
--- a/lib/gitlab/repository_size_checker.rb
+++ b/lib/gitlab/repository_size_checker.rb
@@ -46,6 +46,10 @@ module Gitlab
       @error_message_object ||= ::Gitlab::RepositorySizeErrorMessage.new(self)
     end
 
+    def additional_repo_storage_available?
+      false
+    end
+
     private
 
     attr_reader :namespace
diff --git a/lib/gitlab/repository_size_error_message.rb b/lib/gitlab/repository_size_error_message.rb
index 556190453de..8da840779c9 100644
--- a/lib/gitlab/repository_size_error_message.rb
+++ b/lib/gitlab/repository_size_error_message.rb
@@ -4,7 +4,7 @@ module Gitlab
   class RepositorySizeErrorMessage
     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]
     def initialize(checker)
@@ -24,7 +24,11 @@ module Gitlab
     end
 
     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
 
     def more_info_message
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 983539bffd4..cb068850413 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -17900,6 +17900,9 @@ msgid_plural "NamespaceStorageSize|You have reached the free storage limit of %{
 msgstr[0] ""
 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."
 msgstr ""
 
diff --git a/spec/lib/gitlab/repository_size_checker_spec.rb b/spec/lib/gitlab/repository_size_checker_spec.rb
index bd030d81d97..20c08da6c54 100644
--- a/spec/lib/gitlab/repository_size_checker_spec.rb
+++ b/spec/lib/gitlab/repository_size_checker_spec.rb
@@ -53,4 +53,10 @@ RSpec.describe Gitlab::RepositorySizeChecker do
   describe '#exceeded_size' do
     include_examples 'checker size exceeded'
   end
+
+  describe '#additional_repo_storage_available?' do
+    it 'returns false' do
+      expect(subject.additional_repo_storage_available?).to eq(false)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/repository_size_error_message_spec.rb b/spec/lib/gitlab/repository_size_error_message_spec.rb
index 53b5ed5518f..78504d201d4 100644
--- a/spec/lib/gitlab/repository_size_error_message_spec.rb
+++ b/spec/lib/gitlab/repository_size_error_message_spec.rb
@@ -53,8 +53,18 @@ RSpec.describe Gitlab::RepositorySizeErrorMessage do
     end
 
     describe '#new_changes_error' 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}")
+      context 'when additional repo storage is available' do
+        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