Skip to content

Commit

Permalink
Update rails to 7.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
codez committed Nov 18, 2024
1 parent fbded08 commit d3d1c29
Show file tree
Hide file tree
Showing 24 changed files with 168 additions and 162 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -63,7 +63,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -108,7 +108,7 @@ jobs:
- name: Run tests
run: bundle exec rails test
- name: Coveralls
uses: coverallsapp/github-action@master
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: "./test/coverage/lcov.info"
125 changes: 65 additions & 60 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
GEM
remote: https://rubygems.org/
specs:
actionpack (7.1.4.1)
actionview (= 7.1.4.1)
activesupport (= 7.1.4.1)
actionpack (7.1.5)
actionview (= 7.1.5)
activesupport (= 7.1.5)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.4.1)
activesupport (= 7.1.4.1)
actionview (7.1.5)
activesupport (= 7.1.5)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
Expand All @@ -22,37 +22,41 @@ GEM
activemodel (>= 4.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activemodel (7.1.4.1)
activesupport (= 7.1.4.1)
activerecord (7.1.4.1)
activemodel (= 7.1.4.1)
activesupport (= 7.1.4.1)
activemodel (7.1.5)
activesupport (= 7.1.5)
activerecord (7.1.5)
activemodel (= 7.1.5)
activesupport (= 7.1.5)
timeout (>= 0.4.0)
activesupport (7.1.4.1)
activesupport (7.1.5)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
securerandom (>= 0.3)
tzinfo (~> 2.0)
airbrussh (1.5.1)
airbrussh (1.5.3)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.2)
base64 (0.1.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
bootsnap (1.18.3)
bootsnap (1.18.4)
msgpack (~> 1.2)
builder (3.3.0)
byebug (11.1.3)
capistrano (3.18.0)
capistrano (3.19.2)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-bundler (2.1.0)
capistrano-bundler (2.1.1)
capistrano (~> 3.1)
capistrano-passenger (0.2.1)
capistrano (~> 3.0)
Expand All @@ -65,18 +69,18 @@ GEM
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
crass (1.0.6)
docile (1.4.0)
docile (1.4.1)
drb (2.2.1)
erubi (1.13.0)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.11.2)
rdoc
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.7.1)
json (2.8.2)
jsonapi-renderer (0.2.2)
jwt (2.8.0)
jwt (2.9.3)
base64
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand All @@ -91,29 +95,31 @@ GEM
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
language_server-protocol (3.17.0.3)
loofah (2.22.0)
logger (1.6.1)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mini_portile2 (2.8.7)
mini_portile2 (2.8.8)
minitest (5.25.1)
mocha (2.1.0)
mocha (2.5.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.2)
msgpack (1.7.5)
multi_json (1.15.0)
mutex_m (0.2.0)
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
net-ssh (7.2.1)
nio4r (2.7.3)
net-ssh (7.3.0)
nio4r (2.7.4)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
parallel (1.24.0)
parser (3.3.0.5)
ostruct (0.6.1)
parallel (1.26.3)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
pg (1.2.3)
Expand All @@ -127,9 +133,8 @@ GEM
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.1.0)
rackup (2.2.1)
rack (>= 3)
webrick (~> 1.8)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -142,75 +147,75 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rails-i18n (7.0.8)
rails-i18n (7.0.10)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.1.4.1)
actionpack (= 7.1.4.1)
activesupport (= 7.1.4.1)
railties (7.1.5)
actionpack (= 7.1.5)
activesupport (= 7.1.5)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.1)
rdoc (6.3.4.1)
regexp_parser (2.9.0)
reline (0.4.2)
regexp_parser (2.9.2)
reline (0.5.11)
io-console (~> 0.5)
rexml (3.3.9)
rubocop (1.60.2)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-performance (1.20.2)
rubocop-ast (1.36.1)
parser (>= 3.3.1.0)
rubocop-performance (1.23.0)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rails (2.23.1)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.27.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-graphviz (1.2.5)
rexml
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
securerandom (0.3.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov-html (0.13.1)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
spring (4.1.3)
sqlite3 (1.7.2)
spring (4.2.1)
sqlite3 (2.0.4)
mini_portile2 (~> 2.8.0)
sqlite3 (1.7.2-x86_64-linux)
sshkit (1.22.0)
mutex_m
sqlite3 (2.0.4-x86_64-linux-gnu)
sshkit (1.23.2)
base64
net-scp (>= 1.1.2)
net-sftp (>= 2.1.2)
net-ssh (>= 2.8.0)
ostruct
streamio-ffmpeg (3.0.2)
multi_json (~> 1.8)
swagger-blocks (3.0.0)
thor (1.3.0)
timeout (0.4.1)
thor (1.3.2)
timeout (0.4.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
webrick (1.8.2)
zeitwerk (2.6.13)
unicode-display_width (2.6.0)
zeitwerk (2.6.18)

PLATFORMS
ruby
Expand Down Expand Up @@ -240,7 +245,7 @@ DEPENDENCIES
simplecov
simplecov-lcov
spring
sqlite3
sqlite3 (~> 2.0.0)
streamio-ffmpeg
swagger-blocks

Expand Down
2 changes: 1 addition & 1 deletion app/models/access_code.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AccessCode < ApplicationRecord
before_validation :generate_code, on: :create

scope :list, -> { order(expires_at: :desc) }
scope :expired, -> { where('expires_at < ?', Time.zone.today) }
scope :expired, -> { where(expires_at: ...Time.zone.today) }

private

Expand Down
2 changes: 1 addition & 1 deletion app/models/archive_format.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class ArchiveFormat < ApplicationRecord

def priviledged_groups=(value)
value = value.join(',') if value.is_a?(Array)
super(value)
super
end

def priviledged_group_list
Expand Down
2 changes: 1 addition & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def admin?

def groups=(value)
value = value.join(',') if value.is_a?(Array)
super(value)
super
end

def group_list
Expand Down
2 changes: 1 addition & 1 deletion app/services/downgrade/action_handler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def pending_files
.joins(broadcast: { show: { profile: :archive_formats } })
.where(archive_formats: { id: action.archive_format_id })
.where('audio_files.codec = archive_formats.codec')
.where('broadcasts.started_at < ?', Time.zone.now - action.months.months)
.where(broadcasts: { started_at: ...(Time.zone.now - action.months.months) })
end

def handle(file)
Expand Down
2 changes: 1 addition & 1 deletion app/services/import/recording/composer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def convert_file_list(list)
converted = []
# use `each` instead of `map` to be able to close previously converted files
# if an error is raised in the middle of the list.
list.each { |file| converted << yield(file) }
list.each { |file| converted << yield(file) } # rubocop:disable Style/MapIntoArray
converted
rescue StandardError
close_files(converted)
Expand Down
1 change: 1 addition & 0 deletions config/initializers/inflections.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

# Be sure to restart your server when you modify this file.

# Add new inflection rules using the following format. Inflections
Expand Down
Loading

0 comments on commit d3d1c29

Please sign in to comment.