Skip to content

Commit

Permalink
Merge branch 'main' into enhance/allow-duplicate-names
Browse files Browse the repository at this point in the history
  • Loading branch information
jorg-vr committed Sep 13, 2023
2 parents 44cb75a + 6d994f4 commit 17ea3d9
Show file tree
Hide file tree
Showing 95 changed files with 2,075 additions and 878 deletions.
25 changes: 15 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ updates:
prefix: ""
labels:
- "dependencies"
ignore:
- dependency-name: sprockets
versions:
- ">= 4.a"
- "< 5"
groups:
rubocop:
patterns:
- "rubocop*"
- package-ecosystem: npm
directory: "/"
schedule:
Expand All @@ -27,11 +26,17 @@ updates:
prefix: ""
labels:
- "dependencies"
ignore:
- dependency-name: webpack-cli
versions:
- ">= 4.a"
- "< 5"
groups:
babel:
patterns:
- "@babel*"
- "babel*"
eslint:
patterns:
- "eslint*"
rails:
patterns:
- "@rails*"
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Lint Ruby
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use ruby from .ruby-version
uses: ruby/setup-ruby@v1
with:
Expand All @@ -29,7 +29,7 @@ jobs:
name: Lint JavaScript
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
with:
Expand All @@ -49,7 +49,7 @@ jobs:
name: Lint CSS
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- 3306:3306
options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use ruby from .ruby-version
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
name: Test JavaScript
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
- 3306:3306
options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use ruby from .ruby-version
uses: ruby/setup-ruby@v1
with:
Expand Down
12 changes: 11 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
require: rubocop-rails
require:
- rubocop-rails
- rubocop-factory_bot
- rubocop-capybara
- rubocop-minitest

AllCops:
Exclude:
Expand Down Expand Up @@ -83,3 +87,9 @@ Style/OptionalBooleanParameter:
Enabled: false
Style/HashSyntax:
EnforcedShorthandSyntax: never

FactoryBot/ConsistentParenthesesStyle:
EnforcedStyle: omit_parentheses

Minitest/MultipleAssertions:
Enabled: false
21 changes: 12 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '~> 3.1.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.7'
gem 'rails', '~> 7.0.8'
# Use mysql as the database for Active Record
gem 'mysql2', '~> 0.5.5'
# Use Puma as the app server
gem 'puma', '~> 6.3.0'
gem 'puma', '~> 6.3.1'

# Use dart-sass for stylesheets
gem 'cssbundling-rails', '~> 1.2.0'
Expand Down Expand Up @@ -63,7 +63,7 @@ gem 'diff-lcs', '~>1.5'
gem 'ace-rails-ap', '~>4.5'

# auto css prefixer
gem 'autoprefixer-rails', '~>10.4.13'
gem 'autoprefixer-rails', '~>10.4.15'

# saml authentication
gem 'devise', '~>4.9.2'
Expand Down Expand Up @@ -106,7 +106,7 @@ gem 'ed25519'

# i18n
gem 'i18n-js', '~> 4.2.3'
gem 'rails-i18n', '~> 7.0.7'
gem 'rails-i18n', '~> 7.0.8'

# email exceptions
gem 'exception_notification', '~> 4.5.0'
Expand Down Expand Up @@ -135,13 +135,13 @@ gem 'memory_profiler', '~> 1.0.1'
gem 'rack-mini-profiler', '~> 3.1.1'
gem 'stackprof', '~> 0.2.25'

gem 'ddtrace', '~> 1.13.0'
gem 'ddtrace', '~> 1.14.0'

# Make sure filesystem changes only happen at the end of a transaction
gem 'after_commit_everywhere', '~> 1.3.1'

# More advanced counter_cache that allows conditions
gem 'counter_culture', '~> 3.4'
gem 'counter_culture', '~> 3.5'

group :development, :test do
# Use mocha for stubbing and mocking
Expand All @@ -157,15 +157,15 @@ group :development, :test do

# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 3.39.2'
gem 'selenium-webdriver', '~> 4.11.0'
gem 'selenium-webdriver', '~> 4.12.0'
end

group :test do
# For measuring coverage
gem 'minitest-ci', '~> 3.4.0'
gem 'simplecov', '~> 0.22.0', require: false
gem 'simplecov-cobertura', '~> 2.1.0', require: false
gem 'test-prof', '~> 1.2.2'
gem 'test-prof', '~> 1.2.3'

# Mocking HTTP requests to third parties.
gem 'webmock'
Expand All @@ -177,9 +177,12 @@ end
group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'listen', '~> 3.8.0'
gem 'web-console', '~> 4.2.0'
gem 'web-console', '~> 4.2.1'

gem 'rb-readline', '~> 0.5.5' # require for irb
gem 'rubocop-capybara', '~> 2.18.0'
gem 'rubocop-factory_bot', '~> 2.23'
gem 'rubocop-minitest', '~> 0.31.1'
gem 'rubocop-rails', '~> 2.20.2'

# for opening letters
Expand Down
Loading

0 comments on commit 17ea3d9

Please sign in to comment.