Add alternative organizations to user

.gitignore

@@ -4,83 +4,83 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile ~/.gitignore_global
 
-# Ignore .swp files
-.*.swp
+# Configuration ================================================================
+# These files will differ from one user to another;
+# committing them may cause Zammad to behave unexpectedly on other machines
 
-# Ignore bundler config
-/.bundle
-
-# Ignore mac stuff
-.DS_Store
-
-# Ignore Rubymine config
-/.idea
-
-# Ignore .project files
-/.project
-
-# Ignore .rbenv-vars
-/.rbenv-vars
-
-# exclude the figaro ENV setting helper file - run 'bundle exec figaro install' for creating your own
-# see: https://github.com/laserlemon/figaro
-# Ignore application configuration
-/config/application.yml
-
-# Ignore .envrc for direnv
-/.envrc
+# Zammad -----------------------------------------------------------------------
 
-# Ignore database config
+# database (copy from config/database/database.yml, or use `rails bs:init`)
 /config/database.yml
 
-# Ignore translation cache files
-/config/locales*.yml
-/config/translations/*.yml
+# Third-Party ------------------------------------------------------------------
+# The config files / dev tools listed below are optional
+# and may not be present on most users' machines
 
-# Ignore generated documentation
-/doc
+# Bundler
+/.bundle
+/Gemfile.local
 
-# Ignore coverage stuff
-/coverage
+# Clutter ======================================================================
+# These files are automatically generated;
+# in most cases, committing them won't do anything other than bloat the repo
 
-# Ignore the default SQLite database.
-/db/*.sqlite3
+# Zammad -----------------------------------------------------------------------
 
-# Ignore local changes to schema.rb (e. g. through extentions)
+# database files
+/db/*.sqlite3
 /db/schema.rb
 
-# Ignore custom gem file
-/Gemfile.local
+# translation cache files
+/config/locales*.yml
+/config/translations/*.yml
 
-# Ignore node modules
+# NPM / Yarn
 /node_modules
 
-# Ignore all logfiles and tempfiles.
+# logfiles and tempfiles
 /log
 /public/assets/*.*
 /public/assets/app
 /public/assets/custom
 /public/assets/chat/node_modules
 /tmp/*
-/tmp/pids/*
-/storage/fs
-
-# except /tmp/pids/ which is needed for certain Zammad processes
-!/tmp
 !/tmp/pids
+/tmp/pids/*
 !/tmp/pids/.keep
+/storage/fs
 
-# ignore doorkeeper auto generated folder
+# doorkeeper (OAuth 2)
 /public/assets/doorkeeper
 
-# ignore all automatically downloaded images except the default ones
+# images
 /public/assets/images/*
-!/public/assets/images/icons
+!/public/assets/images/icons/
 !/public/assets/images/avatar-bg.png
 !/public/assets/images/chat-demo-avatar.png
 !/public/assets/images/eyedropper.gif
 !/public/assets/images/icons.svg
 !/public/assets/images/logo.svg
 
-# ignore byebug history
-/.byebug_history
+# Third-Party ------------------------------------------------------------------
+
+# macOS
+.DS_Store
+
+# vim
+.*.sw[pon]
+
+# RubyMine
+/.idea
+
+# Eclipse
+/.project
+
+# Byebug
+/.byebug_history
+
+# SimpleCov
+/coverage
+
+# RDoc / YARD
+/doc