Skip to content

Commit

Permalink
Merge branch 'master' into case-sensitive-email
Browse files Browse the repository at this point in the history
  • Loading branch information
simi committed Jan 9, 2024
2 parents 895ce4e + 71e699d commit eb81e32
Show file tree
Hide file tree
Showing 218 changed files with 4,868 additions and 924 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.4

ARG RUBY_VERSION=3.2
ARG RUBY_VERSION=3.3

FROM ruby:${RUBY_VERSION}-alpine

Expand Down
14 changes: 4 additions & 10 deletions .github/actions/setup-rubygems.org/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,14 @@ runs:
shell: bash
run: |
timeout 300 bash -c "until curl --silent --output /dev/null http://localhost:9200/_cat/health?h=st; do printf '.'; sleep 5; done; printf '\n'"
- uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011 # v1.157.0
- uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # v1.165.1
with:
ruby-version: ${{ inputs.ruby-version }}
bundler-cache: true
- name: set rubygems version
rubygems: ${{ inputs.rubygems-version }}
- name: Print bundle environment
shell: bash
run: |
if [ "${{ inputs.rubygems-version }}" != "latest" ]; then
gem update --system ${{ inputs.rubygems-version }};
else
gem update --system
fi
gem --version
bundle --version
run: bundle env
- name: Prepare environment
shell: bash
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
name: Docker build (and optional push)
runs-on: ubuntu-22.04
env:
RUBYGEMS_VERSION: 3.4.21
RUBY_VERSION: 3.2.2
RUBYGEMS_VERSION: 3.5.4
RUBY_VERSION: 3.3.0
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Docker Buildx
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
- uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # v1.165.1
with:
bundler-cache: true
- name: Rubocop
Expand All @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
- uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # v1.165.1
with:
bundler-cache: true
- name: Brakeman
Expand All @@ -41,7 +41,7 @@ jobs:
- name: login to Github Packages
run: echo "${{ github.token }}" | docker login https://ghcr.io -u ${GITHUB_ACTOR} --password-stdin
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b # v1.160.0
- uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # v1.165.1
with:
bundler-cache: true
- name: krane render
Expand All @@ -50,7 +50,7 @@ jobs:
env:
ENVIRONMENT: "${{ matrix.environment }}"
REVISION: "${{ github.sha }}"
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
- uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
with:
name: "${{ matrix.environment }}.rendered.yaml"
path: "config/deploy/${{ matrix.environment }}.rendered.yaml"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ jobs:
matrix:
rubygems:
- name: locked
version: "3.4.21"
version: "3.5.4"
- name: latest
version: latest
ruby_version: ["3.2.2"]
ruby_version: ["3.3.0"]
tests:
- name: general
command: test
- name: system
command: test:system
name: Rails tests ${{ matrix.tests.name }} (RubyGems ${{ matrix.rubygems.name }})
name: Rails tests ${{ matrix.tests.name }} (RubyGems ${{ matrix.rubygems.name }}, Ruby ${{ matrix.ruby_version }})
runs-on: ubuntu-22.04
env:
RUBYGEMS_VERSION: ${{ matrix.rubygems.version }}
Expand All @@ -56,7 +56,7 @@ jobs:

- name: Save capybara screenshots
if: ${{ failure() && steps.test-all.outcome == 'failure' }}
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
with:
name: capybara-screenshots
path: tmp/capybara
Expand Down
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ AllCops:
- !ruby/regexp /(vendor|bundle|bin|db|tmp|server)\/.*/
DisplayCopNames: true
DisplayStyleGuide: true
TargetRubyVersion: 3.2
TargetRubyVersion: 3.3
NewCops: enable

Rails:
Expand Down Expand Up @@ -70,7 +70,7 @@ Metrics/BlockLength:
- config/environments/development.rb

Metrics/ClassLength:
Max: 356 # TODO: Lower to 100
Max: 357 # TODO: Lower to 100
Exclude:
- test/**/*

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.3.0
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ Follow the instructions below on how to install Bundler and setup the database.

* Note that `-e "xpack.security.enabled=false"` disables authentication.

* Install PostgreSQL (>= 11.13.x): `brew install postgres`
* Install PostgreSQL (>= 12.x): `brew install postgres`
* Setup information: `brew info postgresql`
* Install memcached: `brew install memcached`
* Show all memcached options: `memcached -h`
* Install Google-Chrome: `brew cask install google-chrome`
* Install Google-Chrome: `brew install google-chrome --cask`

#### Environment (Linux - Debian/Ubuntu)

Expand All @@ -114,10 +114,10 @@ Follow the instructions below on how to install Bundler and setup the database.

### Installing ruby, gem dependencies, and setting up the database

* Use Ruby 3.2.x
* Use Ruby 3.3.x
* See: [Ruby install instructions](https://www.ruby-lang.org/en/downloads/).
* `.ruby-version` is present and can be used.
* Use Rubygems 3.3.x
* Use Rubygems 3.5.x
* Install bundler:
`gem install bundler`
* Install dependencies and setup the database:
Expand Down
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1.4

# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.2.2
ARG RUBY_VERSION=3.3.0
ARG ALPINE_VERSION=3.18
FROM ruby:$RUBY_VERSION-alpine${ALPINE_VERSION} as base

Expand All @@ -25,11 +25,7 @@ ENV BUNDLE_APP_CONFIG=".bundle_app_config"

# Update rubygems
ARG RUBYGEMS_VERSION
RUN gem update --system ${RUBYGEMS_VERSION} --no-document && \
# rubygems-update is completely unused after the `gem update --system` process
gem uninstall rubygems-update -x && \
# Remove rubygems cache files, they are unused
rm -r /usr/local/bundle/cache/ /root/.local/share/gem/
RUN gem update --system ${RUBYGEMS_VERSION} --no-document

# Throw-away build stage to reduce size of final image
FROM base as build
Expand Down
72 changes: 40 additions & 32 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,88 +1,95 @@
source "https://rubygems.org"

# Former default gems
gem "bigdecimal", "~> 3.1" # activesupport-7.0.8
gem "mutex_m", "~> 0.2.0" # activesupport-7.0.8
gem "net-smtp", "~> 0.4.0" # mail-2.8.1
gem "csv", "~> 3.2" # zeitwerk-2.6.12
gem "observer", "~> 0.1.2" # launchdarkly-server-sdk-8.0.0

gem "rails", "~> 7.0.0"
gem "rails-i18n", "~> 7.0"

gem "aws-sdk-s3", "~> 1.119"
gem "aws-sdk-sqs", "~> 1.67"
gem "aws-sdk-s3", "~> 1.142"
gem "aws-sdk-sqs", "~> 1.69"
gem "bootsnap", "~> 1.16"
gem "clearance", "~> 2.6"
gem "dalli", "~> 3.2"
gem "ddtrace", "~> 1.10", require: "ddtrace/auto_instrument"
gem "ddtrace", "~> 1.18", require: "ddtrace/auto_instrument"
gem "dogstatsd-ruby", "~> 5.5"
gem "google-protobuf", "~> 3.22"
gem "faraday", "~> 1.10"
gem "good_job", "~> 3.17"
gem "google-protobuf", "~> 3.25"
gem "faraday", "~> 2.8"
gem "good_job", "~> 3.22"
gem "gravtastic", "~> 3.2"
gem "high_voltage", "~> 3.1"
gem "honeybadger", "~> 5.2"
gem "honeybadger", "~> 5.4"
gem "http_accept_language", "~> 2.1"
gem "jquery-rails", "~> 4.5"
gem "kaminari", "~> 1.2"
gem "launchdarkly-server-sdk", "~> 8.0"
gem "launchdarkly-server-sdk", "~> 8.1"
gem "mail", "~> 2.8"
gem "octokit", "~> 8.0"
gem "omniauth-github", "~> 2.0"
gem "omniauth", "~> 2.1"
gem "omniauth-rails_csrf_protection", "~> 1.0"
gem "openid_connect", "~> 1.4"
gem "openid_connect", "~> 2.3"
gem "pg", "~> 1.4"
gem "puma", "~> 6.1"
gem "puma", "~> 6.4"
gem "rack", "~> 2.2"
gem "rack-utf8_sanitizer", "~> 1.8"
gem "rbtrace", "~> 0.4.8"
gem "rdoc", "~> 6.5"
gem "rbtrace", "~> 0.5.1"
gem "rdoc", "~> 6.6"
gem "roadie-rails", "~> 3.0"
gem "ruby-magic", "~> 0.6"
gem "shoryuken", "~> 5.0", require: false
gem "shoryuken", "~> 6.1", require: false
gem "statsd-instrument", "~> 3.5"
gem "validates_formatting_of", "~> 0.9"
gem "opensearch-dsl", "~> 0.2.0"
gem "opensearch-ruby", "~> 1.0"
gem "searchkick", "~> 5.2"
gem "faraday_middleware-aws-sigv4", "~> 0.6"
gem "opensearch-ruby", "~> 3.1"
gem "searchkick", "~> 5.3"
gem "faraday_middleware-aws-sigv4", "~> 1.0"
gem "xml-simple", "~> 1.1"
gem "compact_index", "~> 0.14.0"
gem "compact_index", "~> 0.15.0"
gem "sprockets-rails", "~> 3.4"
gem "rack-attack", "~> 6.6"
gem "rqrcode", "~> 2.1"
gem "rotp", "~> 6.2"
gem "unpwn", "~> 1.0"
gem "webauthn", "~> 3.0"
gem "webauthn", "~> 3.1"
gem "browser", "~> 5.3", ">= 5.3.1"
gem "bcrypt", "~> 3.1", ">= 3.1.18"
gem "maintenance_tasks", "~> 2.1"
gem "strong_migrations", "~> 1.6"
gem "phlex-rails", "~> 1.0"
gem "bcrypt", "~> 3.1"
gem "maintenance_tasks", "~> 2.4"
gem "strong_migrations", "~> 1.7"
gem "phlex-rails", "~> 1.1"

# Admin dashboard
gem "avo", "~> 2.42"
gem "view_component", "~> 3.6"
gem "avo", "~> 2.46"
gem "view_component", "~> 3.9"
gem "pundit", "~> 2.3"
gem "chartkick", "~> 5.0"
gem "groupdate", "~> 6.2"

# Logging
gem "amazing_print", "~> 1.4"
gem "rails_semantic_logger", "~> 4.13"
gem "rails_semantic_logger", "~> 4.14"
gem "pp", "0.5.0"

group :assets, :development do
gem "tailwindcss-rails", "~> 2.0"
gem "tailwindcss-rails", "~> 2.2"
end

group :assets do
gem "dartsass-sprockets", "~> 3.0"
gem "dartsass-sprockets", "~> 3.1"
gem "terser", "~> 1.1"
gem "autoprefixer-rails", "~> 10.4"
end

group :development, :test do
gem "pry-byebug", "~> 3.10"
gem "toxiproxy", "~> 2.0"
gem "factory_bot_rails", "~> 6.2"
gem "factory_bot_rails", "~> 6.4"
gem "dotenv-rails", "~> 2.8"

gem "brakeman", "~> 6.0", require: false
gem "brakeman", "~> 6.1", require: false
gem "rubocop", "~> 1.48", require: false
gem "rubocop-rails", "~> 2.18", require: false
gem "rubocop-performance", "~> 1.16", require: false
Expand All @@ -106,8 +113,9 @@ group :test do
gem "rack-test", "~> 2.1", require: "rack/test"
gem "rails-controller-testing", "~> 1.0"
gem "mocha", "~> 2.0", require: false
gem "shoulda", "~> 4.0"
gem "selenium-webdriver", "~> 4.8"
gem "shoulda-context", "~> 2.0"
gem "shoulda-matchers", "~> 6.0"
gem "selenium-webdriver", "~> 4.16"
gem "webmock", "~> 3.18"
gem "simplecov", "~> 0.22", require: false
gem "simplecov-cobertura", "~> 2.1", require: false
Expand Down

0 comments on commit eb81e32

Please sign in to comment.