Skip to content

Commit

Permalink
Merge branch 'master' into feature/408_emberjs_tests_github_actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Ruggero Botteon committed Mar 1, 2021
2 parents d99687b + 63d92ac commit b0dc2fd
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,8 @@ jobs:
PGPORT: ${{ job.services.postgres.ports[5432] }}
run: bundle exec rake

- name: Run RuboCop
run: bundle exec rubocop --parallel

- name: Run Frontend Tests
run: bundle exec rake spec:frontend
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gem 'keycloak-api-rails'
gem 'language_list'
gem 'mini_magick'
gem 'net-ldap', '~> 0.16.0'
gem 'nokogiri', '~> 1.10.8'
gem 'nokogiri', '~> 1.11.0'
gem 'odf-report'
gem 'pg'
gem 'pg_search'
Expand Down
28 changes: 16 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,19 @@ GEM
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
carrierwave (2.1.0)
carrierwave (2.1.1)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
mimemagic (>= 0.3.0)
mini_mime (>= 0.1.3)
ssrf_filter (~> 1.0)
case_transform (0.2)
activesupport
choice (0.2.0)
coderay (1.1.3)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
config (2.2.1)
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0)
Expand Down Expand Up @@ -149,16 +150,16 @@ GEM
i18n (>= 1.6, < 2)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.13.1)
ffi (1.14.2)
globalid (0.4.2)
activesupport (>= 4.2.0)
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.8.5)
i18n (1.8.9)
concurrent-ruby (~> 1.0)
i18n_data (0.10.0)
image_processing (1.11.0)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
json-jwt (1.13.0)
Expand Down Expand Up @@ -187,15 +188,16 @@ GEM
mimemagic (0.3.5)
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.2)
mini_portile2 (2.5.0)
minitest (5.14.4)
msgpack (1.3.3)
multipart-post (2.1.1)
net-ldap (0.16.3)
netrc (0.11.0)
nio4r (2.5.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.11.0)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
odf-report (0.7.2)
mime-types
nokogiri (>= 1.10.0)
Expand All @@ -217,6 +219,7 @@ GEM
public_suffix (4.0.6)
puma (4.3.5)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
Expand Down Expand Up @@ -317,9 +320,10 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
thor (1.0.1)
thread_safe (0.3.6)
tzinfo (1.2.7)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
Expand All @@ -330,7 +334,7 @@ GEM
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.4.0)
zeitwerk (2.4.2)

PLATFORMS
ruby
Expand All @@ -355,7 +359,7 @@ DEPENDENCIES
listen (~> 3.0.5)
mini_magick
net-ldap (~> 0.16.0)
nokogiri (~> 1.10.8)
nokogiri (~> 1.11.0)
odf-report
pg
pg_search
Expand Down

0 comments on commit b0dc2fd

Please sign in to comment.