Merge branch '46817-new-application' into 'master'

Resolve "Admin area > New Application form"

Closes #46817

See merge request gitlab-org/gitlab-ce!19290
This commit is contained in:
Clement Ho 2018-05-31 19:53:04 +00:00
commit bddde7640e

View file

@ -1,13 +1,13 @@
= form_for [:admin, @application], url: @url, html: {role: 'form'} do |f|
= form_errors(application)
= content_tag :div, class: 'form-group' do
= content_tag :div, class: 'form-group row' do
= f.label :name, class: 'col-sm-2 col-form-label'
.col-sm-10
= f.text_field :name, class: 'form-control'
= doorkeeper_errors_for application, :name
= content_tag :div, class: 'form-group' do
= content_tag :div, class: 'form-group row' do
= f.label :redirect_uri, class: 'col-sm-2 col-form-label'
.col-sm-10
= f.text_area :redirect_uri, class: 'form-control'
@ -20,7 +20,7 @@
%code= Doorkeeper.configuration.native_redirect_uri
for local tests
= content_tag :div, class: 'form-group' do
= content_tag :div, class: 'form-group row' do
= f.label :trusted, class: 'col-sm-2 col-form-label'
.col-sm-10
= f.check_box :trusted