Merge branch 'master' of https://github.com/AvocadoHQ/avo

avo-hq · Aug 19, 2020 · 29fb8eb · 29fb8eb
2 parents 0d98fb2 + a6720f2
commit 29fb8eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/avo.gemspec b/avo.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
       'public gem pushes.'
   end
 
-  spec.files = Dir['{bin,app,config,db,lib,public}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md', 'avo.gemspec', 'Gemfile', 'Gemfile.lock']
+  spec.files = Dir['{bin,app,config,db,lib,public}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md', 'avo.gemspec', 'Gemfile', 'Gemfile.lock'].reject { |file| file.start_with? 'app/frontend' }
 
   spec.add_dependency 'rails', '~> 6.0.2', '>= 6.0.2.1'
   spec.add_dependency 'kaminari'

diff --git a/lib/avo/engine.rb b/lib/avo/engine.rb
@@ -36,6 +36,8 @@ class Engine < ::Rails::Engine
 
       if Rails.env.production?
         Dir.glob(avo_root_path + '/lib/avo/app/**/*.rb'.to_s).each { |c| load(c) }
+
+        Avo::App.init
       end
     end
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,8 @@ class Engine < ::Rails::Engine @@
           if Rails.env.production?
             Dir.glob(avo_root_path + '/lib/avo/app/**/*.rb'.to_s).each { |c| load(c) }
+            Avo::App.init
           end
         end
@@ Expand Down @@