Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert "Release R2.6.0 FY24Q4.6.0" #1709

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Revert "Release R2.6.0 FY24Q4.6.0" #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AllCops:
TargetRubyVersion: 2.5
TargetRailsVersion: 5.1
TargetRubyVersion: 2.3
TargetRailsVersion: 4.2
Include:
- '**/config.ru'
- '**/Rakefile'
Expand All @@ -12,6 +12,28 @@ AllCops:
- 'script/**/*'
- 'vendor/**/*'

Rails/Output:
Exclude:
- 'lib/**/*.rb'

Rails/SkipsModelValidations:
Enabled: false

Rails/FilePath:
Enabled: false

Rails/HasManyOrHasOneDependent:
Enabled: false

Rails/UnknownEnv:
Enabled: false

Rails/OutputSafety:
Enabled: false

Rails/InverseOf:
Enabled: false

Style/GuardClause:
Enabled: false

Expand All @@ -30,7 +52,7 @@ Style/Documentation:
Style/FrozenStringLiteralComment:
Enabled: false

Layout/LineLength:
Metrics/LineLength:
Max: 200

Metrics/BlockLength:
Expand All @@ -48,6 +70,9 @@ Metrics/AbcSize:
Style/DoubleNegation:
Enabled: false

Rails:
Enabled: true

Style/NegatedIf:
Enabled: false

Expand All @@ -57,6 +82,9 @@ Naming/FileName:
Naming/HeredocDelimiterNaming:
Enabled: false

Rails/DynamicFindBy:
Enabled: false

Style/TrailingCommaInArrayLiteral:
Enabled: false

Expand Down
5 changes: 3 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ gem "opentelemetry-instrumentation-redis", require: false

gem "omniauth-saml-va", git: "https://github.com/department-of-veterans-affairs/omniauth-saml-va", branch: "pek-iam-ssoi"
#gem "omniauth-saml-va", git: "https://github.com/department-of-veterans-affairs/omniauth-saml-va", ref: "fbe2b878c250b14ee996ef6699c42df2c42e41a1"
gem "pg", "~> 1.5.7", platforms: :ruby
gem "pg", "~> 1.1.0", platforms: :ruby
gem "puma", "5.6.4"
gem "rack-cors", ">= 1.0.4"
gem "rails", "6.1.7.4"
Expand All @@ -62,6 +62,7 @@ gem "rubyzip", ">= 1.3.0"
gem "sass-rails", "~> 5.0"
gem "sentry-raven"
gem "shoryuken", "3.1.11"
gem "therubyracer", platforms: :ruby
gem "turbolinks"
gem "uswds-rails", git: "https://github.com/18F/uswds-rails-gem.git"
gem "wannabe_bool"
Expand All @@ -78,7 +79,7 @@ group :development, :test do
gem "dotenv-rails"
gem "pry"
gem "pry-byebug"
gem "rubocop", "= 0.83", require: false
gem "rubocop", "~> 0.67.2", require: false
gem "scss_lint", require: false
end

Expand Down
32 changes: 20 additions & 12 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ GEM
akami (1.3.1)
gyoku (>= 0.4.0)
nokogiri
ast (2.4.2)
ast (2.4.1)
aws-eventstream (1.1.0)
aws-partitions (1.942.0)
aws-sdk-core (3.131.0)
Expand Down Expand Up @@ -272,6 +272,7 @@ GEM
socksify
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
jbuilder (2.10.1)
activesupport (>= 5.0.0)
jmespath (1.4.0)
Expand All @@ -282,6 +283,7 @@ GEM
jsonapi-renderer (0.2.2)
launchy (2.5.0)
addressable (~> 2.7)
libv8 (3.16.14.19)
listen (3.4.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand Down Expand Up @@ -425,18 +427,18 @@ GEM
opentelemetry-semantic_conventions
opentelemetry-semantic_conventions (1.10.0)
opentelemetry-api (~> 1.0)
parallel (1.26.2)
parser (3.3.5.0)
parallel (1.20.1)
parser (3.0.0.0)
ast (~> 2.4.1)
racc
pg (1.5.7)
pg (1.1.4)
pkcs11 (0.3.3)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
psych (3.3.0)
public_suffix (5.1.1)
puma (5.6.4)
nio4r (~> 2.0)
Expand Down Expand Up @@ -504,6 +506,7 @@ GEM
redis
redis-store (1.9.0)
redis (>= 4, < 5)
ref (2.0.0)
regexp_parser (2.8.3)
request_store (1.5.0)
rack (>= 1.4)
Expand Down Expand Up @@ -534,14 +537,15 @@ GEM
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.10.1)
rubocop (0.83.0)
rubocop (0.67.2)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.7.0.1)
parser (>= 2.5, != 2.5.1.1)
psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0)
rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
ruby-progressbar (1.13.0)
unicode-display_width (>= 1.4.0, < 1.6)
ruby-progressbar (1.11.0)
ruby-saml (1.12.2)
nokogiri (>= 1.10.5)
rexml
Expand Down Expand Up @@ -602,6 +606,9 @@ GEM
statsd-instrument (3.7.0)
strscan (3.1.0)
systemu (2.6.5)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (1.3.1)
tilt (2.0.11)
timecop (0.9.2)
Expand Down Expand Up @@ -702,7 +709,7 @@ DEPENDENCIES
opentelemetry-instrumentation-rake
opentelemetry-instrumentation-redis
opentelemetry-sdk
pg (~> 1.5.7)
pg (~> 1.1.0)
pry
pry-byebug
puma (= 5.6.4)
Expand All @@ -718,7 +725,7 @@ DEPENDENCIES
rspec-github
rspec-rails
rspec-retry
rubocop (= 0.83)
rubocop (~> 0.67.2)
ruby_claim_evidence_api!
rubyzip (>= 1.3.0)
saml_idp!
Expand All @@ -731,6 +738,7 @@ DEPENDENCIES
single_cov
sniffybara!
statsd-instrument
therubyracer
timecop
turbolinks
tzinfo-data
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
require File.expand_path("config/application", __dir__)

# Load rake support files
Dir[Rails.root.join("lib/tasks/support/**/*.rb")].sort.each { |f| require f }
Dir[Rails.root.join("lib/tasks/support/**/*.rb")].each { |f| require f }

Rails.application.load_tasks
Loading