back to merged layout (more space)

2023-01-09 14:44:00 +02:00
parent 81aafe593f
commit cc4aa25e46
18 changed files with 215 additions and 90 deletions
--- a/app/controllers/merged/application_controller.rb
+++ b/app/controllers/merged/application_controller.rb
@ -1,4 +1,4 @@
 module Merged
-  class ApplicationController < ApplicationController
+  class ApplicationController < ActionController::Base
  end
 end
--- a/app/controllers/merged/merged_controller.rb
+++ b/app/controllers/merged/merged_controller.rb
@ -1,5 +1,5 @@
 module Merged
-  class MergedController < ::ApplicationController
+  class MergedController < ApplicationController
    before_action :authenticate_member!
  end
 end