Merge pull request #10 from versedpro/textyomni-develop

Merge middle woriking
versedpro · Oct 28, 2020 · 954cbd8 · 954cbd8
2 parents 7548cc3 + 45d8f06
commit 954cbd8
Show file tree

Hide file tree

Showing 122 changed files with 1,732 additions and 788 deletions.
diff --git a/.env.example b/.env.example
@@ -55,7 +55,7 @@ MAILER_INBOUND_EMAIL_DOMAIN=usg.mail.textyomni.com
 # :mandrill for Mandrill
 # :postmark for Postmark
 # :sendgrid for Sendgrid
-RAILS_INBOUND_EMAIL_SERVICE=:sendgrid
+RAILS_INBOUND_EMAIL_SERVICE=
 # Use one of the following based on the email ingress service
 # Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html
 RAILS_INBOUND_EMAIL_PASSWORD=x3fGwQ95vStP

diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,7 @@ buildreports
 coverage
 
 /storage
+/vendor
 
 # ignore packages
 node_modules