Merge branch '7-7-rc4' into '7-7-stable'

Changes for 7.7.0.rc4

See merge request !1409

2 files changed, 3 insertions, 1 deletions

diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 536c849421e..23d9852725b 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -40,7 +40,7 @@ Doorkeeper.configure do
   # Optional parameter :confirmation => true (default false) if you want to enforce ownership of
   # a registered application
   # Note: you must also run the rails g doorkeeper:application_owner generator to provide the necessary support
-  enable_application_owner :confirmation => true
+  enable_application_owner :confirmation => false
 
   # Define access token scopes for your provider
   # For more information go to
diff --git a/config/routes.rb b/config/routes.rb
index 245d6185639..3f561309adb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -97,6 +97,8 @@ Gitlab::Application.routes.draw do
       end
     end
 
+    resources :applications
+
     resources :groups, constraints: { id: /[^\/]+/ } do
       member do
         put :project_teams_update