diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 09:08:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 09:08:20 +0300 |
commit | 47a2a65f346719a0b4441a28a7adcbe747173f30 (patch) | |
tree | b1e93c17bbd939c4cfe574615b5b94e090e4f5aa | |
parent | 76784ebd4ac1aa8469c8ea42a5086debeb3102bb (diff) |
Add latest changes from gitlab-org/gitlab@master
5 files changed, 12 insertions, 6 deletions
diff --git a/changelogs/unreleased/feature-bump-cluster-applications-to-0-16-0.yml b/changelogs/unreleased/feature-bump-cluster-applications-to-0-16-0.yml new file mode 100644 index 00000000000..f548d243a05 --- /dev/null +++ b/changelogs/unreleased/feature-bump-cluster-applications-to-0-16-0.yml @@ -0,0 +1,5 @@ +--- +title: Adds PostHog as a CI/CD Managed Application +merge_request: 32856 +author: +type: added diff --git a/doc/administration/operations/moving_repositories.md b/doc/administration/operations/moving_repositories.md index 11cd3fa7b02..960005fe25d 100644 --- a/doc/administration/operations/moving_repositories.md +++ b/doc/administration/operations/moving_repositories.md @@ -85,8 +85,8 @@ not included in GitLab so you need to install it yourself with apt or yum. Also note that the GitLab scripts we used below were added in GitLab 8.1. -** This process does not clean up repositories at the target location that no -longer exist at the source. ** If you start using your GitLab instance with +**This process does not clean up repositories at the target location that no +longer exist at the source.** If you start using your GitLab instance with `/mnt/gitlab/repositories`, you need to run `gitlab-rake gitlab:cleanup:repos` after switching to the new repository storage directory. diff --git a/doc/user/packages/nuget_repository/index.md b/doc/user/packages/nuget_repository/index.md index 488cad66d55..6ada68dcceb 100644 --- a/doc/user/packages/nuget_repository/index.md +++ b/doc/user/packages/nuget_repository/index.md @@ -101,7 +101,7 @@ Where: For example: ```shell -nuget source Add -Name "GitLab" -Source "https//gitlab.example/api/v4/projects/10/packages/nuget/index.json" -UserName carol -Password 12345678asdf +nuget source Add -Name "GitLab" -Source "https://gitlab.example/api/v4/projects/10/packages/nuget/index.json" -UserName carol -Password 12345678asdf ``` ### Add NuGet Repository source with Visual Studio diff --git a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml index 54a29b04d39..e7330a3dfb7 100644 --- a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml @@ -1,6 +1,6 @@ apply: stage: deploy - image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.15.0" + image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.16.0" environment: name: production variables: @@ -19,6 +19,7 @@ apply: CROSSPLANE_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/crossplane/values.yaml FLUENTD_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/fluentd/values.yaml KNATIVE_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/knative/values.yaml + POSTHOG_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/posthog/values.yaml script: - gitlab-managed-apps /usr/local/share/gitlab-managed-apps/helmfile.yaml only: diff --git a/spec/lib/gitlab/reference_extractor_spec.rb b/spec/lib/gitlab/reference_extractor_spec.rb index 8ea591c6f74..a29282360f2 100644 --- a/spec/lib/gitlab/reference_extractor_spec.rb +++ b/spec/lib/gitlab/reference_extractor_spec.rb @@ -204,7 +204,7 @@ describe Gitlab::ReferenceExtractor do issue] end - it 'returns only Jira issues if the internal one does not exists' do + it 'returns only Jira issues if the internal one does not exist' do subject.analyze("JIRA-123 and FOOBAR-4567 and ##{non_existing_record_iid}") expect(subject.issues).to eq [ExternalIssue.new('JIRA-123', project), ExternalIssue.new('FOOBAR-4567', project)] @@ -236,7 +236,7 @@ describe Gitlab::ReferenceExtractor do expect(subject.issues).to eq([issue]) end - it 'does not return any issue if the internal one does not exists' do + it 'does not return any issue if the internal one does not exist' do subject.analyze("JIRA-123 and FOOBAR-4567 and #999") expect(subject.issues).to be_empty end |