Make database_offline mode work

Fixes #3529

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 3609b253e31f0e0dedae452e69ab35be0a6aed4f..ed302715a9e57564cd1b4cc47906c327e72ba7c4 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -36,7 +36,7 @@
   </nav>
   <nav class='secondary'>
     <ul class='mx-1 px-0'>
   </nav>
   <nav class='secondary'>
     <ul class='mx-1 px-0'>

-      <% if can? :index, Issue %>
+      <% if Settings.status != "database_offline" && can?(:index, Issue) %>

         <li class="compact-hide nav-item <%= current_page_class(issues_path) %>">
           <%= link_to issues_path(:status => "open"), :class => "nav-link" do %>
             <%= t("layouts.issues") %>
         <li class="compact-hide nav-item <%= current_page_class(issues_path) %>">
           <%= link_to issues_path(:status => "open"), :class => "nav-link" do %>
             <%= t("layouts.issues") %>

diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index e8caa395fe52dee9dd476a8cf68762fe7534ba68..8dce1c8707fe149fa823e7432c6e8cf7f0c4890f 100644 (file)
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -49,7 +49,7 @@ Rails.application.reloader.to_prepare do
     #   end
     # end
 
     #   end
     # end
 

-    application_class "Oauth2Application"
+    application_class "Oauth2Application" unless Settings.status == "database_offline"

 
     # Enables polymorphic Resource Owner association for Access Tokens and Access Grants.
     # By default this option is disabled.
 
     # Enables polymorphic Resource Owner association for Access Tokens and Access Grants.
     # By default this option is disabled.