Skip to content

Commit d11289b

Browse files
committed
OTWO-7416 rails and ruby upgrade
1 parent 6700449 commit d11289b

File tree

381 files changed

+2224
-1238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

381 files changed

+2224
-1238
lines changed

.rubocop.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
require: rubocop-rails
1+
plugins:
2+
- rubocop-rails
23

34
Rails:
45
Enabled: true
56

67
AllCops:
7-
TargetRubyVersion: 2.6
8-
TargetRailsVersion: 5.0
8+
TargetRubyVersion: 3.1
9+
TargetRailsVersion: 6.1
910
NewCops: enable
1011
Exclude:
1112
- vagrant/**/*
1213
- script/*_temp.rb
1314

15+
SuggestExtensions: false
16+
1417
Rails/ActiveRecordAliases:
1518
Enabled: false
1619

@@ -100,3 +103,6 @@ Style/EmptyCaseCondition:
100103

101104
Rails/HttpPositionalArguments:
102105
Enabled: true
106+
107+
Naming/PredicateMethod:
108+
Enabled: false

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.9
1+
3.1.7

Gemfile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44
gem 'activeadmin'
5-
gem 'airbrake', '~> 5.5'
5+
gem 'airbrake', '~> 10.0.3'
66
gem 'aws-sdk', '~> 2.3'
77
gem 'bcrypt_pbkdf', '~> 1.0'
88
gem 'bootstrap_jt', '~> 0.1.0'
@@ -12,24 +12,25 @@ gem 'bunny'
1212
gem 'clearance'
1313
gem 'coffee-rails'
1414
gem 'coffee-script-source', '~>1.8.0'
15-
gem 'doorkeeper', '~> 4.4.0'
15+
gem 'doorkeeper', '~> 5.5'
1616
gem 'dotenv-rails'
1717
gem 'feedjira'
1818
gem 'font-awesome-rails'
19-
gem 'haml-rails', '~> 1.0'
19+
gem 'haml-rails', '~> 2.0'
2020
gem 'jbuilder'
2121
gem 'jmespath', '~> 1.6.1'
2222
gem 'jwt'
23-
gem 'mini_magick', '~> 4.9.4'
24-
gem 'nokogiri', '~> 1.13.10'
25-
gem 'oh_delegator'
23+
gem 'kt-paperclip', '~> 7.0'
24+
gem 'listen'
25+
gem 'mini_magick', '~> 5.2'
26+
gem 'nokogiri'
2627
gem 'open4'
27-
gem 'paperclip', '~> 5.3'
2828
gem 'pg'
29+
gem 'puma'
2930
gem 'rack', '~> 2.2.13'
30-
gem 'rails', '~> 5.2.8'
31+
gem 'rails', '~> 6.1.7.10'
3132
gem 'rails-html-sanitizer', '~> 1.4.3'
32-
gem 'ransack', github: 'activerecord-hackery/ransack'
33+
gem 'ransack'
3334
gem 'rbnacl', '~>3.2'
3435
gem 'rbnacl-libsodium'
3536
gem 'recaptcha', require: 'recaptcha/rails'
@@ -44,8 +45,9 @@ gem 'sql_tracker'
4445
gem 'statsd-instrument'
4546
gem 'thor'
4647
gem 'twitter-bootstrap-rails', '~> 3.2'
47-
gem 'tzinfo', '~> 1.2.10'
48+
gem 'tzinfo'
4849
gem 'uglifier', '>= 2.7.2'
50+
gem 'webrick'
4951
gem 'will_paginate'
5052
gem 'will_paginate-bootstrap'
5153

@@ -57,7 +59,7 @@ end
5759
group :test do
5860
gem 'haml_lint', '~> 0.21'
5961
gem 'minitest-rails'
60-
gem 'minitest-spec-rails'
62+
# gem 'minitest-spec-rails', '~> 6.0'
6163
gem 'mocha'
6264
gem 'rails-controller-testing'
6365
gem 'simplecov'

0 commit comments

Comments
 (0)