From b835e6b196e98bc3d317c0b31805915d137e257b Mon Sep 17 00:00:00 2001
From: Lukas Pol <lukaspaespol@gmail.com>
Date: Wed, 15 Apr 2020 15:12:53 -0300
Subject: [PATCH] fix bug .gitignore

Signed-off-by: Lukas Pol <lukaspaespol@gmail.com>
---
 ruby_on_rails-postgres/.gitignore     | 32 ++++++++++++++++++++++++++-
 ruby_on_rails-postgres/web/.gitignore | 31 --------------------------
 2 files changed, 31 insertions(+), 32 deletions(-)
 delete mode 100644 ruby_on_rails-postgres/web/.gitignore

diff --git a/ruby_on_rails-postgres/.gitignore b/ruby_on_rails-postgres/.gitignore
index 8e88a2f..cbfc3f2 100644
--- a/ruby_on_rails-postgres/.gitignore
+++ b/ruby_on_rails-postgres/.gitignore
@@ -1,2 +1,32 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+web/.bundle
+
+# Ignore all logfiles and tempfiles.
+web/log/*
+/tmp/*
+/web/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore uploaded files in development.
+/storage/*
+!/storage/.keep
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
+/public/packs
+/public/packs-test
 /node_modules
-/tmp
\ No newline at end of file
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
\ No newline at end of file
diff --git a/ruby_on_rails-postgres/web/.gitignore b/ruby_on_rails-postgres/web/.gitignore
deleted file mode 100644
index a9ce452..0000000
--- a/ruby_on_rails-postgres/web/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-!/log/.keep
-!/tmp/.keep
-
-# Ignore uploaded files in development.
-/storage/*
-!/storage/.keep
-
-/public/assets
-.byebug_history
-
-# Ignore master key for decrypting credentials and more.
-/config/master.key
-
-/public/packs
-/public/packs-test
-/node_modules
-/yarn-error.log
-yarn-debug.log*
-.yarn-integrity