Merge branch 'release/11.0' into dev

4 years ago · 738b27a193
parent f5abb1f61c 7b36e13649
commit 738b27a193
3 changed files with 5 additions and 2 deletions
--- a/app/controllers/settings/api_controller.rb
+++ b/app/controllers/settings/api_controller.rb
@ -27,7 +27,7 @@
 # See docs/COPYRIGHT.rdoc for more details.
 #++

-class Settings::ApiController < SettingsController
+class Settings::APIController < SettingsController
  include AdminSettingsUpdater

  menu_item :settings_api
--- a/app/views/layouts/only_logo.html.erb
+++ b/app/views/layouts/only_logo.html.erb
@ -37,6 +37,8 @@ See docs/COPYRIGHT.rdoc for more details.
  <%= output_title_and_meta_tags %>
  <%= csrf_meta_tags %>
  <%= render 'common/favicons' %>
+  <%# Include CLI assets (development) or prod build assets %>
+  <%= include_frontend_assets %>
 </head>
 <body>
  <div id="wrapper">
--- a/config/initializers/zeitwerk.rb
+++ b/config/initializers/zeitwerk.rb
@ -57,7 +57,8 @@ OpenProject::Inflector.inflection(
  'pop3' => 'POP3',
  'cors' => 'CORS',
  'openid_connect' => 'OpenIDConnect',
-  'pdf_export' => 'PDFExport'
+  'pdf_export' => 'PDFExport',
+  'api_controller' => 'APIController'
 )

 Rails.autoloaders.each do |autoloader|