diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-06 15:07:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-06 15:07:34 +0300 |
| commit | 4958d96e262f6b31b2850123e4949536555b2d29 (patch) | |
| tree | 28fe9a1fed009a569806c705e4810a33979cbd6a /config | |
| parent | 95de7177f2d5844e4aa399fea9a59d4ba6b4b1f1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/synchronize_fork.yml | 8 | ||||
| -rw-r--r-- | config/locales/doorkeeper.en.yml | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/config/feature_flags/development/synchronize_fork.yml b/config/feature_flags/development/synchronize_fork.yml deleted file mode 100644 index 207739cf34e..00000000000 --- a/config/feature_flags/development/synchronize_fork.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: synchronize_fork -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114299 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/395793 -milestone: '15.10' -type: development -group: group::source code -default_enabled: true diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index 2cea6dae6c5..63bbab67039 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -75,6 +75,7 @@ en: sudo: Perform API actions as any user in the system profile: Allows read-only access to the user's personal information using OpenID Connect email: Allows read-only access to the user's primary email address using OpenID Connect + admin_mode: Admin Mode is a functionality designed to limit the access level of administrator's personal access tokens. scope_desc: api: Grants complete read/write access to the API, including all groups and projects, the container registry, and the package registry. |