Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
ad7c2ae366
commit
c6b5500fab
13 changed files with 26 additions and 30 deletions
|
|
@ -16,6 +16,10 @@ tasks:
|
|||
# GitLab
|
||||
[[ -d /workspace/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
|
||||
mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
|
||||
# update gdk.yml
|
||||
gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++')
|
||||
gdk config set gitlab.rails.port 443
|
||||
gdk config set gitlab.rails.https.enabled true
|
||||
# reconfigure GDK
|
||||
echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
|
||||
gdk reconfigure
|
||||
|
|
|
|||
2
Gemfile
2
Gemfile
|
|
@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.4.0'
|
|||
gem 'pg', '~> 1.1'
|
||||
|
||||
gem 'rugged', '~> 1.1'
|
||||
gem 'grape-path-helpers', '~> 1.6.3'
|
||||
gem 'grape-path-helpers', '~> 1.7.0'
|
||||
|
||||
gem 'faraday', '~> 1.0'
|
||||
gem 'marginalia', '~> 1.10.0'
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ GEM
|
|||
grape-entity (0.9.0)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.3.2)
|
||||
grape-path-helpers (1.6.3)
|
||||
grape-path-helpers (1.7.0)
|
||||
activesupport
|
||||
grape (~> 1.3)
|
||||
rake (> 12)
|
||||
|
|
@ -1493,7 +1493,7 @@ DEPENDENCIES
|
|||
gpgme (~> 2.0.19)
|
||||
grape (~> 1.5.2)
|
||||
grape-entity (~> 0.9.0)
|
||||
grape-path-helpers (~> 1.6.3)
|
||||
grape-path-helpers (~> 1.7.0)
|
||||
grape_logging (~> 1.7)
|
||||
graphiql-rails (~> 1.4.10)
|
||||
graphlient (~> 0.4.0)
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ values obtained during the LDAP client configuration earlier:
|
|||
password: 'd6V5H8nhMUW9AuDP25abXeLd'
|
||||
encryption: 'simple_tls'
|
||||
verify_certificates: true
|
||||
retry_empty_result_with_codes: [80]
|
||||
|
||||
tls_options:
|
||||
cert: |
|
||||
|
|
@ -159,6 +160,7 @@ values obtained during the LDAP client configuration earlier:
|
|||
password: 'd6V5H8nhMUW9AuDP25abXeLd'
|
||||
encryption: 'simple_tls'
|
||||
verify_certificates: true
|
||||
retry_empty_result_with_codes: [80]
|
||||
|
||||
tls_options:
|
||||
cert: |
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ production:
|
|||
| `base` | Base where we can search for users. | **{check-circle}** Yes | `'ou=people,dc=gitlab,dc=example'` or `'DC=mydomain,DC=com'` |
|
||||
| `user_filter` | Filter LDAP users. Format: [RFC 4515](https://tools.ietf.org/search/rfc4515) Note: GitLab does not support `omniauth-ldap`'s custom filter syntax. | **{dotted-circle}** No | For examples, read [Examples of user filters](#examples-of-user-filters). |
|
||||
| `lowercase_usernames` | If enabled, GitLab converts the name to lower case. | **{dotted-circle}** No | boolean |
|
||||
| `retry_empty_result_with_codes` | An array of LDAP query response code that will attempt to retrying the operation if the result/content is empty. | **{dotted-circle}** No | `[80]` |
|
||||
| `retry_empty_result_with_codes` | An array of LDAP query response code that will attempt to retry the operation if the result/content is empty. For Google Secure LDAP, set this value to `[80]`. | **{dotted-circle}** No | `[80]` |
|
||||
|
||||
#### Examples of user filters
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,3 @@ GitLab community members and their privileges/responsibilities.
|
|||
| Contributor | Can make contributions to all GitLab public projects | Have a GitLab.com account |
|
||||
|
||||
[List of current reviewers/maintainers](https://about.gitlab.com/handbook/engineering/projects/#gitlab-ce).
|
||||
|
||||
---
|
||||
|
||||
[Return to Contributing documentation](index.md)
|
||||
|
|
|
|||
|
|
@ -36,7 +36,3 @@ In order to complete a product discovery issue in a release, you must complete t
|
|||
1. Modify the issue description in the product discovery issue to contain the final design. If it makes sense, the original information indicating the need for the design can be moved to a lower "Original Information" section.
|
||||
1. Copy the design to the description of the delivery issue for which the product discovery issue was created. Do not simply refer to the product discovery issue as a separate source of truth.
|
||||
1. In some cases, a product discovery issue also identifies future enhancements that will not go into the issue that originated the product discovery issue. For these items, create new issues containing the designs to ensure they are not lost. Put the issues in the backlog if they are agreed upon as good ideas. Otherwise leave them for triage.
|
||||
|
||||
---
|
||||
|
||||
[Return to Contributing documentation](index.md)
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ below will make it easy to manage this, without unnecessary overhead.
|
|||
1. If you don't agree with a set weight, discuss with other developers until
|
||||
consensus is reached about the weight
|
||||
1. Issue weights are an abstract measurement of complexity of the issue. Do not
|
||||
relate issue weight directly to time. This is called [anchoring](https://en.wikipedia.org/wiki/Anchoring)
|
||||
relate issue weight directly to time. This is called [anchoring](https://en.wikipedia.org/wiki/Anchoring_(cognitive_bias))
|
||||
and something you want to avoid.
|
||||
1. Something that has a weight of 1 (or no weight) is really small and simple.
|
||||
Something that is 9 is rewriting a large fundamental part of GitLab,
|
||||
|
|
@ -476,7 +476,3 @@ should be of the same quality as those created
|
|||
[in the usual manner](#technical-and-ux-debt) - in particular, the issue title
|
||||
**must not** begin with `Follow-up`! The creating maintainer should also expect
|
||||
to be involved in some capacity when work begins on the follow-up issue.
|
||||
|
||||
---
|
||||
|
||||
[Return to Contributing documentation](index.md)
|
||||
|
|
|
|||
|
|
@ -242,7 +242,3 @@ See the dedicated [Python Development Guidelines](../python_guide/index.md).
|
|||
## Misc
|
||||
|
||||
Code should be written in [US English](https://en.wikipedia.org/wiki/American_English).
|
||||
|
||||
---
|
||||
|
||||
[Return to Contributing documentation](index.md)
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ may not be able to check out the wiki locally afterward.
|
|||
|
||||
## Edit a wiki page
|
||||
|
||||
You need the [Developer role](../../permissions.md) or higher to edit a wiki page:
|
||||
You need at least the [Developer role](../../permissions.md) to edit a wiki page:
|
||||
|
||||
1. Go to your project or group and select **Wiki**.
|
||||
1. Go to the page you want to edit.
|
||||
|
|
@ -138,7 +138,7 @@ For an example, read [Table of contents](../../markdown.md#table-of-contents).
|
|||
|
||||
## Delete a wiki page
|
||||
|
||||
You need the [Maintainer role](../../permissions.md) or higher to delete a wiki page:
|
||||
You need at least the [Maintainer role](../../permissions.md) to delete a wiki page:
|
||||
|
||||
1. Go to your project or group and select **Wiki**.
|
||||
1. Go to the page you want to delete.
|
||||
|
|
@ -148,7 +148,7 @@ You need the [Maintainer role](../../permissions.md) or higher to delete a wiki
|
|||
|
||||
## Move a wiki page
|
||||
|
||||
You need the [Developer role](../../permissions.md) or higher to move a wiki page:
|
||||
You need at least the [Developer role](../../permissions.md) to move a wiki page:
|
||||
|
||||
1. Go to your project or group and select **Wiki**.
|
||||
1. Go to the page you want to move.
|
||||
|
|
@ -203,7 +203,7 @@ Commits to wikis are not counted in [repository analytics](../../analytics/repos
|
|||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23109) in GitLab 13.8, the sidebar can be customized by selecting the **Edit sidebar** button.
|
||||
|
||||
You need Developer [permissions](../../permissions.md) or higher to customize the wiki
|
||||
You need at least the [Developer role](../../permissions.md) to customize the wiki
|
||||
navigation sidebar. This process creates a wiki page named `_sidebar` which fully
|
||||
replaces the default sidebar navigation:
|
||||
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@
|
|||
"codesandbox-api": "0.0.23",
|
||||
"compression-webpack-plugin": "^5.0.2",
|
||||
"copy-webpack-plugin": "^6.4.1",
|
||||
"core-js": "^3.16.3",
|
||||
"core-js": "^3.16.4",
|
||||
"cron-validator": "^1.1.1",
|
||||
"cropper": "^2.3.0",
|
||||
"css-loader": "^2.1.1",
|
||||
|
|
|
|||
|
|
@ -21,6 +21,12 @@ RSpec.describe ProjectCiCdSetting do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#job_token_scope_enabled' do
|
||||
it 'is true by default' do
|
||||
expect(described_class.new.job_token_scope_enabled).to be_truthy
|
||||
end
|
||||
end
|
||||
|
||||
describe '#default_git_depth' do
|
||||
let(:default_value) { described_class::DEFAULT_GIT_DEPTH }
|
||||
|
||||
|
|
|
|||
|
|
@ -3898,10 +3898,10 @@ core-js-pure@^3.0.0:
|
|||
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
|
||||
integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
|
||||
|
||||
core-js@^3.1.3, core-js@^3.16.3:
|
||||
version "3.16.3"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.3.tgz#1f2d43c51a9ed014cc6c83440af14697ae4b75f2"
|
||||
integrity sha512-lM3GftxzHNtPNUJg0v4pC2RC6puwMd6VZA7vXUczi+SKmCWSf4JwO89VJGMqbzmB7jlK7B5hr3S64PqwFL49cA==
|
||||
core-js@^3.1.3, core-js@^3.16.4:
|
||||
version "3.16.4"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.4.tgz#0fb1029a554fc2688c0963d7c900e188188a78e0"
|
||||
integrity sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==
|
||||
|
||||
core-js@~2.3.0:
|
||||
version "2.3.0"
|
||||
|
|
|
|||
Loading…
Reference in a new issue