Merge and update version.

camsys · Jan 28, 2019 · cd67386 · cd67386
2 parents a82c3ed + 9181226
commit cd67386
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb
@@ -4,6 +4,7 @@ class Admin::AdminController < ApplicationController
 
   before_action :confirm_admin
   before_action :get_admin_pages
+  before_action :allow_iframes
 
   # Add some prebuilt reports for displaying on the homepage
   DashboardReport.prebuilt_reports.merge!({
@@ -38,5 +39,9 @@ def present_error_messages(record)
                   []).to_sentence
     flash[:danger] = error_msgs unless error_msgs.empty?
   end
+
+  def allow_iframes
+    response.headers.delete "X-Frame-Options"
+  end
 
 end
diff --git a/config/initializers/version.rb b/config/initializers/version.rb
@@ -1 +1 @@
-OneclickCore::Application.config.version='v1.14.1-rc.2'
+OneclickCore::Application.config.version='v1.14.1'