Commit ad8cb308 authored by Kaspar Vollenweider's avatar Kaspar Vollenweider

Merge branch 'deploy_develop_to_production' into 'master'

Deploy develop to production

See merge request !1069
parents 0a681ea5 34a604c2
Pipeline #89515 passed with stage
in 13 minutes and 3 seconds
......@@ -102,7 +102,7 @@ class Volunteer < ApplicationRecord
unless: :user_deleted?
def avatar_thumb
avatar.variant(resize: '100x100>').processed
avatar&.variant(resize: '100x100>')&.processed
end
# allot of old records would cause app to crash if validation would run for them
......
......@@ -17,8 +17,6 @@ module Aoz
config.load_defaults 6.0
config.time_zone = 'Zurich'
config.autoload_paths += Dir[config.root.join('lib/access_import/**/')]
config.autoload_paths += Dir[config.root.join('lib/access_import/accessors/**/')]
WillPaginate.per_page = 20
# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment