diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-06-26 13:54:23 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-06-26 13:54:23 +0000 |
commit | 0fbbbc5f2255b8570123cd8174f623a3ba0149ca (patch) | |
tree | f6ed557d84ca46000e9be5c656bead2e677a1401 | |
parent | 6c552644e314b503a8f82de1ac84d34ca9622203 (diff) | |
parent | 95a111c71148c1dad398084f9e24e9a8627b5d4f (diff) | |
download | gitlab-ce-0fbbbc5f2255b8570123cd8174f623a3ba0149ca.tar.gz |
Merge branch 'improve-scope-description-layout' into 'master'
Update _scopes_form.html.haml to remove duplicate information
See merge request gitlab-org/gitlab-ce!19727
-rw-r--r-- | app/views/shared/tokens/_scopes_form.html.haml | 1 | ||||
-rw-r--r-- | config/locales/doorkeeper.en.yml | 16 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/views/shared/tokens/_scopes_form.html.haml b/app/views/shared/tokens/_scopes_form.html.haml index 2d0bb722189..e5c82962f82 100644 --- a/app/views/shared/tokens/_scopes_form.html.haml +++ b/app/views/shared/tokens/_scopes_form.html.haml @@ -6,5 +6,4 @@ %fieldset = check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}" = label_tag ("#{prefix}_scopes_#{scope}"), scope, class: "label-light" - %span= t(scope, scope: [:doorkeeper, :scopes]) .scope-description= t scope, scope: [:doorkeeper, :scope_desc] diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index 889111282ef..9f451046462 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -60,17 +60,23 @@ en: scopes: api: Access the authenticated user's API read_user: Read the authenticated user's personal information + read_repository: Allows read-access to the repository + read_registry: Grants permission to read container registry images openid: Authenticate using OpenID Connect - sudo: Perform API actions as any user in the system (if the authenticated user is an admin) + sudo: Perform API actions as any user in the system scope_desc: api: - Full access to GitLab as the user, including read/write on all their groups and projects + Grants complete read/write access to the API, including all groups and projects. read_user: - Read-only access to the user's profile information, like username, public email and full name + Grants read-only access to the authenticated user's profile through the /user API endpoint, which includes username, public email, and full name. Also grants access to read-only API endpoints under /users. + read_repository: + Grants read-only access to repositories on private projects using Git-over-HTTP (not using the API). + read_registry: + Grants read-only access to container registry images on private projects. openid: - The ability to authenticate using GitLab, and read-only access to the user's profile information and group memberships + Grants permission to authenticate with GitLab using OpenID Connect. Also gives read-only access to the user's profile and group memberships. sudo: - Access to the Sudo feature, to perform API actions as any user in the system (only available for admins) + Grants permission to perform API actions as any user in the system, when authenticated as an admin user. flash: applications: create: |