Skip to content

Commit

Permalink
Merge branch 'release/1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasbischof committed May 17, 2021
2 parents b1ad283 + c7c01ab commit dc3d6ff
Show file tree
Hide file tree
Showing 108 changed files with 1,550 additions and 216 deletions.
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ SIDEKIQ_PASSWORD=password
RAILS_ADMIN_THEME=myzivi_theme
SMARTJOBBOARD_PUBLIC_URL=https://www.myzivi.ch/
DEMO_URL=https://calendly.com/myzivi-joshua/onlinedemo

# GCS_PROJECT_NAME=my-zivi
# GCS_BUCKET_NAME=my-bucket-name
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.18.2
12.22.1
2 changes: 1 addition & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ blocks:
epilogue:
on_fail:
commands:
- artifact push job logs/test.log
- artifact push job log/test.log
- artifact push job screenshots
- name: Percy
dependencies:
Expand Down
17 changes: 15 additions & 2 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"selector-no-qualifying-type": [
true,
{
"ignore": ["attribute", "class"]
"ignore": [
"attribute",
"class"
]
}
],
"scss/at-import-partial-extension": null,
Expand All @@ -22,7 +25,17 @@
"selector-max-type": [
4,
{
"ignore": ["child"]
"ignore": [
"child"
]
}
],
"selector-type-no-unknown": [
true,
{
"ignoreTypes": [
"action-text-attachment"
]
}
]
}
Expand Down
9 changes: 7 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@ gem 'devise_invitable'
gem 'dotenv-rails'
gem 'fillable-pdf'
gem 'flutie'
gem 'google-cloud-storage', '~> 1.31', require: false
gem 'hexapdf'
gem 'holidays'
gem 'iban-tools'
gem 'image_processing'
gem 'nokogiri'
gem 'pg', '>= 0.18', '< 2.0'
gem 'prawn'
gem 'prawn-table'
gem 'puma', '~> 4.1'
gem 'rack-cors', require: 'rack/cors'
gem 'rails', '~> 6.0.3', '>= 6.0.3.1'
gem 'rails', '~> 6.1.3.1'
gem 'rails-i18n'
gem 'sepa_king'
gem 'sidekiq'
Expand All @@ -46,7 +48,10 @@ end

group :development, :test do
gem 'brakeman', require: false
gem 'bullet'
# TODO: Bullet does not yet support Rails 6.1.3.1, but that Rails version is required that ActiveStorage
# works properly with the latest Google Cloud Services
# => Reenable as soon as support was added
# gem 'bullet'
gem 'byebug', platforms: %i[mri mingw x64_mingw]
gem 'capybara'
gem 'factory_bot_rails'
Expand Down

0 comments on commit dc3d6ff

Please sign in to comment.