Skip to content

Commit

Permalink
chore(deps): update all non-major bundler dependencies (#474)
Browse files Browse the repository at this point in the history 
* chore(deps): update all non-major bundler dependencies

* fixed artifact

* Update Gemfile

* update gemfile.lock

* Revert "update gemfile.lock"

This reverts commit a272942.

* update gemfile.lock

* set default settings to rails 7

* Fixed lint

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: lodewiges <[email protected]>
Co-authored-by: Jorai Geertsema <[email protected]>
  • Loading branch information
@renovate @lodewiges
3 people authored Jan 19, 2025
1 parent 8e7034e commit 8387882
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 82 deletions.
7 changes: 5 additions & 2 deletions .rubocop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ require:
- rubocop-rails

AllCops:
TargetRailsVersion: 5.1
TargetRailsVersion: 7.0
TargetRubyVersion: 3.1
Exclude:
- 'db/schema.rb'
- 'config/initializers/secret_token.rb'
Expand Down Expand Up @@ -124,9 +125,11 @@ Style/HashTransformValues:
Lint/RaiseException:
Enabled: true


Lint/StructNewOverride:
Enabled: true

Naming/InclusiveLanguage:
Enabled: false

Rails/BulkChangeTable:
Enabled: false
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ gem 'dav4rack', git: 'https://github.com/csvalpha/dav4rack.git', ref: '8541e53'

gem 'bcrypt', '~> 3.1', '>= 3.1.20'
gem 'bootsnap', '~> 1.18', '>= 1.18.4'
gem 'carrierwave', '~> 2.1'
gem 'carrierwave', '~> 2.2', '>= 2.2.6'
gem 'carrierwave-base64', '~> 2.11'
gem 'carrierwave-bombshelter', '~> 0.2', '>= 0.2.2'
gem 'case_transform', '~> 0.2'
gem 'counter_culture', '~> 3.8', '>= 3.8.2'
gem 'dav4rack_ext', '~> 1.0'
gem 'doorkeeper', '~> 5.2'
gem 'doorkeeper', '~> 5.8', '>= 5.8.1'
gem 'doorkeeper-i18n', '~> 5.2', '>= 5.2.7'
gem 'exifr', '~> 1.4'
gem 'friendly_id', '~> 5.5', '>= 5.5.1'
Expand All @@ -28,11 +28,11 @@ gem 'paper_trail', '~> 14.0'
gem 'paranoia', '~> 3.0'
gem 'pg', '~> 1.5', '>= 1.5.9'
gem 'phonelib'
gem 'puma', '~> 6.0'
gem 'puma', '~> 6.5'
gem 'pundit', '~> 2.4'
gem 'rack-attack', '~> 6.7'
gem 'rack-cors', '~> 2.0', '>= 2.0.2', require: 'rack/cors'
gem 'rails', '~> 7.0', '>= 7.0.4.3'
gem 'rails', '~> 7.0.0', '>= 7.0.8.7'
gem 'rails-i18n', '~> 7.0', '>= 7.0.10'
gem 'redis', '~> 4.8', '>= 4.8.1'
gem 'roo', '~> 2.10', '>= 2.10.1'
Expand All @@ -43,7 +43,7 @@ gem 'sepa_king', '~> 0.14'
gem 'sidekiq', '~> 7.3', '>= 7.3.7'
gem 'sidekiq-scheduler', '~> 5.0', '>= 5.0.6'
gem 'slack-notifier', '~> 2.4'
gem 'validates_timeliness', '~> 7.0.0.beta2'
gem 'validates_timeliness', '~> 7.0.0'
gem 'vpim', '~> 24.2', '>= 24.2.20'

group :development, :test do
Expand Down
146 changes: 74 additions & 72 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,67 +22,67 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.8.6)
actionpack (= 7.0.8.6)
activesupport (= 7.0.8.6)
actioncable (7.0.8.7)
actionpack (= 7.0.8.7)
activesupport (= 7.0.8.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.6)
actionpack (= 7.0.8.6)
activejob (= 7.0.8.6)
activerecord (= 7.0.8.6)
activestorage (= 7.0.8.6)
activesupport (= 7.0.8.6)
actionmailbox (7.0.8.7)
actionpack (= 7.0.8.7)
activejob (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8.6)
actionpack (= 7.0.8.6)
actionview (= 7.0.8.6)
activejob (= 7.0.8.6)
activesupport (= 7.0.8.6)
actionmailer (7.0.8.7)
actionpack (= 7.0.8.7)
actionview (= 7.0.8.7)
activejob (= 7.0.8.7)
activesupport (= 7.0.8.7)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8.6)
actionview (= 7.0.8.6)
activesupport (= 7.0.8.6)
actionpack (7.0.8.7)
actionview (= 7.0.8.7)
activesupport (= 7.0.8.7)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8.6)
actionpack (= 7.0.8.6)
activerecord (= 7.0.8.6)
activestorage (= 7.0.8.6)
activesupport (= 7.0.8.6)
actiontext (7.0.8.7)
actionpack (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8.6)
activesupport (= 7.0.8.6)
actionview (7.0.8.7)
activesupport (= 7.0.8.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8.6)
activesupport (= 7.0.8.6)
activejob (7.0.8.7)
activesupport (= 7.0.8.7)
globalid (>= 0.3.6)
activemodel (7.0.8.6)
activesupport (= 7.0.8.6)
activerecord (7.0.8.6)
activemodel (= 7.0.8.6)
activesupport (= 7.0.8.6)
activestorage (7.0.8.6)
actionpack (= 7.0.8.6)
activejob (= 7.0.8.6)
activerecord (= 7.0.8.6)
activesupport (= 7.0.8.6)
activemodel (7.0.8.7)
activesupport (= 7.0.8.7)
activerecord (7.0.8.7)
activemodel (= 7.0.8.7)
activesupport (= 7.0.8.7)
activestorage (7.0.8.7)
actionpack (= 7.0.8.7)
activejob (= 7.0.8.7)
activerecord (= 7.0.8.7)
activesupport (= 7.0.8.7)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8.6)
activesupport (7.0.8.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -137,8 +137,8 @@ GEM
crack (0.4.5)
rexml
crass (1.0.6)
date (3.3.4)
date (3.3.4-java)
date (3.4.1)
date (3.4.1-java)
dav4rack_ext (1.0.0)
dav4rack
http_router
Expand All @@ -148,7 +148,7 @@ GEM
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.8.0)
doorkeeper (5.8.1)
railties (>= 5)
doorkeeper-i18n (5.2.7)
doorkeeper (>= 5.2)
Expand Down Expand Up @@ -188,8 +188,8 @@ GEM
fuubar (2.5.1)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
globalid (1.1.0)
activesupport (>= 5.0)
globalid (1.2.1)
activesupport (>= 6.1)
guard (2.18.0)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
Expand Down Expand Up @@ -272,14 +272,14 @@ GEM
msgpack (1.7.5)
msgpack (1.7.5-java)
nenv (0.3.0)
net-imap (0.3.7)
net-imap (0.5.5)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.3.4)
net-smtp (0.5.0)
net-protocol
netrc (0.11.0)
nio4r (2.7.4)
Expand Down Expand Up @@ -315,9 +315,9 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.7)
puma (6.4.3)
puma (6.5.0)
nio4r (~> 2.0)
puma (6.4.3-java)
puma (6.5.0-java)
nio4r (~> 2.0)
pundit (2.4.0)
activesupport (>= 3.0.0)
Expand All @@ -333,20 +333,20 @@ GEM
rack (>= 1.2.0)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8.6)
actioncable (= 7.0.8.6)
actionmailbox (= 7.0.8.6)
actionmailer (= 7.0.8.6)
actionpack (= 7.0.8.6)
actiontext (= 7.0.8.6)
actionview (= 7.0.8.6)
activejob (= 7.0.8.6)
activemodel (= 7.0.8.6)
activerecord (= 7.0.8.6)
activestorage (= 7.0.8.6)
activesupport (= 7.0.8.6)
rails (7.0.8.7)
actioncable (= 7.0.8.7)
actionmailbox (= 7.0.8.7)
actionmailer (= 7.0.8.7)
actionpack (= 7.0.8.7)
actiontext (= 7.0.8.7)
actionview (= 7.0.8.7)
activejob (= 7.0.8.7)
activemodel (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
bundler (>= 1.15.0)
railties (= 7.0.8.6)
railties (= 7.0.8.7)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -357,9 +357,9 @@ GEM
rails-i18n (7.0.10)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.0.8.6)
actionpack (= 7.0.8.6)
activesupport (= 7.0.8.6)
railties (7.0.8.7)
actionpack (= 7.0.8.7)
activesupport (= 7.0.8.7)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -491,8 +491,8 @@ GEM
thor (1.3.2)
tilt (2.4.0)
timecop (0.9.5)
timeliness (0.4.5)
timeout (0.3.2)
timeliness (0.5.1)
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.1)
Expand All @@ -508,7 +508,7 @@ GEM
url_mount (0.2.1)
rack
uuidtools (2.2.0)
validates_timeliness (7.0.0.beta2)
validates_timeliness (7.0.0)
activemodel (>= 7.0.0, < 8)
timeliness (>= 0.3.10, < 1)
vcard_parser (0.0.9)
Expand All @@ -519,9 +519,11 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.7.0)
websocket-driver (0.7.6)
websocket-driver (0.7.7)
base64
websocket-extensions (>= 0.1.0)
websocket-driver (0.7.6-java)
websocket-driver (0.7.7-java)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.18)
Expand All @@ -542,7 +544,7 @@ DEPENDENCIES
bootsnap (~> 1.18, >= 1.18.4)
brakeman
bullet
carrierwave (~> 2.1)
carrierwave (~> 2.2, >= 2.2.6)
carrierwave-base64 (~> 2.11)
carrierwave-bombshelter (~> 0.2, >= 0.2.2)
case_transform (~> 0.2)
Expand All @@ -551,7 +553,7 @@ DEPENDENCIES
counter_culture (~> 3.8, >= 3.8.2)
dav4rack!
dav4rack_ext (~> 1.0)
doorkeeper (~> 5.2)
doorkeeper (~> 5.8, >= 5.8.1)
doorkeeper-i18n (~> 5.2, >= 5.2.7)
dotenv-rails
exifr (~> 1.4)
Expand All @@ -577,12 +579,12 @@ DEPENDENCIES
phonelib
pry-byebug
pry-rails
puma (~> 6.0)
puma (~> 6.5)
pundit (~> 2.4)
rack-attack (~> 6.7)
rack-cors (~> 2.0, >= 2.0.2)
rack-mini-profiler
rails (~> 7.0, >= 7.0.4.3)
rails (~> 7.0.0, >= 7.0.8.7)
rails-i18n (~> 7.0, >= 7.0.10)
rb-readline
redis (~> 4.8, >= 4.8.1)
Expand All @@ -607,7 +609,7 @@ DEPENDENCIES
terminal-notifier-guard
timecop
tzinfo-data
validates_timeliness (~> 7.0.0.beta2)
validates_timeliness (~> 7.0.0)
vcr
vpim (~> 24.2, >= 24.2.20)
webmock
Expand Down
4 changes: 2 additions & 2 deletions app/models/user.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
})

def full_name
[first_name, last_name_prefix, last_name].reject(&:blank?).join(' ')
[first_name, last_name_prefix, last_name].compact_blank.join(' ')
end

alias to_s full_name
Expand All @@ -114,7 +114,7 @@ def username=(value)

def generate_username
value = [first_name, '.', last_name_prefix, last_name]
.reject(&:blank?).join.gsub(/\s|-/, '')
.compact_blank.join.gsub(/\s|-/, '')
.parameterize.tr('-', '.')
usernames_like = User.where('username LIKE ?', "#{value}%")
value = "#{value}#{usernames_like.size}" if usernames_like.any?
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
module Amber
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 6.0
config.load_defaults 7.0

# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
Expand Down

0 comments on commit 8387882

Please sign in to comment.