From 07c87767015f5cfba2b4505dd6508cb71af14af3 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:15:51 +0000 Subject: [PATCH 1/8] Update oj to version 3.16.3 --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b00ba2d..d567e43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,6 +89,7 @@ GEM ast (2.4.2) attr_required (1.0.1) awesome_print (1.9.2) + bigdecimal (3.1.4) bindata (2.4.12) bootsnap (1.17.0) msgpack (~> 1.2) @@ -209,7 +210,8 @@ GEM nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) oauth (0.5.10) - oj (3.16.1) + oj (3.16.3) + bigdecimal (>= 3.0) oktakit (1.0.0) faraday (>= 2.0.1, < 3) sawyer (>= 0.8.1, < 0.10) From 672bf427a22652aa2f2af242bec5d44e7abac41d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:18:14 +0000 Subject: [PATCH 2/8] Bump puma from 6.4.0 to 6.4.2 Bumps [puma](https://github.com/puma/puma) from 6.4.0 to 6.4.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.4.0...v6.4.2) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b00ba2d..019ad79 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,7 +205,7 @@ GEM net-smtp (0.4.0) net-protocol netrc (0.11.0) - nio4r (2.5.9) + nio4r (2.7.0) nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) oauth (0.5.10) @@ -230,7 +230,7 @@ GEM ast (~> 2.4.1) racc public_suffix (5.0.3) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) rack (2.2.8) From 9db20eb93d521547b8dde37baefba95129b71416 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 20:18:25 +0000 Subject: [PATCH 3/8] Update puma to version 6.4.2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b00ba2d..019ad79 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,7 +205,7 @@ GEM net-smtp (0.4.0) net-protocol netrc (0.11.0) - nio4r (2.5.9) + nio4r (2.7.0) nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) oauth (0.5.10) @@ -230,7 +230,7 @@ GEM ast (~> 2.4.1) racc public_suffix (5.0.3) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) rack (2.2.8) From 4a07e996a72392505251229d93c855602b4be653 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 00:40:20 +0000 Subject: [PATCH 4/8] Bump nokogiri from 1.15.4 to 1.16.3 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.15.4 to 1.16.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.15.4...v1.16.3) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b00ba2d..a18ff96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,7 +206,7 @@ GEM net-protocol netrc (0.11.0) nio4r (2.5.9) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) oauth (0.5.10) oj (3.16.1) From c357eb7b0636e2663c9495e09bf069e1303cfb12 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 4 Jun 2024 13:23:04 +0200 Subject: [PATCH 5/8] add location to user summary --- app/serializers/user_summary_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb index af691ba..29b5764 100644 --- a/app/serializers/user_summary_serializer.rb +++ b/app/serializers/user_summary_serializer.rb @@ -1,6 +1,6 @@ class UserSummarySerializer < ActiveModel::Serializer attributes :type, :email, :username, :title, :fullname, :phone, :gravatar, :picture_160, - :picture_25, :picture_50, :email, :teamlead_of + :picture_25, :picture_50, :email, :teamlead_of, :location, :room, :coordinates def type 'user' From 8cc1693aa137877bbf30e90cba6803badabc656c Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 4 Jun 2024 13:31:42 +0200 Subject: [PATCH 6/8] codecov verbose --- .github/workflows/rubyonrails.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index 955b079..2f32fce 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -26,6 +26,7 @@ jobs: env: RAILS_ENV: test geekos_mongodb_server: "localhost" + CODECOV_TOKEN: secrets.CODECOV_TOKEN steps: - name: Checkout code uses: actions/checkout@v2 @@ -41,10 +42,11 @@ jobs: - name: Lint Ruby files run: bundle exec rubocop --parallel - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v2 - with: - token: ${{ secrets.CODECOV_TOKEN }} - directory: ./coverage/ - files: codecov-result.json - verbose: false + # - name: Upload coverage to Codecov + # uses: codecov/codecov-action@v4 + # with: + # fail_ci_if_error: false + # token: ${{ secrets.CODECOV_TOKEN }} + # directory: ./coverage/ + # files: codecov-result.json + # verbose: false From cb3ff29bae92f18c2067d6f9d0d04733845dcf29 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 4 Jun 2024 13:49:01 +0200 Subject: [PATCH 7/8] use codecov gh action only --- .github/workflows/rubyonrails.yml | 16 ++++++++-------- Gemfile | 1 - Gemfile.lock | 3 --- spec/rails_helper.rb | 3 +-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index 2f32fce..b6cf5dd 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -42,11 +42,11 @@ jobs: - name: Lint Ruby files run: bundle exec rubocop --parallel - # - name: Upload coverage to Codecov - # uses: codecov/codecov-action@v4 - # with: - # fail_ci_if_error: false - # token: ${{ secrets.CODECOV_TOKEN }} - # directory: ./coverage/ - # files: codecov-result.json - # verbose: false + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v4 + with: + fail_ci_if_error: false + token: ${{ secrets.CODECOV_TOKEN }} + directory: ./coverage/ + files: codecov-result.json + verbose: false diff --git a/Gemfile b/Gemfile index 8fab155..a3b1270 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,6 @@ group :development, :test do end group :test do - gem 'codecov' gem 'database_cleaner-mongoid' gem 'hashie' gem 'json_matchers' diff --git a/Gemfile.lock b/Gemfile.lock index b00ba2d..03cb5a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,8 +98,6 @@ GEM cancancan (3.5.0) case_transform (0.2) activesupport - codecov (0.6.0) - simplecov (>= 0.15, < 0.22) concurrent-ruby (1.2.2) crack (0.4.5) rexml @@ -408,7 +406,6 @@ DEPENDENCIES bootsnap byebug cancancan - codecov database_cleaner-mongoid dragonfly factory_bot_rails diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index fedd80e..b7dec0d 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,5 +1,4 @@ require 'simplecov' -require 'codecov' SimpleCov.minimum_coverage 100 SimpleCov.start 'rails' do add_filter 'lib/ldap.rb' @@ -10,7 +9,7 @@ add_filter 'app/controllers/api/rooms_controller.rb' # has generated environment specific code add_filter 'app/controllers/graphql_controller.rb' - formatter(ENV['CI'] ? SimpleCov::Formatter::Codecov : SimpleCov::Formatter::HTMLFormatter) + formatter(SimpleCov::Formatter::HTMLFormatter) end ENV['RAILS_ENV'] = 'test' From 778d70ea4deaa1f521c77cd4752e718f98768c86 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 12:05:20 +0000 Subject: [PATCH 8/8] Update rails to version 7.0.8.3 --- Gemfile.lock | 142 +++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 03cb5a8..7ef555d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,47 +13,47 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.0.8.3) + actionpack (= 7.0.8.3) + activesupport (= 7.0.8.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actionmailbox (7.0.8.3) + actionpack (= 7.0.8.3) + activejob (= 7.0.8.3) + activerecord (= 7.0.8.3) + activestorage (= 7.0.8.3) + activesupport (= 7.0.8.3) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.0.8.3) + actionpack (= 7.0.8.3) + actionview (= 7.0.8.3) + activejob (= 7.0.8.3) + activesupport (= 7.0.8.3) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.3) + actionview (= 7.0.8.3) + activesupport (= 7.0.8.3) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actiontext (7.0.8.3) + actionpack (= 7.0.8.3) + activerecord (= 7.0.8.3) + activestorage (= 7.0.8.3) + activesupport (= 7.0.8.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.3) + activesupport (= 7.0.8.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -63,22 +63,22 @@ GEM activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (7.0.8) - activesupport (= 7.0.8) + activejob (7.0.8.3) + activesupport (= 7.0.8.3) globalid (>= 0.3.6) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activemodel (7.0.8.3) + activesupport (= 7.0.8.3) + activerecord (7.0.8.3) + activemodel (= 7.0.8.3) + activesupport (= 7.0.8.3) + activestorage (7.0.8.3) + actionpack (= 7.0.8.3) + activejob (= 7.0.8.3) + activerecord (= 7.0.8.3) + activesupport (= 7.0.8.3) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.0.8.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -98,7 +98,7 @@ GEM cancancan (3.5.0) case_transform (0.2) activesupport - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.1) crack (0.4.5) rexml crass (1.0.6) @@ -106,7 +106,7 @@ GEM database_cleaner-mongoid (2.0.1) database_cleaner-core (~> 2.0.0) mongoid - date (3.3.3) + date (3.3.4) diff-lcs (1.5.0) docile (1.4.0) domain_name (0.5.20190701) @@ -142,7 +142,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) json (2.6.3) json-jwt (1.15.3) @@ -161,7 +161,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.21.4) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -169,13 +169,13 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) - method_source (1.0.0) + marcel (1.0.4) + method_source (1.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) mini_mime (1.1.5) - minitest (5.20.0) + minitest (5.23.1) mongo (2.19.3) bson (>= 4.14.1, < 5.0.0) mongoid (8.1.4) @@ -192,19 +192,19 @@ GEM mongoid (>= 4.0, < 9) msgpack (1.7.2) multi_json (1.15.0) - net-imap (0.4.1) + net-imap (0.4.12) date net-protocol net-ldap (0.18.0) net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.4.0) + net-smtp (0.5.0) net-protocol netrc (0.11.0) - nio4r (2.5.9) - nokogiri (1.15.4-x86_64-linux) + nio4r (2.7.3) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) oauth (0.5.10) oj (3.16.1) @@ -230,8 +230,8 @@ GEM public_suffix (5.0.3) puma (6.4.0) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.8) + racc (1.8.0) + rack (2.2.9) rack-cache (1.14.0) rack (>= 0.4) rack-cors (2.0.1) @@ -244,20 +244,20 @@ GEM rack (>= 2.1.0) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rails (7.0.8.3) + actioncable (= 7.0.8.3) + actionmailbox (= 7.0.8.3) + actionmailer (= 7.0.8.3) + actionpack (= 7.0.8.3) + actiontext (= 7.0.8.3) + actionview (= 7.0.8.3) + activejob (= 7.0.8.3) + activemodel (= 7.0.8.3) + activerecord (= 7.0.8.3) + activestorage (= 7.0.8.3) + activesupport (= 7.0.8.3) bundler (>= 1.15.0) - railties (= 7.0.8) + railties (= 7.0.8.3) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -265,15 +265,15 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.3) + actionpack (= 7.0.8.3) + activesupport (= 7.0.8.3) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.0.6) + rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -371,8 +371,8 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) - thor (1.2.2) - timeout (0.4.0) + thor (1.3.1) + timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) @@ -395,7 +395,7 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.12) + zeitwerk (2.6.15) PLATFORMS x86_64-linux