Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'

 Conflicts:
   app/models/ci/pipeline.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index b5d79e1da13..7f14cddebd8 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -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