diff --git a/Gemfile b/Gemfile index 27841c8..03aa522 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,8 @@ gem 'html2haml' gem 'devise' gem 'carrierwave', '>= 3.0.0.beta', '< 4.0' -gem "ruby2js" , path: "../ruby2js" +gem "ruby2js" , git: "https://github.com/ruby2js/ruby2js/" , branch: "haml_fix" + gem "simple_form" , "5.1.0" gem "simple_form_tailwind_css" diff --git a/Gemfile.lock b/Gemfile.lock index 50e4741..638e0a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: https://github.com/ruby2js/ruby2js/ + revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d + branch: haml_fix + specs: + ruby2js (5.0.1) + parser + regexp_parser (~> 2.1.1) + PATH remote: ../merged specs: @@ -10,13 +19,6 @@ PATH redcarpet ruby2js (~> 5.0, >= 5.0.1) -PATH - remote: ../ruby2js - specs: - ruby2js (5.0.1) - parser - regexp_parser (~> 2.1.1) - GEM remote: https://rubygems.org/ specs: diff --git a/config/application.rb b/config/application.rb index d89b24c..8ecf5d9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -31,7 +31,7 @@ module HubfeenixFi # config.time_zone = "Central Time (US & Canada)" # config.eager_load_paths << Rails.root.join("extras") - config.autoload_paths << Rails.root.join('lib') + #config.autoload_paths << Rails.root.join('lib') end end