Skip to content

Commit

Permalink
Merge branch 'release/0.41.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbp
gbp committed Jul 8, 2022
2 parents 55bdd3a + 5d4ae48 commit 152d22a
Show file tree
Hide file tree
Showing 26 changed files with 219 additions and 601 deletions.
18 changes: 15 additions & 3 deletions .ruby-style.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ Bundler/OrderedGems:

#################### Gemspec ####################

Gemspec/DateAssignment:
Enabled: false

Gemspec/DependencyVersion:
Enabled: false

Expand Down Expand Up @@ -234,6 +231,12 @@ Layout/LeadingCommentSpace:
Layout/LeadingEmptyLines:
Enabled: false

Layout/LineContinuationLeadingSpace:
Enabled: false

Layout/LineContinuationSpacing:
Enabled: false

Layout/LineEndStringConcatenationIndentation:
Enabled: false

Expand Down Expand Up @@ -422,6 +425,9 @@ Lint/CircularArgumentReference:
Lint/ConstantDefinitionInBlock:
Enabled: false

Lint/ConstantOverwrittenInRescue:
Enabled: false

Lint/ConstantResolution:
Enabled: false

Expand Down Expand Up @@ -575,6 +581,9 @@ Lint/NextWithoutAccumulator:
Lint/NoReturnInBeginEndBlocks:
Enabled: false

Lint/NonAtomicFileOperation:
Enabled: false

Lint/NonDeterministicRequireOrder:
Enabled: false

Expand Down Expand Up @@ -749,6 +758,9 @@ Lint/UselessAccessModifier:
Lint/UselessAssignment:
Enabled: false

Lint/UselessElseWithoutRescue:
Enabled: false

Lint/UselessMethodDefinition:
Enabled: false

Expand Down
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ gem 'maxmind-db', '~> 1.0.0'
gem 'mahoro', '~> 0.5'
gem 'nokogiri', '~> 1.13.6'
gem 'open4', '~> 1.3.0'
gem 'rack', '~> 2.2.3'
gem 'rack', '~> 2.2.4'
gem 'rack-utf8_sanitizer', '~> 1.7.0'
gem 'recaptcha', '~> 5.10.0', require: 'recaptcha/rails'
gem 'mini_magick', '~> 4.11.0'
gem 'rolify', '~> 5.3.0'
gem 'ruby-msg', '~> 1.5.0', :git => 'https://github.com/mysociety/ruby-msg.git', :branch => 'ascii-encoding'
gem 'rubyzip', '~> 2.3.2'
gem 'secure_headers', '~> 6.3.3'
gem 'secure_headers', '~> 6.3.4'
gem 'statistics2', '~> 0.54'
if rails_upgrade?
gem 'strip_attributes', :git => 'https://github.com/mysociety/strip_attributes.git', :branch => 'globalize3-rails7'
Expand All @@ -142,7 +142,7 @@ gem 'gender_detector', '~> 2.0.0'

# Gems related to internationalisation
gem 'i18n', '~> 1.10.0'
gem 'rails-i18n', '~> 7.0.3'
gem 'rails-i18n', '~> 7.0.5'
gem 'gettext_i18n_rails', '~> 1.8.1'
gem 'fast_gettext', '~> 2.2.0'
gem 'gettext', '~> 3.4.3'
Expand All @@ -168,7 +168,7 @@ gem 'alaveteli_features', :path => 'gems/alaveteli_features'
# Storage backends
gem 'aws-sdk-s3', require: false
gem 'azure-storage', require: false
gem 'google-cloud-storage', '~> 1.36', require: false
gem 'google-cloud-storage', '~> 1.37', require: false

if rails_upgrade? && RUBY_VERSION < '3.1'
gem 'net-http', '0.1.1'
Expand Down Expand Up @@ -204,7 +204,7 @@ group :development do
gem 'launchy', '< 2.5.0'
gem 'listen', '>= 3.0.5', '< 3.7.2'
gem 'web-console', '>= 3.3.0'
gem 'rubocop', '~> 1.30.1', require: false
gem 'rubocop', '~> 1.31.1', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rails', require: false
end
51 changes: 26 additions & 25 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ GEM
activerecord (>= 4.2, < 7.1)
request_store (~> 1.0)
gnuplot (2.6.2)
google-apis-core (0.4.2)
google-apis-core (0.7.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -226,25 +226,25 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.10.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-storage_v1 (0.13.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-iamcredentials_v1 (0.13.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-storage_v1 (0.17.0)
google-apis-core (>= 0.7, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.2.0)
google-cloud-storage (1.36.2)
google-cloud-storage (1.37.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.1.3)
googleauth (1.2.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
Expand All @@ -271,7 +271,7 @@ GEM
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (2.6.2)
jwt (2.3.0)
jwt (2.4.1)
launchy (2.4.3)
addressable (~> 2.3)
libv8-node (16.10.0.0)
Expand All @@ -298,11 +298,11 @@ GEM
mini_portile2 (2.8.0)
mini_racer (0.6.2)
libv8-node (~> 16.10.0.0)
minitest (5.16.1)
minitest (5.16.2)
money (6.16.0)
i18n (>= 0.6.4, <= 2)
multi_json (1.15.0)
multipart-post (2.1.1)
multipart-post (2.2.3)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
Expand Down Expand Up @@ -338,9 +338,9 @@ GEM
pry (~> 0.13.0)
public_suffix (4.0.7)
racc (1.6.0)
rack (2.2.3.1)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
rack-utf8_sanitizer (1.7.0)
rack (>= 1.0, < 3.0)
rails (6.1.6)
Expand All @@ -365,9 +365,9 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rails-i18n (7.0.3)
rails-i18n (7.0.5)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (6.1.6)
Expand All @@ -384,7 +384,7 @@ GEM
recaptcha (5.10.0)
json
regexp_parser (2.5.0)
representable (3.1.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
Expand Down Expand Up @@ -418,7 +418,8 @@ GEM
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.11.0)
rubocop (1.30.1)
rubocop (1.31.1)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0)
Expand Down Expand Up @@ -446,10 +447,10 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
secure_headers (6.3.3)
signet (0.16.1)
secure_headers (6.3.4)
signet (0.17.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.0)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simplecov (0.17.1)
Expand Down Expand Up @@ -539,7 +540,7 @@ DEPENDENCIES
gettext_i18n_rails (~> 1.8.1)
globalize (~> 6.2.1)
gnuplot (~> 2.6.0)
google-cloud-storage (~> 1.36)
google-cloud-storage (~> 1.37)
holidays (~> 8.5.0)
htmlentities (~> 4.3.0)
i18n (~> 1.10.0)
Expand All @@ -566,23 +567,23 @@ DEPENDENCIES
pg (~> 1.4.1)
pry (~> 0.13.0)
pry-byebug (~> 3.9.0)
rack (~> 2.2.3)
rack (~> 2.2.4)
rack-utf8_sanitizer (~> 1.7.0)
rails (~> 6.1.6)
rails-controller-testing
rails-i18n (~> 7.0.3)
rails-i18n (~> 7.0.5)
recaptcha (~> 5.10.0)
rolify (~> 5.3.0)
routing-filter (~> 0.7.0)
rspec-activemodel-mocks (~> 1.1.0)
rspec-rails (~> 5.1.2)
rubocop (~> 1.30.1)
rubocop (~> 1.31.1)
rubocop-performance
rubocop-rails
ruby-msg (~> 1.5.0)!
rubyzip (~> 2.3.2)
sass-rails (~> 5.0.8)
secure_headers (~> 6.3.3)
secure_headers (~> 6.3.4)
simplecov (~> 0.17.1)
simplecov-lcov (~> 0.7.0)
statistics2 (~> 0.54)
Expand Down

0 comments on commit 152d22a

Please sign in to comment.