Skip to content

Commit

Permalink
Merge pull request #781 from bcgov/release/0.5.4
Browse files Browse the repository at this point in the history
Release/0.5.4
  • Loading branch information
bkmaibach authored Nov 26, 2024
2 parents 6ccd1a3 + 88b58ca commit 0777e5e
Show file tree
Hide file tree
Showing 396 changed files with 9,259 additions and 3,535 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# .dockerignore

.env
File renamed without changes.
25 changes: 25 additions & 0 deletions .env_example.docker_compose
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#THIS IS THE BAREBONES .ENV TO RUN DOCKER NOT INCLUDING THE RELATED SERVICES DEFINED IN DOCKER_COMPOSE.YML
#OTHER SERVICES LIKE EMAIL / STORAGE / COMPLIANCE PLEASE ADD AS REQUIRED

KEYCLOAK_SECRET=
KEYCLOAK_CLIENT=
KEYCLOAK_AUTH_URL=

FROM_EMAIL="no-reply@bc.gov.ca"
SESSION_TIMEOUT_MINUTES=360

# Step code - You can remove this if you are forking the repo, but need to remove subsequent step cod related features.
MIN_ENERGY_STEP=3
MAX_ENERGY_STEP=5
MIN_ZERO_CARBON_STEP=1
MAX_ZERO_CARBON_STEP=4

# Dev Only, we disable compliance checks by default
RUN_COMPLIANCE_ON_SAVE=false

VITE_BCEID_URL="https://www.development.bceid.ca"
VITE_BASIC_BCEID_REGISTRATION_URL="https://www.development.bceid.ca/register/basic/account_details.aspx?type=regular&eServiceType=basic"
VITE_BUSINESS_BCEID_REGISTRATION_URL="https://www.development.bceid.ca/register/business/getting_started/getting_started.aspx"
VITE_SITEMINDER_LOGOUT_URL="https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi"
VITE_KEYCLOAK_LOGOUT_URL="https://dev.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/logout"
VITE_POST_LOGOUT_REDIRECT_URL='http://localhost:3000'
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
db/templates/Core[[:space:]]Permit[[:space:]]Requirements[[:space:]]List.xlsx filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text

# Force LF line endings for all Ruby files
*.rb text eol=lf

# Force LF line endings for shell scripts
*.sh text eol=lf

# Force LF line endings for all files in the bin directory
bin/* text eol=lf

# Automatically normalize text files
* text=auto
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ jobs:
uses: actions/checkout@v3
with:
lfs: true
- name: Set up Ruby 3.2.2
- name: Set up Ruby 3.2.5
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.2"
ruby-version: "3.2.5"
- name: Install Dependencies
run: |
bundle install
Expand Down
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
# Ignore auto-generated files
db/schema.rb
7 changes: 1 addition & 6 deletions .prettierrc.mjs
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
export default {
plugins: ["prettier-plugin-organize-imports", "@prettier/plugin-ruby"],
plugins: ["prettier-plugin-organize-imports"],
printWidth: 120,
requirePragma: false,
rubyArrayLiteral: true,
rubyHashLabel: true,
rubyModifier: true,
rubySingleQuote: false,
rubyToProc: true,
tabWidth: 2,
trailingComma: "es5",
semi: false,
Expand Down
171 changes: 171 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
AllCops:
DisplayCopNames: true
DisplayStyleGuide: true
NewCops: enable
SuggestExtensions: false
TargetRubyVersion: 3.2
Exclude:
- "{.git,.github,.ruby-lsp,bin,coverage,doc,pkg,sorbet,spec,test/fixtures,vendor,tmp}/**/*"
- test.rb

Gemspec/DevelopmentDependencies:
Enabled: false

Layout/LineLength:
Max: 80

Lint/AmbiguousBlockAssociation:
Enabled: false

Lint/AmbiguousOperatorPrecedence:
Enabled: false

Lint/AmbiguousRange:
Enabled: false

Lint/BooleanSymbol:
Enabled: false

Lint/Debugger:
Enabled: false

Lint/DuplicateBranch:
Enabled: false

Lint/EmptyBlock:
Enabled: false

Lint/InterpolationCheck:
Enabled: false

Lint/MissingSuper:
Enabled: false

Lint/NonLocalExitFromIterator:
Enabled: false

Lint/RedundantRequireStatement:
Enabled: false

Lint/RescueException:
Enabled: false

Lint/SuppressedException:
Enabled: false

Lint/UnderscorePrefixedVariableName:
Enabled: false

Lint/UnusedMethodArgument:
AllowUnusedKeywordArguments: true

Metrics:
Enabled: false

Naming/MethodName:
Enabled: false

Naming/MethodParameterName:
Enabled: false

Naming/RescuedExceptionsVariableName:
PreferredName: error

Naming/VariableNumber:
Enabled: false

Security/Eval:
Enabled: false

Style/AccessorGrouping:
Enabled: false

Style/Alias:
Enabled: false

Style/CaseEquality:
Enabled: false

Style/CaseLikeIf:
Enabled: false

Style/ClassVars:
Enabled: false

Style/CombinableLoops:
Enabled: false

Style/DocumentDynamicEvalDefinition:
Enabled: false

Style/Documentation:
Enabled: false

Style/EndBlock:
Enabled: false

Style/ExplicitBlockArgument:
Enabled: false

Style/FormatString:
Enabled: false

Style/FormatStringToken:
Enabled: false

Style/GuardClause:
Enabled: false

Style/HashLikeCase:
Enabled: false

Style/IdenticalConditionalBranches:
Enabled: false

Style/IfInsideElse:
Enabled: false

Style/IfWithBooleanLiteralBranches:
Enabled: false

Style/KeywordParametersOrder:
Enabled: false

Style/MissingRespondToMissing:
Enabled: false

Style/MutableConstant:
Enabled: false

Style/NegatedIfElseCondition:
Enabled: false

Style/Next:
Enabled: false

Style/NumericPredicate:
Enabled: false

Style/ParallelAssignment:
Enabled: false

Style/PerlBackrefs:
Enabled: false

Style/RedundantArrayConstructor:
Enabled: false

Style/SafeNavigation:
Enabled: false

Style/SpecialGlobalVars:
Enabled: false

Style/StructInheritance:
Enabled: false

Style/YodaExpression:
Enabled: false

Style/StringLiterals:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.2.5
2 changes: 2 additions & 0 deletions .streeignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore auto-generated files
db/schema.rb
10 changes: 9 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,13 @@
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"rubyLsp.formatter": "syntax_tree"
"rubyLsp.formatter": "syntax_tree",
"ruby.useBundler": true,
"ruby.lint": {
"rubocop": {
"useBundler": true,
"lint": true,
"rails": true
}
}
}
9 changes: 6 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source "https://rubygems.org"

ruby "3.2.2"
ruby "3.2.5"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.1.3.1"
gem "rails", "~> 7.1.4.1"

# Use postgresql as the database for Active Record
gem "pg", "~> 1.1"
Expand Down Expand Up @@ -117,7 +117,10 @@ group :development do
gem "syntax_tree-haml", "~> 4.0"
gem "syntax_tree-rbs", "~> 1.0"
gem "letter_opener", "~> 1.8"
gem 'rails-erd', '~> 1.5'
gem "rails-erd", "~> 1.5"
gem "rubocop", "~> 1.67", require: false
gem "rubocop-rails", "~> 2.26", require: false
gem "solargraph", "~> 0.50.0"
end

gem "faraday-multipart", "~> 1.0"
Expand Down
Loading

0 comments on commit 0777e5e

Please sign in to comment.