stay in application layout. include submenu in all pages

2022-12-13 19:16:11 +02:00
parent e6effde4ff
commit fe26829194
20 changed files with 116 additions and 108 deletions
--- a/app/controllers/merged/application_controller.rb
+++ b/app/controllers/merged/application_controller.rb
@ -1,4 +1,4 @@
 module Merged
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ApplicationController
  end
 end
--- a/app/controllers/merged/merged_controller.rb
+++ b/app/controllers/merged/merged_controller.rb
@ -1,6 +1,6 @@
 module Merged
  class MergedController < ApplicationController
-    layout 'merged_layout'
+#    layout 'merged_layout'

  end
 end