Skip to content

Commit

Permalink
Merge branch 'release/6.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
jorg-vr committed Nov 18, 2022
2 parents 2a2efba + 1f3e983 commit b5762fb
Show file tree
Hide file tree
Showing 29 changed files with 551 additions and 538 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/deploy-db-backup-to-naos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Deploy database backup to Naos

on:
workflow_dispatch:

concurrency:
group: deploy-naos
cancel-in-progress: true

jobs:
deploy:
environment:
name: naos
url: https://naos.ugent.be
runs-on: ubuntu-latest
steps:
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.MESTRA_KEY }}
known_hosts: ${{ secrets.MESTRA_HOST }}
- name: Deploy db backup
run: |
echo "deploy backup" | ssh -p 4840 [email protected]
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/[email protected].0
- uses: toolmantim/[email protected].1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30 changes: 15 additions & 15 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'rails', '~> 7.0.4'
# Use mysql as the database for Active Record
gem 'mysql2', '~> 0.5.4'
# Use Puma as the app server
gem 'puma', '~> 5.6.5'
gem 'puma', '~> 6.0.0'

# Use dart-sass for stylesheets
gem 'cssbundling-rails', '~> 1.1.1'
Expand Down Expand Up @@ -103,16 +103,16 @@ gem 'ed25519'

# i18n
gem 'i18n-js', '~> 4.0.1'
gem 'rails-i18n', '~> 7.0.5'
gem 'rails-i18n', '~> 7.0.6'

# email exceptions
gem 'exception_notification', '~> 4.5.0'
gem 'httparty', '~> 0.20.0'
gem 'slack-notifier', '~> 2.4.0'

# css styles for emails
gem 'nokogiri', '~> 1.13.8'
gem 'premailer-rails', '~> 1.11.1'
gem 'nokogiri', '~> 1.13.9'
gem 'premailer-rails', '~> 1.12.0'

# filtering
gem 'has_scope', '~> 0.8.0'
Expand All @@ -124,25 +124,25 @@ gem 'rubyzip', '~> 2.3.2'
gem 'bootstrap_tokenfield_rails', '~> 0.12.1'

# memcache
gem 'dalli', '~> 3.2.2'
gem 'dalli', '~> 3.2.3'

# Generate 'random' values like usernames, emails, ...
gem 'faker', '~> 2.23.0'
gem 'faker', '~> 3.0.0'

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

gem 'ddtrace', '~> 1.5.0'
gem 'ddtrace', '~> 1.5.2'

# Make sure filesystem changes only happen at the end of a transaction
gem 'after_commit_everywhere', '~> 1.2.2'
gem 'after_commit_everywhere', '~> 1.3.0'

group :development, :test do
# Use mocha for stubbing and mocking
gem 'mocha', '~> 1.15.0'
gem 'mocha', '~> 2.0.2'
# Factory bot for factories
gem 'factory_bot_rails', '~> 6.2.0'

Expand All @@ -153,16 +153,16 @@ group :development, :test do
gem 'byebug', '~> 11.1.3', platforms: %i[mri mingw x64_mingw]

# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 3.37.1'
gem 'selenium-webdriver', '~> 4.5.0'
gem 'capybara', '~> 3.38.0'
gem 'selenium-webdriver', '~> 4.6.1'
end

group :test do
# For measuring coverage
gem 'codecov', '~> 0.6.0', require: false
gem 'minitest-ci', '~> 3.4.0'
gem 'simplecov', '~> 0.21.2', require: false
gem 'test-prof', '~> 1.0.10'
gem 'test-prof', '~> 1.0.11'

# Mocking HTTP requests to third parties.
gem 'webmock'
Expand All @@ -177,7 +177,7 @@ group :development do
gem 'web-console', '~> 4.2.0'

gem 'rb-readline', '~> 0.5.5' # require for irb
gem 'rubocop-rails', '~> 2.16.1'
gem 'rubocop-rails', '~> 2.17.2'

# for opening letters
gem 'letter_opener', '~> 1.8.1'
Expand Down
Loading

0 comments on commit b5762fb

Please sign in to comment.