Skip to content

Commit

Permalink
Merge branch 'release/5.3.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
jorg-vr committed Apr 5, 2022
2 parents f7f5d63 + 259b251 commit 6da6d97
Show file tree
Hide file tree
Showing 51 changed files with 836 additions and 3,908 deletions.
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@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Ruby
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use ruby from .ruby-version
uses: ruby/setup-ruby@v1
with:
Expand All @@ -29,7 +29,7 @@ jobs:
name: JavaScript
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Node
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
runs-on: ubuntu-latest
steps:
# Drafts next release notes as Pull Requests are merged into "develop"
- uses: toolmantim/release-drafter@v5.18.1
- uses: toolmantim/release-drafter@v5.19.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- 3306:3306
options: --health-cmd "mysqladmin ping -h localhost" --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use ruby from .ruby-version
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
name: JavaScript
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Node
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- 3306:3306
options: --health-cmd "mysqladmin ping -h localhost" --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use ruby from .ruby-version
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
bundle exec rails test:system
- name: Upload screenshot artifacts
if: failure()
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@v3
with:
name: screenshots-failure
path: tmp/screenshots
19 changes: 9 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '~> 3.0.3'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.2.2'
gem 'rails', '~> 7.0.2.3'
# Use mysql as the database for Active Record
gem 'mysql2', '~> 0.5.3'
# Use Puma as the app server
Expand All @@ -14,7 +14,7 @@ gem 'puma', '~> 5.6.2'
gem 'cssbundling-rails', '~> 1.1.0'

# Use jsbundling to bundle javascript in app/javascript with webpack
gem 'jsbundling-rails', '~> 1.0.0'
gem 'jsbundling-rails', '~> 1.0.2'

# Load sprockets ourselves because rails 7 no longer autoloads this
# This is still used for all javascript in app/assets/javascripts
Expand All @@ -34,7 +34,7 @@ gem 'jbuilder', '~> 2.11.5'
gem 'image_processing', '~> 1.12.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '~> 1.10.3', require: false
gem 'bootsnap', '~> 1.11.1', require: false

# used to validate container responses
gem 'json-schema', '~> 2.8.1'
Expand All @@ -50,7 +50,7 @@ gem 'sinatra', '~>2.2.0'
gem 'will_paginate', '~>3.3.1'

# markdown rendering and syntax highlighting
gem 'kramdown', '~>2.3.1'
gem 'kramdown', '~>2.3.2'
gem 'kramdown-parser-gfm', '~>1.1.0'
gem 'rouge', '3.28.0'

Expand Down Expand Up @@ -103,7 +103,7 @@ gem 'ed25519'

# i18n
gem 'i18n-js', '~> 3.9.0'
gem 'rails-i18n', '~> 7.0.2'
gem 'rails-i18n', '~> 7.0.3'

# email exceptions
gem 'exception_notification', '~> 4.5.0'
Expand All @@ -130,16 +130,15 @@ gem 'bootstrap_tokenfield_rails', '~> 0.12.1'
gem 'dalli', '~> 3.2.1'

# Generate 'random' values like usernames, emails, ...
gem 'faker', '~> 2.19.0'
gem 'faker', '~> 2.20.0'

# Profiling
gem 'flamegraph', '~> 0.9.5'
gem 'memory_profiler', '~> 1.0.0'
gem 'rack-mini-profiler', '~> 3.0.0'
gem 'stackprof', '~> 0.2.19'

# Datadog temporarily fixed by git pull https://github.com/DataDog/dd-trace-rb/pull/1830 switch to 0.55.0 when available
gem 'ddtrace', github: 'kbacha/dd-trace-rb', branch: 'fixes-dalli-server-version'
gem 'ddtrace', '~> 1.0.0.beta1'

# Make sure filesystem changes only happen at the end of a transaction
gem 'after_commit_everywhere', '~> 1.1.0'
Expand Down Expand Up @@ -184,10 +183,10 @@ group :development do
gem 'web-console', '~> 4.2.0'

gem 'rb-readline', '~> 0.5.5' # require for irb
gem 'rubocop-rails', '~> 2.13.2'
gem 'rubocop-rails', '~> 2.14.2'

# for opening letters
gem 'letter_opener', '~> 1.7.0'
gem 'letter_opener', '~> 1.8.1'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
Loading

0 comments on commit 6da6d97

Please sign in to comment.