diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7f78cd..20664a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## master
 
+## 1.1.4
+* Support to Rails 6.1
+
 ## 1.1.3
 * Turns compatible with sprockets 4
 * Application Controller inheritance
diff --git a/README.md b/README.md
index a3ea5b8..f8db045 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Include [swagger-ui](https://github.com/swagger-api/swagger-ui) as Rails engine
 
 Swagger UI version | Rails version
 ------------------ | ----------------
-2.2.10             | >= 4.2, <6
+2.2.10             | >= 4.2, <= 6.1.x
 
 ## Features
 * Supports API documentation versioning / multiple APIs documentation
diff --git a/app/controllers/swagger_ui_engine/swagger_docs_controller.rb b/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
index 1109c4a..20c69ba 100644
--- a/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
+++ b/app/controllers/swagger_ui_engine/swagger_docs_controller.rb
@@ -3,13 +3,12 @@ class SwaggerDocsController < SwaggerUiEngine::ApplicationController
     include SwaggerUiEngine::ConfigParser
     include SwaggerUiEngine::OauthConfigParser
 
-    add_template_helper SwaggerUiEngine::TranslationHelper
+    helper SwaggerUiEngine::TranslationHelper
     layout 'swagger_ui_engine/layouts/swagger', except: %w(oauth2)
 
     before_action :set_configs, :set_oauth_configs
 
-    def oauth2
-    end
+    def oauth2; end
 
     def index
       # backward compatibility for defining single doc url in strings
diff --git a/app/views/swagger_ui_engine/swagger_docs/show.html.erb b/app/views/swagger_ui_engine/swagger_docs/show.html.erb
index b6a6a4f..358d208 100644
--- a/app/views/swagger_ui_engine/swagger_docs/show.html.erb
+++ b/app/views/swagger_ui_engine/swagger_docs/show.html.erb
@@ -1,5 +1,9 @@
 <% content_for(:head) do %>
     <script type="text/javascript">
+      function validationUrl(url) {
+        return url === 'null' ? null : url;
+      }
+
       $(function () {
         var url = window.location.search.match(/url=([^&]+)/);
         if (url && url.length > 1) {
@@ -18,7 +22,7 @@
         }
         window.swaggerUi = new SwaggerUi({
           url: url,
-          validatorUrl: "<%= @validator_url %>",
+          validatorUrl: validationUrl("<%= @validator_url %>"),
           oauth2RedirectUrl: "<%= oauth2_swagger_docs_url %>",
           dom_id: "swagger-ui-container",
           supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
diff --git a/lib/swagger_ui_engine/engine.rb b/lib/swagger_ui_engine/engine.rb
index 1430422..3de95c2 100644
--- a/lib/swagger_ui_engine/engine.rb
+++ b/lib/swagger_ui_engine/engine.rb
@@ -18,6 +18,8 @@ class Engine < ::Rails::Engine
         swagger_ui_engine/lang/*.js
         swagger_ui_engine/DroidSans-Bold.ttf
         swagger_ui_engine/DroidSans.ttf
+        swagger_ui_engine/application.js
+        swagger_ui_engine/application.css
       ]
 
       Rails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
diff --git a/lib/swagger_ui_engine/version.rb b/lib/swagger_ui_engine/version.rb
index 34f83df..314637c 100644
--- a/lib/swagger_ui_engine/version.rb
+++ b/lib/swagger_ui_engine/version.rb
@@ -1,4 +1,4 @@
 module SwaggerUiEngine
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
   SWAGGER_UI_VERSION = '2.2.10'.freeze
 end
diff --git a/swagger_ui_engine.gemspec b/swagger_ui_engine.gemspec
index a75e97e..7200c38 100644
--- a/swagger_ui_engine.gemspec
+++ b/swagger_ui_engine.gemspec
@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
     'CHANGELOG.md'
   ]
 
-  s.add_runtime_dependency 'rails', '>= 4.2', '< 6'
+  s.add_runtime_dependency 'rails', '>= 4.2', '< 6.2'
   s.add_runtime_dependency 'sassc-rails'
+
+  s.add_development_dependency 'sqlite3'
 end
diff --git a/test/controllers/swagger_ui_engine/swagger_docs_controller_test.rb b/test/controllers/swagger_ui_engine/swagger_docs_controller_test.rb
index 1be3dae..690c6eb 100644
--- a/test/controllers/swagger_ui_engine/swagger_docs_controller_test.rb
+++ b/test/controllers/swagger_ui_engine/swagger_docs_controller_test.rb
@@ -39,11 +39,15 @@ class SwaggerDocsControllerTest < ActionDispatch::IntegrationTest
       assert_response :success
       assert_match('showRequestHeaders: "false"', @response.body)
       assert_match('jsonEditor: "false"', @response.body)
-      assert_match('validatorUrl: "null"', @response.body)
       assert_match('clientId: "your-client-id"', @response.body)
       assert_match('clientSecret: "your-client-secret-if-required"', @response.body)
       assert_match('scopeSeparator: " "', @response.body)
       assert_match('additionalQueryStringParams: "{}"', @response.body)
     end
+
+    test 'validatorUrl should should check the url to validate the given url or return real null' do
+      get '/swagger/swagger_docs/v1'
+      assert_match('validatorUrl: validationUrl("null")', @response.body)
+    end
   end
 end
diff --git a/test/dummy/app/assets/config/manifest.js b/test/dummy/app/assets/config/manifest.js
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
new file mode 100644
index 0000000..90d87cc
--- /dev/null
+++ b/test/dummy/config/database.yml
@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem install sqlite3
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000