Skip to content

Commit

Permalink
Merge branch 'main' into 1400_Add_a_row_to_the_Admin_dashboard_summar…
Browse files Browse the repository at this point in the history
…y_of_supervisors
  • Loading branch information
compwron authored May 13, 2021
2 parents 511eb69 + 60f4e58 commit a2a9956
Show file tree
Hide file tree
Showing 196 changed files with 5,860 additions and 6,551 deletions.
2 changes: 2 additions & 0 deletions .erb-lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
EnableDefaultLinters: true
exclude:
- '**/vendor/**/*'
linters:
ErbSafety:
enabled: true
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@v2
uses: actions/checkout@v2.3.4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.3.4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/erb_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.3.4

- name: Set up Ruby
uses: ruby/setup-ruby@v1

- name: install gem erb_lint
run: gem install erb_lint
with:
bundler-cache: true

- name: ERB lint
run: erblint --lint-all --autocorrect
run: bundle exec erblint --lint-all --autocorrect
2 changes: 1 addition & 1 deletion .github/workflows/factory_bot_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.3.4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.3.4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruby_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.3.4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.3.4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/stale@v3
- uses: actions/stale@v3.0.18
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: "This issue has been open without changes for a long time! What's up?"
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.7.2
ruby-3.0.1
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 2.7.2
ruby 3.0.1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.2-alpine AS builder
FROM ruby:3.0.1-alpine AS builder

LABEL maintainer="[email protected]"

Expand All @@ -24,7 +24,7 @@ COPY . .

### BUILD STEP DONE ###

FROM ruby:2.7.2-alpine
FROM ruby:3.0.1-alpine

ARG RAILS_ROOT=/usr/src/app/

Expand Down
17 changes: 10 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "2.7.2"
ruby "3.0.1"
gem "rails", "~> 6.1.3"

gem "after_party" # post-deployment tasks
Expand All @@ -17,36 +17,39 @@ gem "jbuilder", "~> 2.11" # Build JSON APIs with ease. Read more: https://github
gem "noticed" # Notifications
gem "paper_trail" # tracking changes
gem "pg", ">= 0.18", "< 2.0" # Use postgresql as the database for Active Record
gem "puma", "~> 5.2" # Use Puma as the app server
gem "puma", "~> 5.3" # Use Puma as the app server
gem "pundit" # for authorization management - based on user.role field
gem "rack-attack" # for blocking & throttling abusive requests
gem "skylight" # automated performance testing https://www.skylight.io/
gem "webpacker", "~> 5.2" # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem "webpacker", "~> 5.3" # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem "image_processing", "~> 1.12" # Set of higher-level helper methods for image processing.
gem "lograge" # log less so heroku papertrail quits rate limiting our logs

gem "bootsnap", ">= 1.4.2", require: false # Reduces boot times through caching; required in config/boot.rb
gem "bugsnag" # tracking errors in prod
gem "sablon" # Word document templating tool for Case Court Reports
gem "paranoia", "~> 2.2" # For soft-deleting purpose
gem "request_store"

group :development, :test do
gem "bullet" # Detect and fix N+1 queries
gem "byebug", platforms: %i[mri mingw x64_mingw] # Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem "erb_lint", require: false
gem "factory_bot_rails"
gem "pry"
gem "pry-byebug"
gem "rspec-rails", "~> 5.0.1"
gem "shoulda-matchers"
gem "standard", "~> 1.0.4" # linter https://github.com/testdouble/standard
gem "cypress-on-rails", "~> 1.9"
gem "standard", "~> 1.1.1" # linter https://github.com/testdouble/standard
gem "cypress-on-rails", "~> 1.10"
end

group :development do
gem "annotate" # for adding db field listings to models as comments
gem "erb_lint", require: false
gem "letter_opener" # Opens emails in new tab for easier testing
gem "listen", ">= 3.0.5", "< 3.6"
gem "spring" # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem "spring-commands-rspec"
gem "spring-watcher-listen", "~> 2.0.0"
gem "web-console", ">= 3.3.0" # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
end
Expand All @@ -55,7 +58,7 @@ group :test do
gem "brakeman" # security inspection
gem "capybara", ">= 2.15"
gem "capybara-screenshot"
gem "database_cleaner-active_record", "~> 2.0.0"
gem "database_cleaner-active_record", "~> 2.0.1"
gem "rake"
gem "rails-controller-testing"
gem "selenium-webdriver"
Expand Down
Loading

0 comments on commit a2a9956

Please sign in to comment.