Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasbischof committed Dec 14, 2020
2 parents 3fda081 + a00a3ee commit ee3bd84
Show file tree
Hide file tree
Showing 99 changed files with 2,708 additions and 1,168 deletions.
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ PERCY_TOKEN=my-percy-token

SIDEKIQ_USERNAME=username
SIDEKIQ_PASSWORD=password

RAILS_ADMIN_THEME=myzivi_theme
2 changes: 2 additions & 0 deletions .reek.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ detectors:
max_constants: 6
TooManyStatements:
max_statements: 10
exclude:
- 'Abilities'
LongParameterList:
max_params: 6
DataClump:
Expand Down
13 changes: 9 additions & 4 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ agent:
auto_cancel:
running:
when: 'true'
fail_fast:
cancel:
when: "branch != 'master' AND branch != 'develop'"
blocks:
- name: cache
- name: Cache
execution_time_limit:
minutes: 10
dependencies: []
Expand All @@ -33,7 +36,7 @@ blocks:
execution_time_limit:
minutes: 10
dependencies:
- cache
- Cache
task:
secrets:
- name: my-zivi
Expand Down Expand Up @@ -102,7 +105,7 @@ blocks:
- NO_COVERAGE=true yarn run percy:capture-screenshots
- name: Performance Check
dependencies:
- Tests
- Cache
task:
secrets:
- name: my-zivi
Expand All @@ -111,6 +114,8 @@ blocks:
value: 'postgresql://postgres@localhost/test?encoding=utf8'
- name: RAILS_ENV
value: production
- name: NODE_ENV
value: production
- name: RAILS_SERVE_STATIC_FILES
value: 'true'
- name: SECRET_KEY_BASE
Expand All @@ -127,10 +132,10 @@ blocks:
- bundle install --deployment --path vendor/bundle
- nvm install
- bin/yarn install --cache-folder ~/.cache/yarn && yarn global add @lhci/cli@^0.5.0
- bin/rake assets:precompile
- sem-service start postgres 12
- 'bundle exec rails db:create db:structure:load'
jobs:
- name: Lighthouse CI
commands:
- bin/rake assets:precompile
- lhci autorun
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ gem 'slim-rails'
gem 'turbolinks', '~> 5'
gem 'validates_timeliness'
gem 'view_component'
gem 'webpacker', '~> 4.0'
gem 'webpacker', '~> 5.2.1'
# gem 'jbuilder', '~> 2.7'

gem 'bootsnap', '>= 1.4.2', require: false
gem 'rails_admin', '~> 2.0'

group :production do
gem 'lograge'
Expand Down Expand Up @@ -72,7 +73,7 @@ end

group :test do
gem 'climate_control'
gem 'i18n-tasks', '~> 0.9.29'
gem 'i18n-tasks', '~> 0.9.31'
gem 'pdf-inspector', require: 'pdf/inspector'
gem 'percy-capybara'
gem 'rails-controller-testing'
Expand Down

0 comments on commit ee3bd84

Please sign in to comment.