Merge branch 'staging' into depfu/batch_all/2021-05-03

# Conflicts:
#	Gemfile.lock

Gemfile.lock

@@ -81,26 +81,26 @@ GEM
  rack (>= 0.9.0)
  binding_of_caller (1.0.0)
  debug_inspector (>= 0.0.1)
- bootsnap (1.7.5)
+ bootsnap (1.7.2)
  msgpack (~> 1.0)
- brakeman (5.0.1)
+ brakeman (5.0.0)
  builder (3.2.4)
  bullet (6.1.4)
  activesupport (>= 3.0.0)
  uniform_notifier (~> 1.11)
  byebug (11.1.3)
- carrierwave (2.2.1)
+ carrierwave (2.2.0)
  activemodel (>= 5.0.0)
  activesupport (>= 5.0.0)
  addressable (~> 2.6)
  image_processing (~> 1.1)
- marcel (~> 1.0.0)
+ mimemagic (>= 0.3.0)
  mini_mime (>= 0.1.3)
  ssrf_filter (~> 1.0)
- carrierwave-base64 (2.10.0)
- carrierwave (>= 2.2.1)
- marcel (~> 1.0.0)
+ carrierwave-base64 (2.8.1)
+ carrierwave (>= 0.8.0)
  mime-types (~> 3.0)
+ mimemagic (~> 0.3.2)
  carrierwave-bombshelter (0.2.2)
  activesupport (>= 3.2.0)
  carrierwave
@@ -110,9 +110,9 @@ GEM
  coderay (1.1.3)
  colorize (0.8.1)
  concurrent-ruby (1.1.8)
- connection_pool (2.2.5)
+ connection_pool (2.2.3)
  consistency_fail (0.3.7)
- counter_culture (2.8.0)
+ counter_culture (2.7.0)
  activerecord (>= 4.2)
  activesupport (>= 4.2)
  crack (0.4.5)
@@ -126,9 +126,9 @@ GEM
  dav4rack
  http_router
  vcard_parser (~> 0.0.8)
- debug_inspector (1.1.0)
+ debug_inspector (1.0.0)
  diff-lcs (1.4.4)
- docile (1.4.0)
+ docile (1.3.5)
  domain_name (0.5.20190701)
  unf (>= 0.0.5, < 1.0.0)
  doorkeeper (5.4.0)
@@ -144,22 +144,18 @@ GEM
  et-orbi (1.2.4)
  tzinfo
  exifr (1.3.9)
- factory_bot (6.2.0)
+ factory_bot (6.1.0)
  activesupport (>= 5.0.0)
- factory_bot_rails (6.2.0)
- factory_bot (~> 6.2.0)
+ factory_bot_rails (6.1.0)
+ factory_bot (~> 6.1.0)
  railties (>= 5.0.0)
- faker (2.18.0)
+ faker (2.17.0)
  i18n (>= 1.6, < 2)
- faraday (1.4.1)
- faraday-excon (~> 1.1)
+ faraday (1.3.0)
  faraday-net_http (~> 1.0)
- faraday-net_http_persistent (~> 1.1)
  multipart-post (>= 1.2, < 3)
- ruby2_keywords (>= 0.0.4)
- faraday-excon (1.1.0)
+ ruby2_keywords
  faraday-net_http (1.0.1)
- faraday-net_http_persistent (1.1.0)
  fastimage (2.2.3)
  ffi (1.15.0)
  ffi (1.15.0-java)
@@ -171,15 +167,15 @@ GEM
  formatador (0.2.5)
  friendly_id (5.4.2)
  activerecord (>= 4.0.0)
- fugit (1.4.5)
+ fugit (1.4.2)
  et-orbi (~> 1.1, >= 1.1.8)
  raabro (~> 1.4)
  fuubar (2.5.1)
  rspec-core (~> 3.0)
  ruby-progressbar (~> 1.4)
  globalid (0.4.2)
  activesupport (>= 4.2.0)
- guard (2.17.0)
+ guard (2.16.2)
  formatador (>= 0.2.4)
  listen (>= 2.7, < 4.0)
  lumberjack (>= 1.0.12, < 2.0)
@@ -208,7 +204,7 @@ GEM
  http_router (0.11.2)
  rack (>= 1.0.0)
  url_mount (~> 0.2.1)
- i18n (1.8.10)
+ i18n (1.8.9)
  concurrent-ruby (~> 1.0)
  iban-tools (1.1.0)
  icalendar (2.7.1)
@@ -226,7 +222,7 @@ GEM
  activerecord (>= 4.1)
  concurrent-ruby
  railties (>= 4.1)
- listen (3.5.1)
+ listen (3.4.1)
  rb-fsevent (~> 0.10, >= 0.10.3)
  rb-inotify (~> 0.9, >= 0.9.10)
  loofah (2.9.1)
@@ -235,20 +231,22 @@ GEM
  lumberjack (1.2.8)
  mail (2.7.1)
  mini_mime (>= 0.1.1)
- mailgun-ruby (1.2.4)
+ mailgun-ruby (1.2.3)
  rest-client (>= 2.0.2)
  marcel (1.0.1)
- message_bus (3.3.5)
+ message_bus (3.3.4)
  rack (>= 1.1.3)
  method_source (1.0.0)
  mime-types (3.3.1)
  mime-types-data (~> 3.2015)
  mime-types-data (3.2021.0225)
+ mimemagic (0.3.7)
+ nokogiri (~> 1.11.2)
  mina (1.2.3)
  open4 (~> 1.3.4)
  rake
  mini_magick (4.11.0)
- mini_mime (1.0.3)
+ mini_mime (1.0.2)
  mini_portile2 (2.5.1)
  minitest (5.14.4)
  msgpack (1.4.2)
@@ -277,12 +275,12 @@ GEM
  parallel (1.20.1)
  paranoia (2.4.3)
  activerecord (>= 4.0, < 6.2)
- parser (3.0.1.1)
+ parser (3.0.0.0)
  ast (~> 2.4.1)
  pg (1.2.3)
  pg (1.2.3-x64-mingw32)
  pg (1.2.3-x86-mingw32)
- phonelib (0.6.50)
+ phonelib (0.6.48)
  pry (0.13.1)
  coderay (~> 1.1)
  method_source (~> 1.0)
@@ -296,9 +294,9 @@ GEM
  pry-rails (0.3.9)
  pry (>= 0.10.4)
  public_suffix (4.0.6)
- puma (5.3.1)
+ puma (5.2.2)
  nio4r (~> 2.0)
- puma (5.3.1-java)
+ puma (5.2.2-java)
  nio4r (~> 2.0)
  pundit (2.1.0)
  activesupport (>= 3.0.0)
@@ -310,7 +308,7 @@ GEM
  rack (>= 1.0, < 3)
  rack-cors (1.1.1)
  rack (>= 2.0.0)
- rack-mini-profiler (2.3.2)
+ rack-mini-profiler (2.3.1)
  rack (>= 1.2.0)
  rack-test (1.1.0)
  rack (>= 1.0, < 3)
@@ -345,7 +343,7 @@ GEM
  thor (~> 1.0)
  rainbow (3.0.0)
  rake (13.0.3)
- rb-fsevent (0.11.0)
+ rb-fsevent (0.10.4)
  rb-inotify (0.10.1)
  ffi (~> 1.0)
  rb-readline (0.5.5)
@@ -373,7 +371,7 @@ GEM
  rspec-mocks (3.10.2)
  diff-lcs (>= 1.2.0, < 2.0)
  rspec-support (~> 3.10.0)
- rspec-rails (5.0.1)
+ rspec-rails (5.0.0)
  actionpack (>= 5.2)
  activesupport (>= 5.2)
  railties (>= 5.2)
@@ -382,45 +380,45 @@ GEM
  rspec-mocks (~> 3.10)
  rspec-support (~> 3.10)
  rspec-support (3.10.2)
- rubocop (1.15.0)
+ rubocop (1.11.0)
  parallel (~> 1.10)
  parser (>= 3.0.0.0)
  rainbow (>= 2.2.2, < 4.0)
  regexp_parser (>= 1.8, < 3.0)
  rexml
- rubocop-ast (>= 1.5.0, < 2.0)
+ rubocop-ast (>= 1.2.0, < 2.0)
  ruby-progressbar (~> 1.7)
  unicode-display_width (>= 1.4.0, < 3.0)
- rubocop-ast (1.5.0)
- parser (>= 3.0.1.1)
- rubocop-performance (1.11.3)
- rubocop (>= 1.7.0, < 2.0)
+ rubocop-ast (1.4.1)
+ parser (>= 2.7.1.5)
+ rubocop-performance (1.10.1)
+ rubocop (>= 0.90.0, < 2.0)
  rubocop-ast (>= 0.4.0)
- rubocop-rails (2.10.1)
+ rubocop-rails (2.9.1)
  activesupport (>= 4.2.0)
  rack (>= 1.1)
- rubocop (>= 1.7.0, < 2.0)
- rubocop-rspec (2.3.0)
+ rubocop (>= 0.90.0, < 2.0)
+ rubocop-rspec (2.2.0)
  rubocop (~> 1.0)
  rubocop-ast (>= 1.1.0)
  ruby-filemagic (0.7.2)
  ruby-filemagic (0.7.2-x86-mingw32)
  ruby-filemagic (0.7.2-x86-mswin32-60)
  ruby-progressbar (1.11.0)
- ruby-vips (2.1.2)
+ ruby-vips (2.1.0)
  ffi (~> 1.12)
  ruby2_keywords (0.0.4)
  rubyzip (2.3.0)
  rufus-scheduler (3.7.0)
  fugit (~> 1.1, >= 1.1.6)
- sentry-raven (3.1.2)
+ sentry-raven (3.1.1)
  faraday (>= 1.0)
  sepa_king (0.12.0)
  activemodel (>= 3.1)
  iban-tools
  nokogiri
  shellany (0.0.1)
- sidekiq (6.2.1)
+ sidekiq (6.1.3)
  connection_pool (>= 2.2.2)
  rack (~> 2.0)
  redis (>= 4.2.0)
@@ -436,8 +434,8 @@ GEM
  simplecov-html (~> 0.11)
  simplecov_json_formatter (~> 0.1)
  simplecov-html (0.12.3)
- simplecov_json_formatter (0.1.3)
- slack-notifier (2.4.0)
+ simplecov_json_formatter (0.1.2)
+ slack-notifier (2.3.2)
  spoon (0.0.6)
  ffi
  spring (2.1.1)
@@ -472,7 +470,7 @@ GEM
  unf_ext (0.0.7.7-x64-mingw32)
  unf_ext (0.0.7.7-x86-mingw32)
  unicode-display_width (2.0.0)
- uniform_notifier (1.14.2)
+ uniform_notifier (1.14.1)
  url_mount (0.2.1)
  rack
  uuidtools (2.1.5)
@@ -481,7 +479,7 @@ GEM
  vcard_parser (0.0.9)
  vcr (6.0.0)
  vpim (13.11.11)
- webmock (3.13.0)
+ webmock (3.12.1)
  addressable (>= 2.3.6)
  crack (>= 0.3.2)
  hashdiff (>= 0.4.0, < 2.0.0)