Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-29 22:23:44 +0300
committerClement Ho <clemmakesapps@gmail.com>2018-06-29 22:23:44 +0300
commit436d17a096d94ec93e31e5d5bccb969fdad0baf1 (patch)
tree53166c2cc826c81ceda9cec824433f30d4ee820d
parent016707e4e78302375fbe51d883f4d41077d1a38c (diff)
parent8b6ff3e07e2f9aa8fdbfa37854c237e0af530860 (diff)
Merge branch '47865-changelog-for-style-updates' into 'master'
Update personal access token form styles See merge request gitlab-org/gitlab-ce!20275
-rw-r--r--app/views/doorkeeper/authorizations/new.html.haml2
-rw-r--r--changelogs/unreleased/47865-changelog-for-style-updates.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/doorkeeper/authorizations/new.html.haml b/app/views/doorkeeper/authorizations/new.html.haml
index 6d9c6b5572a..28cdc7607e0 100644
--- a/app/views/doorkeeper/authorizations/new.html.haml
+++ b/app/views/doorkeeper/authorizations/new.html.haml
@@ -35,7 +35,7 @@
- @pre_auth.scopes.each do |scope|
%li
%strong= t scope, scope: [:doorkeeper, :scopes]
- .scope-description= t scope, scope: [:doorkeeper, :scope_desc]
+ .text-secondary= t scope, scope: [:doorkeeper, :scope_desc]
.form-actions.text-right
= form_tag oauth_authorization_path, method: :delete, class: 'inline' do
= hidden_field_tag :client_id, @pre_auth.client.uid
diff --git a/changelogs/unreleased/47865-changelog-for-style-updates.yml b/changelogs/unreleased/47865-changelog-for-style-updates.yml
new file mode 100644
index 00000000000..2e4fbbda000
--- /dev/null
+++ b/changelogs/unreleased/47865-changelog-for-style-updates.yml
@@ -0,0 +1,5 @@
+---
+title: Minor style changes to personal access token form and scope checkboxes
+merge_request: 20052
+author:
+type: other