diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-18 13:05:30 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-18 13:05:30 +0000 |
| commit | 4736e0519b0d8c66ab35fd636f5f81089822ba7a (patch) | |
| tree | c8cdec46229fa50905991d0c4aab3f6721f2a9d3 | |
| parent | d81189029d072b41434992efb991152842639009 (diff) | |
| parent | 7a5b5f1e6c682db28ed818499c2577c053f7266d (diff) | |
| download | gitlab-ce-4736e0519b0d8c66ab35fd636f5f81089822ba7a.tar.gz | |
Merge branch 'deploy_tokens_view_improvement' into 'master'
Update _form.html.haml (deploy tokens) to improve display of scopes
See merge request gitlab-org/gitlab-ce!20578
| -rw-r--r-- | app/views/projects/deploy_tokens/_form.html.haml | 16 | ||||
| -rw-r--r-- | changelogs/unreleased/ravlen-deploy-tokens-display-update.yml | 5 |
2 files changed, 13 insertions, 8 deletions
diff --git a/app/views/projects/deploy_tokens/_form.html.haml b/app/views/projects/deploy_tokens/_form.html.haml index f8db30df7b4..329b9e7e562 100644 --- a/app/views/projects/deploy_tokens/_form.html.haml +++ b/app/views/projects/deploy_tokens/_form.html.haml @@ -14,16 +14,16 @@ .form-group = f.label :scopes, class: 'label-light' - %fieldset - = f.check_box :read_repository - = label_tag ("deploy_token_read_repository"), 'read_repository' - %span= s_('DeployTokens|Allows read-only access to the repository') + %fieldset.form-group.form-check + = f.check_box :read_repository, class: 'form-check-input' + = label_tag ("deploy_token_read_repository"), 'read_repository', class: 'label-light form-check-label' + .text-secondary= s_('DeployTokens|Allows read-only access to the repository') - if container_registry_enabled?(project) - %fieldset - = f.check_box :read_registry - = label_tag ("deploy_token_read_registry"), 'read_registry' - %span= s_('DeployTokens|Allows read-only access to the registry images') + %fieldset.form-group.form-check + = f.check_box :read_registry, class: 'form-check-input' + = label_tag ("deploy_token_read_registry"), 'read_registry', class: 'label-light form-check-label' + .text-secondary= s_('DeployTokens|Allows read-only access to the registry images') .prepend-top-default = f.submit s_('DeployTokens|Create deploy token'), class: 'btn btn-success' diff --git a/changelogs/unreleased/ravlen-deploy-tokens-display-update.yml b/changelogs/unreleased/ravlen-deploy-tokens-display-update.yml new file mode 100644 index 00000000000..fd5a6521882 --- /dev/null +++ b/changelogs/unreleased/ravlen-deploy-tokens-display-update.yml @@ -0,0 +1,5 @@ +--- +title: "Cleans up display of Deploy Tokens to match Personal Access Tokens" +merge_request: 20578 +author: Marcel Amirault +type: added
\ No newline at end of file |