Skip to content

Commit

Permalink
Merge branch 'main' into 9783-xlsform-export
Browse files Browse the repository at this point in the history
  • Loading branch information
cooperka committed Oct 31, 2023
2 parents 19eb4b5 + 00a9b9b commit f4aee11
Show file tree
Hide file tree
Showing 95 changed files with 688 additions and 1,017 deletions.
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
root = true


[*]
max_line_length = 120
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{html,js,json}]
indent_size = 4
9 changes: 7 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
require: rubocop-rails
require:
- rubocop-rails
- ./lib/rubocop/rubocop

# Disable defaults
AllCops:
Expand Down Expand Up @@ -45,14 +47,17 @@ Layout/SpaceInsideHashLiteralBraces:

Layout/LineLength:
Enabled: true
Max: 110
Max: 120
IgnoredPatterns:
# Test descriptors
- ^\s*(describe|it|context|scenario) ".+" do$

Lint/RedundantCopDisableDirective:
Enabled: false

Lint/LastKeywordArgument:
Enabled: true

Lint/UnusedMethodArgument:
# Otherwise we have to remove named args from the method signature altogether which seems to reduce
# clarity of the code.
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.1.4
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ gem "dotenv-rails", "~> 2.7"
gem "ancestry", "~> 4.1"
# Fork: Performance improvements.
# https://github.com/sassafrastech/closure_tree/commits/master
gem "closure_tree", github: "sassafrastech/closure_tree", tag: "v7.2.0-noReorder-fastInsert"
gem "closure_tree", github: "sassafrastech/closure_tree", tag: "v7.4.0-noReorder-fastInsert"

# Auto rank maintenance for sorted lists.
gem "acts_as_list"
Expand All @@ -92,7 +92,7 @@ gem "dalli", "~> 3.2"
# DB
gem "hairtrigger", "~> 0.2.20"
gem "immigrant", "~> 0.3.1" # foreign key maintenance
gem "pg", "~> 1.2"
gem "pg", "~> 1.4.6"
gem "pg_search", "~> 2.1"
gem "postgres-copy", "~> 1.0"
gem "wisper", "~> 2.0"
Expand Down Expand Up @@ -124,7 +124,7 @@ gem "faker", "~> 2.2"
gem "ruby-jmeter", "~> 3.1"

group :development do
gem "binding_of_caller", "~> 0.8.0"
gem "binding_of_caller", "~> 1.0.0"
gem "fix-db-schema-conflicts", "~> 3.0"
gem "letter_opener", "~> 1.4"
gem "listen", "~> 3.0"
Expand Down Expand Up @@ -159,8 +159,7 @@ group :development, :test do
gem "capybara-screenshot", "~> 1.0"
gem "launchy", "~> 2.5" # For auto-opening capybara html file
gem "puma", "~> 5.6"
gem "selenium-webdriver", "~> 3.9"
gem "webdrivers", "~> 4.0"
gem "selenium-webdriver"

# Debugging
gem "pry", "~> 0.13"
Expand Down Expand Up @@ -188,4 +187,5 @@ end

group :test do
gem "rspec-github", require: false
gem "warning"
end
Loading

0 comments on commit f4aee11

Please sign in to comment.