Merged in feature/fixed_file_extension (pull request #15)

Bullet extension fixed, app_generator edited Approved-by: Fatih Avsan <fatih.avsan@lab2023.com> Approved-by: Hamdi Bayhan <hamdi.bayhan@lab2023.com>
lab2023 · Oct 31, 2017 · d3014c7 · d3014c7
2 parents 2742f8a + 5a51e99
commit d3014c7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/lib/cybele/app_builder.rb b/lib/cybele/app_builder.rb
@@ -64,7 +64,7 @@ def generate_rollbar
     end
 
     def configure_bullet
-      configure_environment 'development', template_content('bullet/bullet_settings.rb')
+      configure_environment 'development', template_content('bullet/bullet_settings.rb.erb')
     end
 
     private

diff --git a/lib/cybele/generators/app_generator.rb b/lib/cybele/generators/app_generator.rb
@@ -187,11 +187,6 @@ def setup_bullet_config
       build :configure_bullet
     end
 
-    def setup_dotenv
-      say 'Generate env.sample and .env files', :green
-      build :configure_dotenv
-    end
-
     def setup_paperclip_and_add_aws
       say 'Setting up paperclip, editing settings.yml and env files', :green
       build :configure_paperclip

diff --git a/templates/bullet/bullet_settings.rb → templates/bullet/bullet_settings.rb.erb b/templates/bullet/bullet_settings.rb → templates/bullet/bullet_settings.rb.erb
@@ -1,3 +1,4 @@
+
   config.after_initialize do
     Bullet.enable = true
     Bullet.alert = true
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ def generate_rollbar @@
         end
         def configure_bullet
-          configure_environment 'development', template_content('bullet/bullet_settings.rb')
+          configure_environment 'development', template_content('bullet/bullet_settings.rb.erb')
         end
         private
@@ Expand Down @@