Skip to content

Commit

Permalink
Merge pull request #8431 from SuperTux88/gem-updates
Browse files Browse the repository at this point in the history 
Updating all ruby dependencies to current versions
  • Loading branch information
@SuperTux88
SuperTux88 committed Jun 28, 2023
2 parents 6288fe3 + 7a8e1fe commit 040e1dc
Show file tree
Hide file tree
Showing 9 changed files with 418 additions and 405 deletions.
9 changes: 7 additions & 2 deletions .rubocop.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require: rubocop-rails

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
NewCops: enable
Exclude:
- "bin/**/*"
Expand Down Expand Up @@ -39,7 +39,7 @@ Metrics/PerceivedComplexity:

# Some blocks are longer.
Metrics/BlockLength:
ExcludedMethods:
AllowedMethods:
- "namespace"
- "create_table"
Exclude:
Expand Down Expand Up @@ -168,6 +168,11 @@ Style/Documentation:
Naming/BinaryOperatorParameterName:
Enabled: false

# Defining constants in tests is fine, and it's good to have them close to the test where they are used.
Lint/ConstantDefinitionInBlock:
Exclude:
- "spec/**/*"

# There are valid cases, for example debugging Cucumber steps,
# also they'll fail CI anyway
Lint/Debugger:
Expand Down
107 changes: 54 additions & 53 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", "6.1.6.1"
gem "rails", "6.1.7.4"

# needed for actionmailer, can be removed when upgrading to rails 7
gem "net-imap", require: false
Expand All @@ -11,60 +11,60 @@ gem "net-smtp", require: false

# Legacy Rails features, remove me!
# responders (class level)
gem "responders", "3.0.1"
gem "responders", "3.1.0"

# Appserver

gem "puma", "5.6.5", require: false
gem "puma", "6.3.0", require: false

# Federation

gem "diaspora_federation-json_schema", "1.0.1"
gem "diaspora_federation-rails", "1.0.1"
gem "diaspora_federation-json_schema", "1.1.0"
gem "diaspora_federation-rails", "1.1.0"

# API and JSON

gem "acts_as_api", "1.0.1"
gem "json", "2.6.2"
gem "json-schema", "3.0.0"
gem "json", "2.6.3"
gem "json-schema", "4.0.0"
gem "yajl-ruby", "1.4.3"

# Authentication

gem "devise", "4.8.1"
gem "devise", "4.9.2"
gem "devise_lastseenable", "0.0.6"
gem "devise-two-factor", "4.0.2"
gem "rqrcode", "2.1.1"
gem "devise-two-factor", "4.1.0"
gem "rqrcode", "2.2.0"

# Captcha

gem "simple_captcha2", "0.5.0", require: "simple_captcha"

# Background processing

gem "redis", "4.7.0"
gem "sidekiq", "6.5.1"
gem "redis-client", "0.14.1"
gem "sidekiq", "7.1.2"

# Scheduled processing

gem "sidekiq-cron", "1.6.0"
gem "sidekiq-cron", "1.10.1"

# Compression

gem "terser", "1.1.10"
gem "terser", "1.1.16"

# Configuration

gem "configurate", "0.5.0"
gem "toml-rb", "2.1.2"
gem "toml-rb", "2.2.0"

# Cross-origin resource sharing

gem "rack-cors", "1.1.1", require: "rack/cors"
gem "rack-cors", "2.0.1", require: "rack/cors"

# CSS

gem "autoprefixer-rails", "10.4.7.0"
gem "autoprefixer-rails", "10.4.13.0"
gem "bootstrap-sass", "3.4.1"
gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691
gem "sassc-rails", "2.1.2"
Expand All @@ -73,19 +73,19 @@ gem "sprockets-rails", "3.4.2"
# Database

group :mysql, optional: true do
gem "mysql2", "0.5.4"
gem "mysql2", "0.5.5"
end
group :postgresql, optional: true do
gem "pg", "1.4.1"
gem "pg", "1.5.3"
end

gem "activerecord-import", "1.4.0"
gem "activerecord-import", "1.4.1"

# File uploading

gem "carrierwave", "2.2.4"
gem "fog-aws", "3.14.0"
gem "mini_magick", "4.11.0"
gem "fog-aws", "3.19.0"
gem "mini_magick", "4.12.0"

# GUID generation
gem "uuid", "2.3.9"
Expand All @@ -97,21 +97,21 @@ gem "handlebars_assets", "0.23.9"
gem "jquery-rails", "4.5.0"
gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.2.0"
gem "js-routes", "2.2.4"
gem "js-routes", "2.2.5"

# Localization

gem "http_accept_language", "2.1.1"
gem "rails-i18n", "6.0.0"
gem "rails-i18n", "7.0.7"

# Map
gem "leaflet-rails", "1.7.0"
gem "leaflet-rails", "1.9.3"

# Parsing

gem "nokogiri", "1.13.7"
gem "nokogiri", "1.15.2"
gem "open_graph_reader", "0.7.2" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb
gem "redcarpet", "3.5.1"
gem "redcarpet", "3.6.0"
gem "ruby-oembed", "0.16.1"
gem "twitter-text", "3.1.0"

Expand All @@ -121,43 +121,44 @@ gem "string-direction", "1.2.2"

# Security Headers

gem "secure_headers", "6.3.3"
gem "secure_headers", "6.5.0"

# Services

gem "omniauth", "2.1.0"
gem "omniauth", "2.1.1"
gem "omniauth-rails_csrf_protection", "1.0.1"
gem "omniauth-tumblr", "1.2"
gem "omniauth-twitter", "1.4.0"
gem "omniauth-wordpress", "0.2.2"
gem "twitter", "7.0.0"
gem "twitter", "8.0.0"

# OpenID Connect
gem "openid_connect", "1.3.0"
gem "openid_connect", "2.2.0"

# Serializers

gem "active_model_serializers", "0.9.8"
gem "active_model_serializers", "0.9.9"

# Tags

gem "acts-as-taggable-on", "9.0.1"

# URIs and HTTP

gem "addressable", "2.8.0", require: "addressable/uri"
gem "faraday", "1.10.0"
gem "addressable", "2.8.4", require: "addressable/uri"
gem "faraday", "2.7.7"
gem "faraday-cookie_jar", "0.0.7"
gem "faraday-follow_redirects", "0.3.0"
gem "faraday-typhoeus", "1.0.0", require: false
gem "typhoeus", "1.4.0"

# Views

gem "gon", "6.4.0"
gem "hamlit", "2.16.0"
gem "hamlit", "3.0.3"
gem "mobile-fu", "1.4.0"
gem "rails-timeago", "2.20.0"
gem "will_paginate", "3.3.1"
gem "will_paginate", "4.0.0"

# Logging

Expand All @@ -172,7 +173,7 @@ gem "rubyzip", "2.3.2", require: "zip"
# https://github.com/gitlabhq/gitlabhq/issues/3826
# https://github.com/gitlabhq/gitlabhq/pull/3852
# https://github.com/discourse/discourse/pull/238
gem "minitest", "5.15.0"
gem "minitest", "5.18.1"

gem "versionist", "2.0.1"

Expand All @@ -193,30 +194,30 @@ group :production do # we don"t install these on travis to speed up test runs

# Third party asset hosting

gem "asset_sync", "2.15.2", require: false
gem "asset_sync", "2.18.0", require: false
end

group :development do
# Linters
gem "haml_lint", "0.40.0", require: false
gem "pronto", "0.11.0", require: false
gem "pronto-eslint", "0.11.0", require: false
gem "haml_lint", "0.46.0", require: false
gem "pronto", "0.11.1", require: false
gem "pronto-eslint", "0.11.1", require: false
gem "pronto-haml", "0.11.1", require: false
gem "pronto-rubocop", "0.11.1", require: false
gem "pronto-rubocop", "0.11.5", require: false
gem "pronto-scss", "0.11.0", require: false
gem "rubocop", "0.93.1", require: false
gem "rubocop-rails", "2.9.1", require: false
gem "rubocop", "1.53.1", require: false
gem "rubocop-rails", "2.20.2", require: false

# Debugging
gem "pry"
gem "pry-byebug"

# test coverage
gem "simplecov", "0.21.2", require: false
gem "simplecov", "0.22.0", require: false

gem "turbo_dev_assets", "0.0.2"

gem "listen", "3.7.1"
gem "listen", "3.8.0"
end

group :test do
Expand All @@ -230,26 +231,26 @@ group :test do

gem "capybara", "3.39.2"
gem "cuprite", "0.14.3"
gem "database_cleaner-active_record", "2.0.1"
gem "database_cleaner-active_record", "2.1.0"

gem "cucumber-api-steps", "0.14", require: false

# General helpers

gem "factory_bot_rails", "6.2.0"
gem "shoulda-matchers", "4.5.1"
gem "timecop", "0.9.5"
gem "webmock", "3.14.0", require: false
gem "shoulda-matchers", "5.3.0"
gem "timecop", "0.9.6"
gem "webmock", "3.18.1", require: false

gem "diaspora_federation-test", "1.0.1"
gem "diaspora_federation-test", "1.1.0"
end

group :development, :test do
# RSpec (unit tests, some integration tests)
gem "rspec-rails", "5.1.2"
gem "rspec-rails", "6.0.3"

# Cucumber (integration tests)
gem "cucumber-rails", "2.5.1", require: false
gem "cucumber-rails", "2.6.1", require: false

# Jasmine (client side application tests (JS))
gem "chrome_remote", "0.3.0"
Expand Down

0 comments on commit 040e1dc

Please sign in to comment.