New Settings layout

app/controllers/imports_controller.rb

@@ -4,10 +4,12 @@ class ImportsController < ApplicationController
 
   def index
     @import_results = current_user.import_results.order(created_at: :desc).limit(5)
+    render(layout: 'settings')
   end
 
   def show
     @import_result = current_user.import_results.find(params[:id])
+    render(layout: 'settings')
   end
 
   def new; end

app/controllers/organization_controller.rb

@@ -19,6 +19,7 @@ def edit
     # TODO: add a condition for when a user is an admin for the account.
     # Current code only displays account information when the user is the owner
     @organization.name = nil if @organization.name == '__default__'
+    render(layout: 'settings')
   end
 
   # PUT /organization/:id
@@ -28,9 +29,9 @@ def update
     end
 
     if @organization.update(update_organization_params)
-      render(:edit, status: :ok)
+      render(:edit, status: :ok, layout: 'settings')
     else
-      render(:edit, status: :unprocessable_entity)
+      render(:edit, status: :unprocessable_entity, layout: 'settings')
     end
   end
 

app/controllers/ssos_controller.rb

@@ -3,16 +3,16 @@ class SsosController < ApplicationController
   before_action :redirect_if_unauthenticated
   before_action :set_organization
 
-  def edit; end
+  layout 'settings'
 
-  def show
-  end
+  def show; end
+  def edit; end
 
   def update
     if @organization.update(update_sso_params)
-      render :edit, status: :ok
+      render(:edit, status: :ok)
     else
-      render :edit, status: :unprocessable_entity
+      render(:edit, status: :unprocessable_entity)
     end
   end
 
@@ -24,6 +24,6 @@ def update_sso_params
 
   def set_organization
     @organization = Organization.find(params[:organization_id])
-    @organization.name = nil if @organization.name === "__default__"
+    @organization.name = nil if @organization.name === '__default__'
   end
 end