Merge branch 'main' into no-file-alert-1221

rubyforgood · Dec 17, 2024 · a30f35e · a30f35e
2 parents 53139ca + 557f806
commit a30f35e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 28 deletions.
diff --git a/app/controllers/organizations/adopter_fosterer/faq_controller.rb b/app/controllers/organizations/adopter_fosterer/faq_controller.rb
diff --git a/app/views/layouts/adopter_foster_dashboard.html.erb b/app/views/layouts/adopter_foster_dashboard.html.erb
@@ -85,11 +85,6 @@
                         <% end %>
                       </li>
                       <!-- Nav item -->
-                      <li class="nav-item">
-                        <%= active_link_to adopter_fosterer_faq_index_path, class: "nav-link" do %>
-                          <i class="fe fe-help-circle nav-icon"></i> FAQ
-                        <% end %>
-                      </li>
                       <% if Current.organization.external_form_url.present? %>
                         <li class="nav-item">
                         <%= active_link_to adopter_fosterer_external_form_index_path(dashboard: true), class: "nav-link" do %>

diff --git a/app/views/organizations/adopter_fosterer/faq/index.html.erb b/app/views/organizations/adopter_fosterer/faq/index.html.erb
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -59,8 +59,8 @@
   # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
 
   # Log to STDOUT with the current request id as a default log tag.
-  config.log_tags = [:request_id]
-  config.logger = ActiveSupport::TaggedLogging.logger($stdout)
+  # config.log_tags = [:request_id]
+  # config.logger = ActiveSupport::TaggedLogging.logger($stdout)
 
   # Change to "debug" to log everything (including potentially personally-identifiable information!)
   config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")

diff --git a/config/routes.rb b/config/routes.rb
@@ -94,7 +94,6 @@
 
     # Adopter and Fosterer Routes
     namespace :adopter_fosterer do
-      resources :faq, only: [:index]
       resources :donations, only: [:index]
       resources :dashboard, only: [:index]
       resources :likes, only: [:index, :create, :destroy]