Skip to content

OTWO-7416 Rails 6 upgrade for OhlohUI #1823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
DB_ENCODING = SQL_ASCII
DB_SEARCH_PATH = 'oh,oa,fis,public'
DB_SCHEMAS = oh,oa,fis
ANALYTICS_SCHEMA = oa
Expand Down
12 changes: 9 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
require: rubocop-rails
plugins:
- rubocop-rails

Rails:
Enabled: true

AllCops:
TargetRubyVersion: 2.6
TargetRailsVersion: 5.0
TargetRubyVersion: 3.1
TargetRailsVersion: 6.1
NewCops: enable
Exclude:
- vagrant/**/*
- script/*_temp.rb

SuggestExtensions: false

Rails/ActiveRecordAliases:
Enabled: false

Expand Down Expand Up @@ -100,3 +103,6 @@ Style/EmptyCaseCondition:

Rails/HttpPositionalArguments:
Enabled: true

Naming/PredicateMethod:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.9
3.1.7
26 changes: 14 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

source 'https://rubygems.org'
gem 'activeadmin'
gem 'airbrake', '~> 5.5'
gem 'aws-sdk', '~> 2.3'
gem 'airbrake', '~> 10.0.3'
gem 'aws-sdk', '~> 3'
gem 'bcrypt_pbkdf', '~> 1.0'
gem 'bootstrap_jt', '~> 0.1.0'
gem 'brakeman', '>= 4.7.1'
Expand All @@ -12,24 +12,25 @@ gem 'bunny'
gem 'clearance'
gem 'coffee-rails'
gem 'coffee-script-source', '~>1.8.0'
gem 'doorkeeper', '~> 4.4.0'
gem 'doorkeeper', '~> 5.5'
gem 'dotenv-rails'
gem 'feedjira'
gem 'font-awesome-rails'
gem 'haml-rails', '~> 1.0'
gem 'haml-rails', '~> 2.0'
gem 'jbuilder'
gem 'jmespath', '~> 1.6.1'
gem 'jwt'
gem 'mini_magick', '~> 4.9.4'
gem 'nokogiri', '~> 1.13.10'
gem 'oh_delegator'
gem 'kt-paperclip', '~> 7.0'
gem 'listen'
gem 'mini_magick', '~> 5.2'
gem 'nokogiri'
gem 'open4'
gem 'paperclip', '~> 5.3'
gem 'pg'
gem 'puma'
gem 'rack', '~> 2.2.13'
gem 'rails', '~> 5.2.8'
gem 'rails', '~> 6.1.7.10'
gem 'rails-html-sanitizer', '~> 1.4.3'
gem 'ransack', github: 'activerecord-hackery/ransack'
gem 'ransack'
gem 'rbnacl', '~>3.2'
gem 'rbnacl-libsodium'
gem 'recaptcha', require: 'recaptcha/rails'
Expand All @@ -44,8 +45,9 @@ gem 'sql_tracker'
gem 'statsd-instrument'
gem 'thor'
gem 'twitter-bootstrap-rails', '~> 3.2'
gem 'tzinfo', '~> 1.2.10'
gem 'tzinfo'
gem 'uglifier', '>= 2.7.2'
gem 'webrick'
gem 'will_paginate'
gem 'will_paginate-bootstrap'

Expand All @@ -57,7 +59,7 @@ end
group :test do
gem 'haml_lint', '~> 0.21'
gem 'minitest-rails'
gem 'minitest-spec-rails'
# gem 'minitest-spec-rails', '~> 6.0'
gem 'mocha'
gem 'rails-controller-testing'
gem 'simplecov'
Expand Down
Loading