.gitattributes

@@ -1 +0,0 @@
-public/assets/** filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -46,6 +46,10 @@
 
 # logfiles and tempfiles
 /log
+/public/assets/*.*
+/public/assets/addons
+/public/assets/app
+/public/assets/custom
 /public/assets/chat/node_modules
 /tmp/*
 !/tmp/pids
@@ -53,9 +57,23 @@
 !/tmp/pids/.keep
 /storage/fs
 
+# doorkeeper (OAuth 2)
+/public/assets/doorkeeper
+
 # images
+/public/assets/images/*
 /public/assets/images/yarn.lock
 /public/assets/images/node_modules
+!/public/assets/images/*.sh
+!/public/assets/images/Dockerfile
+!/public/assets/images/package.json
+!/public/assets/images/gulpfile.js
+!/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
 
 # Third-Party ------------------------------------------------------------------
 

Gemfile

@@ -3,7 +3,7 @@
 source 'https://gems.sutty.nl'
 
 # core - base
-ruby '2.7.5'
+ruby '2.7.4'
 gem 'rails', '~> 6.0.0'
 
 # core - rails additions
@@ -149,8 +149,6 @@ gem 'viewpoint', require: false
 # integrations - S/MIME
 gem 'openssl'
 
-gem 'lograge'
-
 # Translation sync
 gem 'PoParser', require: false
 

Gemfile.lock

@@ -292,11 +292,6 @@ GEM
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    lograge (0.12.0)
-      actionpack (>= 4)
-      activesupport (>= 4)
-      railties (>= 4)
-      request_store (~> 1.0)
     loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -467,8 +462,6 @@ GEM
     rchardet (1.8.0)
     redis (4.6.0)
     regexp_parser (2.2.1)
-    request_store (1.5.1)
-      rack (>= 1.4)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -681,7 +674,6 @@ DEPENDENCIES
   json
   koala
   libv8
-  lograge
   mail!
   messagebird-rest
   mime-types

config/environments/production.rb

@@ -41,7 +41,7 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
-  config.active_storage.service = :local
+  # config.active_storage.service = :local
 
   # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil
@@ -49,7 +49,7 @@ Rails.application.configure do
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
+  # config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
@@ -81,14 +81,12 @@ Rails.application.configure do
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  config.lograge.enabled = true
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
+  # config.log_formatter = ::Logger::Formatter.new
 
   # Use a different logger for distributed setups.
-  require 'syslog/logger'
-  config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'zammad')
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
   if ENV['RAILS_LOG_TO_STDOUT'].present?
     logger           = ActiveSupport::Logger.new($stdout)