Skip to content

Commit 0a10657

Browse files
authored
Merge branch 'master' into dependabot/bundler/rexml-3.2.8
2 parents 98a9c2c + b474e4f commit 0a10657

File tree

289 files changed

+8135
-6481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+8135
-6481
lines changed

.github/workflows/formatting.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Formatting
2+
on:
3+
push:
4+
branches-ignore: [main]
5+
workflow_dispatch:
6+
7+
env:
8+
GIT_COMMITTER_NAME: GitHub Actions
9+
GIT_COMMITTER_EMAIL: [email protected]
10+
11+
jobs:
12+
standardrb:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: ruby/setup-ruby@v1
19+
with:
20+
bundler-cache: true
21+
22+
- run: bundle exec standardrb --fix && git diff --quiet
23+
24+
- if: failure()
25+
run: git commit -a --fixup=HEAD --author=. && git push

.github/workflows/main.yml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
test:
11+
strategy:
12+
fail-fast: false
13+
max-parallel: 20
14+
runs-on: ubuntu-latest
15+
16+
env:
17+
CI: true
18+
PGHOST: localhost
19+
PGPASSWORD: runner
20+
PGUSER: runner
21+
RAILS_ENV: test
22+
23+
name: rspec
24+
steps:
25+
- uses: actions/checkout@v2
26+
- uses: ruby/setup-ruby@v1
27+
with:
28+
bundler-cache: true
29+
30+
- name: "Set up PostgreSQL using VM's server"
31+
run: |
32+
sudo apt-get update
33+
sudo apt-get install libpq-dev -y
34+
sudo systemctl start postgresql.service
35+
sudo -u postgres psql -c "CREATE USER runner WITH SUPERUSER PASSWORD 'runner'"
36+
37+
- run: bin/rails db:setup
38+
- run: bin/rspec

.rubocop.yml

-40
This file was deleted.

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.6
1+
3.3.1

CONTRIBUTORS.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
- Br3nda
55
- keyaral
66
- oventi
7-
- barancw
87
- nrankin
8+
- barancw
99
- parndt
1010
- ben-rabid
11+
- sjukkola
12+
- lukearndt

Gemfile

+50-51
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,64 @@
11
# frozen_string_literal: true
2-
source 'https://rubygems.org'
3-
ruby '2.6.6'
42

5-
gem 'active_model_serializers'
6-
gem 'batch_api'
7-
gem 'bcrypt', '~> 3.1.7'
8-
gem 'clockwork'
9-
gem 'devise'
10-
gem 'devise_token_auth'
11-
gem 'factory_girl_rails'
12-
gem 'faker'
13-
gem 'fast_jsonapi', git: 'https://github.com/Netflix/fast_jsonapi',
14-
branch: 'dev'
15-
gem 'foundation-rails'
16-
gem 'fog-aws'
17-
gem 'jquery-rails'
18-
gem 'kaminari'
19-
gem 'oj'
20-
gem 'paper_trail'
21-
gem 'pg', '~> 0.18'
22-
gem 'pundit'
23-
gem 'rack-cors', require: 'rack/cors'
24-
gem 'rails', '~> 6.0'
25-
gem 'sass-rails', '~> 5.0'
26-
gem 'secure_headers', '>= 3.0'
3+
source "https://rubygems.org"
4+
ruby file: ".ruby-version"
5+
6+
gem "batch_api"
7+
gem "bcrypt", "~> 3.1.7"
8+
gem "clockwork"
9+
gem "devise"
10+
gem "devise_token_auth", "~> 1.2"
11+
gem "omniauth-azure-activedirectory-v2", "~> 2.1.0"
12+
gem "foundation-rails"
13+
gem "fog-aws"
14+
gem "jquery-rails"
15+
gem "jsonapi-serializer"
16+
gem "kaminari"
17+
gem "net-smtp"
18+
gem "paper_trail"
19+
gem "pg", "~> 1.2"
20+
gem "puma", "~> 5.5"
21+
gem "pundit"
22+
gem "rack-cors", require: "rack/cors"
23+
gem "rails", "~> 6.0"
24+
gem "sass-rails", "~> 6.0"
25+
gem "secure_headers", ">= 3.0"
2726

2827
group :production, :staging do
29-
gem 'unicorn'
30-
gem 'unicorn-worker-killer'
28+
gem "net-pop"
29+
gem "net-imap"
3130
end
3231

3332
group :development do
34-
gem 'better_errors'
35-
gem 'binding_of_caller'
36-
gem 'bundler-audit', require: false
37-
gem 'letter_opener_web'
38-
gem 'listen'
39-
gem 'overcommit'
40-
gem 'simplecov', require: false
41-
gem 'spring'
42-
gem 'thin', require: false
43-
gem 'web-console', '~> 2.0'
33+
gem "better_errors"
34+
gem "binding_of_caller"
35+
gem "bundler-audit", require: false
36+
gem "letter_opener_web"
37+
gem "listen"
38+
gem "overcommit"
39+
gem "simplecov", require: false
40+
gem "spring"
41+
gem "standard"
42+
gem "web-console", "~> 4.1"
4443
end
4544

4645
group :development, :test do
47-
gem 'awesome_print'
48-
gem 'brakeman'
49-
gem 'byebug'
50-
gem 'dotenv-rails'
51-
gem 'i18n-tasks', '~> 0.9.6'
52-
gem 'rspec-rails'
53-
gem 'rubocop', require: false
46+
gem "awesome_print"
47+
gem "brakeman"
48+
gem "byebug"
49+
gem "dotenv-rails"
50+
gem "factory_bot_rails", "~> 6.0"
51+
gem "faker"
52+
gem "i18n-tasks", "~> 0.9.6"
53+
gem "rspec-rails"
5454
end
5555

5656
group :test do
57-
gem 'capybara'
58-
gem 'connection_pool'
59-
gem 'database_cleaner'
60-
gem 'launchy'
61-
gem 'poltergeist'
62-
gem 'pry-rails'
63-
gem 'shoulda-matchers'
64-
gem 'timecop'
57+
gem "capybara"
58+
gem "connection_pool"
59+
gem "database_cleaner"
60+
gem "launchy"
61+
gem "pry-rails"
62+
gem "shoulda-matchers"
63+
gem "timecop"
6564
end

0 commit comments

Comments
 (0)