Skip to content

Commit

Permalink
Merge pull request #14440 from opf/code-maintenance/46647-bump-rails-…
Browse files Browse the repository at this point in the history 
…to-71

Code maintenance/46647 bump rails to 7.1
  • Loading branch information
@dombesz
dombesz authored Feb 1, 2024
2 parents 7e1e091 + 41cef95 commit 99cdf37
Show file tree
Hide file tree
Showing 142 changed files with 979 additions and 508 deletions.
30 changes: 15 additions & 15 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ gem 'activemodel-serializers-xml', '~> 1.0.1'
gem 'activerecord-import', '~> 1.5.0'
gem 'activerecord-session_store', '~> 2.1.0'
gem 'ox'
gem 'rails', '~> 7.0', '>= 7.0.3.1'
gem 'rails', '~> 7.1.3'
gem 'responders', '~> 3.0'

gem 'ffi', '~> 1.15'
Expand Down Expand Up @@ -71,7 +71,7 @@ gem 'typed_dag', '~> 2.0.2', require: false
gem 'addressable', '~> 2.8.0'

# Remove whitespace from model input
gem "auto_strip_attributes", "~> 2.5"
gem 'auto_strip_attributes', '~> 2.5'

# Provide timezone info for TZInfo used by AR
gem 'tzinfo-data', '~> 1.2023.1'
Expand Down Expand Up @@ -163,7 +163,7 @@ gem 'matrix', '~> 0.4.2'

gem 'meta-tags', '~> 2.20.0'

gem "paper_trail", "~> 12.3"
gem 'paper_trail', '~> 15.1.0'

group :production do
# we use dalli as standard memcache client
Expand All @@ -180,7 +180,7 @@ gem 'sprockets-rails', '~> 3.4.2'

gem 'puma', '~> 6.4'
gem 'puma-plugin-statsd', '~> 2.0'
gem 'rack-timeout', '~> 0.6.3', require: "rack/timeout/base"
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base'

gem 'nokogiri', '~> 1.16.0'

Expand All @@ -203,13 +203,13 @@ gem 'mini_magick', '~> 4.12.0', require: false
gem 'validate_url'

# Storages support code
gem "dry-container"
gem 'dry-container'

# ActiveRecord extension which adds typecasting to store accessors
gem "store_attribute", "~> 1.0"
gem 'store_attribute', '~> 1.0'

# Appsignal integration
gem "appsignal", "~> 3.0", require: false
gem 'appsignal', '~> 3.0', require: false

gem 'view_component'
# Lookbook
Expand All @@ -220,7 +220,7 @@ gem 'factory_bot', '~> 6.4.0', require: false
# require factory_bot_rails for convenience in core development
gem 'factory_bot_rails', '~> 6.4.0', require: false

gem 'turbo-rails', "~> 1.1"
gem 'turbo-rails', '~> 1.1'

gem 'httpx'

Expand All @@ -232,11 +232,11 @@ group :test do
# Test prof provides factories from code
# and other niceties
gem 'test-prof', '~> 1.3.0'
gem 'turbo_tests', github: "crohr/turbo_tests", ref: "fix/runtime-info"
gem 'turbo_tests', github: 'crohr/turbo_tests', ref: 'fix/runtime-info'

gem 'rack_session_access'
gem 'rspec', '~> 3.12.0'
# also add to development group, so "spec" rake task gets loaded
# also add to development group, so 'spec' rake task gets loaded
gem 'rspec-rails', '~> 6.1.0', group: :development

# Retry failures within the same environment
Expand Down Expand Up @@ -328,8 +328,8 @@ group :development, :test do
gem 'rubocop-rspec', require: false

# erb linting
gem "erb_lint", require: false
gem "erblint-github", require: false
gem 'erb_lint', require: false
gem 'erblint-github', require: false

# Brakeman scanner
gem 'brakeman', '~> 6.1.0'
Expand Down Expand Up @@ -380,6 +380,6 @@ gemfiles.each do |file|
send(:eval_gemfile, file) if File.readable?(file)
end

gem "openproject-octicons", '~>19.8.0'
gem "openproject-octicons_helper", '~>19.8.0'
gem "openproject-primer_view_components", '~>0.20.0'
gem 'openproject-octicons', '~>19.8.0'
gem 'openproject-octicons_helper', '~>19.8.0'
gem 'openproject-primer_view_components', '~>0.20.0'
156 changes: 87 additions & 69 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,66 +238,71 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
actioncable (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
actioncable (7.1.3)
actionpack (= 7.1.3)
activesupport (= 7.1.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
zeitwerk (~> 2.6)
actionmailbox (7.1.3)
actionpack (= 7.1.3)
activejob (= 7.1.3)
activerecord (= 7.1.3)
activestorage (= 7.1.3)
activesupport (= 7.1.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8)
actionpack (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activesupport (= 7.0.8)
actionmailer (7.1.3)
actionpack (= 7.1.3)
actionview (= 7.1.3)
activejob (= 7.1.3)
activesupport (= 7.1.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8)
actionview (= 7.0.8)
activesupport (= 7.0.8)
rack (~> 2.0, >= 2.2.4)
rails-dom-testing (~> 2.2)
actionpack (7.1.3)
actionview (= 7.1.3)
activesupport (= 7.1.3)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
actiontext (7.0.8)
actionpack (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
actiontext (7.1.3)
actionpack (= 7.1.3)
activerecord (= 7.1.3)
activestorage (= 7.1.3)
activesupport (= 7.1.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8)
activesupport (= 7.0.8)
actionview (7.1.3)
activesupport (= 7.1.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8)
activesupport (= 7.0.8)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.3)
activesupport (= 7.1.3)
globalid (>= 0.3.6)
activemodel (7.0.8)
activesupport (= 7.0.8)
activemodel (7.1.3)
activesupport (= 7.1.3)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (7.0.8)
activemodel (= 7.0.8)
activesupport (= 7.0.8)
activerecord (7.1.3)
activemodel (= 7.1.3)
activesupport (= 7.1.3)
timeout (>= 0.4.0)
activerecord-import (1.5.1)
activerecord (>= 4.2)
activerecord-nulldb-adapter (1.0.1)
Expand All @@ -309,17 +314,21 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 2.0.8, < 4)
railties (>= 6.1)
activestorage (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activesupport (= 7.0.8)
activestorage (7.1.3)
actionpack (= 7.1.3)
activejob (= 7.1.3)
activerecord (= 7.1.3)
activesupport (= 7.1.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8)
activesupport (7.1.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
acts_as_list (1.1.0)
activerecord (>= 4.2)
Expand Down Expand Up @@ -466,6 +475,8 @@ GEM
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
drb (2.2.0)
ruby2_keywords
dry-container (0.11.0)
concurrent-ruby (~> 1.0)
dry-core (1.0.1)
Expand Down Expand Up @@ -704,6 +715,7 @@ GEM
ruby2_keywords (~> 0.0.1)
mustermann-grape (1.0.2)
mustermann (>= 1.0.0)
mutex_m (0.2.0)
net-http (0.4.1)
uri
net-imap (0.4.9.1)
Expand Down Expand Up @@ -753,9 +765,9 @@ GEM
activemodel
os (1.1.4)
ox (2.14.17)
paper_trail (12.3.0)
activerecord (>= 5.2)
request_store (~> 1.1)
paper_trail (15.1.0)
activerecord (>= 6.1)
request_store (~> 1.4)
parallel (1.24.0)
parallel_tests (4.4.0)
parallel
Expand Down Expand Up @@ -831,26 +843,31 @@ GEM
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
rack-session (1.0.2)
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rack-timeout (0.6.3)
rack_session_access (0.2.0)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (7.0.8)
actioncable (= 7.0.8)
actionmailbox (= 7.0.8)
actionmailer (= 7.0.8)
actionpack (= 7.0.8)
actiontext (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activemodel (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.3)
actioncable (= 7.1.3)
actionmailbox (= 7.1.3)
actionmailer (= 7.1.3)
actionpack (= 7.1.3)
actiontext (= 7.1.3)
actionview (= 7.1.3)
activejob (= 7.1.3)
activemodel (= 7.1.3)
activerecord (= 7.1.3)
activestorage (= 7.1.3)
activesupport (= 7.1.3)
bundler (>= 1.15.0)
railties (= 7.0.8)
railties (= 7.1.3)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -865,13 +882,14 @@ GEM
rails-i18n (7.0.8)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
method_source
railties (7.1.3)
actionpack (= 7.1.3)
activesupport (= 7.1.3)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rb-fsevent (0.11.2)
Expand Down Expand Up @@ -1220,7 +1238,7 @@ DEPENDENCIES
openproject-xls_export!
overviews!
ox
paper_trail (~> 12.3)
paper_trail (~> 15.1.0)
parallel_tests (~> 4.0)
pdf-inspector (~> 1.2)
pg (~> 1.5.0)
Expand All @@ -1240,7 +1258,7 @@ DEPENDENCIES
rack-test (~> 2.1.0)
rack-timeout (~> 0.6.3)
rack_session_access
rails (~> 7.0, >= 7.0.3.1)
rails (~> 7.1.3)
rails-controller-testing (~> 1.0.2)
rails-i18n (~> 7.0.0)
rdoc (>= 2.4.2)
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

require File.expand_path('config/application', __dir__)

OpenProject::Application.load_rake_tasks
Rails.application.load_rake_tasks

Rake::Task[:default].clear
task default: 'test:suite:run'
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ def pick_layout(*args)
end

def default_breadcrumb
label = "label_#{self.class.name.gsub('Controller', '').underscore.singularize}"
label = "label_#{controller_name.singularize}"

I18n.t(label + '_plural',
default: label.to_sym)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/repositories_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class RepositoriesController < ApplicationController

before_action :find_project_by_project_id
before_action :authorize
before_action :find_repository, except: %i[edit update create destroy destroy_info]
before_action :find_repository, except: %i[update create destroy destroy_info]
accept_key_auth :revisions

rescue_from OpenProject::SCM::Exceptions::SCMError, with: :show_error_command_failed
Expand Down
Loading

0 comments on commit 99cdf37

Please sign in to comment.