Skip to content

Commit

Permalink
Merge branch 'main' into feat/more-flexible-scoping
Browse files Browse the repository at this point in the history
  • Loading branch information
jorg-vr committed Aug 1, 2024
2 parents c9450c4 + d205a3e commit 1aa919c
Show file tree
Hide file tree
Showing 75 changed files with 1,329 additions and 1,404 deletions.
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

83 changes: 0 additions & 83 deletions .eslintrc

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 22.x
cache: yarn
- name: Install dependencies
run: |
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 22.x
cache: yarn
- name: Install dependencies
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: Use node 16
- name: Use node 22
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 22.x
cache: yarn
- name: Run tests
env:
Expand All @@ -63,7 +63,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 22.x
cache: yarn
- name: Install dependencies
run: |
Expand Down Expand Up @@ -102,10 +102,10 @@ jobs:
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: Use node 16
- name: Use node 22
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 22.x
cache: yarn
- name: Setup chromium-chromedriver
uses: nanasess/setup-chromedriver@master
Expand Down
20 changes: 10 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ gem 'jbuilder', '~> 2.12.0'
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
gem 'image_processing', '~> 1.12.2'
gem 'image_processing', '~> 1.13.0'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '~> 1.18.3', require: false
Expand Down Expand Up @@ -69,7 +69,7 @@ gem 'ruby-saml', '~> 1.16.0'
# omniauth
gem 'omniauth-google-oauth2', '~> 1.1.2'
gem 'omniauth-oauth2', '~> 1.8.0'
gem 'omniauth_openid_connect', '~> 0.7.1'
gem 'omniauth_openid_connect', '~> 0.8.0'
gem 'omniauth-rails_csrf_protection', '~> 1.0.2'

# Json webtokens
Expand Down Expand Up @@ -111,7 +111,7 @@ gem 'httparty', '~> 0.22.0'
gem 'slack-notifier', '~> 2.4.0'

# css styles for emails
gem 'nokogiri', '~> 1.16.6'
gem 'nokogiri', '~> 1.16.7'
gem 'premailer-rails', '~> 1.12.0'

# filtering
Expand All @@ -124,15 +124,15 @@ gem 'rubyzip', '~> 2.3.2'
gem 'dalli', '~> 3.2.8'

# Generate 'random' values like usernames, emails, ...
gem 'faker', '~> 3.4.1'
gem 'faker', '~> 3.4.2'

# Profiling
gem 'flamegraph', '~> 0.9.5'
gem 'memory_profiler', '~> 1.0.2'
gem 'rack-mini-profiler', '~> 3.3.1'
gem 'stackprof', '~> 0.2.26'

gem 'ddtrace', '~> 1.23.2'
gem 'datadog', '~> 2.2.0'

# Make sure filesystem changes only happen at the end of a transaction
gem 'after_commit_everywhere', '~> 1.4.0'
Expand All @@ -142,7 +142,7 @@ gem 'counter_culture', '~> 3.7'

group :development, :test do
# Use mocha for stubbing and mocking
gem 'mocha', '~> 2.4.0'
gem 'mocha', '~> 2.4.5'
# Factory bot for factories
gem 'factory_bot_rails', '~> 6.4.3'

Expand All @@ -154,7 +154,7 @@ group :development, :test do

# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 3.40.0'
gem 'selenium-webdriver', '~> 4.22.0'
gem 'selenium-webdriver', '~> 4.23.0'
end

group :test do
Expand All @@ -179,8 +179,8 @@ group :development do
gem 'rb-readline', '~> 0.5.5' # require for irb
gem 'rubocop-capybara', '~> 2.21.0'
gem 'rubocop-factory_bot', '~> 2.26'
gem 'rubocop-minitest', '~> 0.35.0'
gem 'rubocop-rails', '~> 2.25.0'
gem 'rubocop-minitest', '~> 0.35.1'
gem 'rubocop-rails', '~> 2.25.1'

# for opening letters
gem 'letter_opener', '~> 1.10.0'
Expand All @@ -190,7 +190,7 @@ end
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

# interfacing with docker
gem 'docker-api', '~> 2.2.0'
gem 'docker-api', '~> 2.3.0'

# Used for syncing deadlines with an external calendar
gem 'icalendar', '~> 2.10'
Loading

0 comments on commit 1aa919c

Please sign in to comment.