Skip to content

Commit

Permalink
Dbp 245 greenlight 3 0 8 1 (#5)
Browse files Browse the repository at this point in the history
* st

* Improved room sharing

* Update SECURITY.md (bigbluebutton#5406)

* Translate app/assets/locales/en.json in hu (bigbluebutton#5427)

100% translated source file: 'app/assets/locales/en.json'
on 'hu'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Translate config/locales/en.yml in hu (bigbluebutton#5426)

100% translated source file: 'config/locales/en.yml'
on 'hu'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate config/locales/en.yml in fa_IR (bigbluebutton#5422)

100% translated source file: 'config/locales/en.yml'
on 'fa_IR'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Updates for file app/assets/locales/en.json in gl on branch master (bigbluebutton#5384)

* Translate app/assets/locales/en.json in gl

100% translated source file: 'app/assets/locales/en.json'
on 'gl'.

* Translate app/assets/locales/en.json in gl

100% translated source file: 'app/assets/locales/en.json'
on 'gl'.

* Translate app/assets/locales/en.json in gl

100% translated source file: 'app/assets/locales/en.json'
on 'gl'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Updates for file app/assets/locales/en.json in tr on branch master (bigbluebutton#5382)

* Translate app/assets/locales/en.json in tr

100% translated source file: 'app/assets/locales/en.json'
on 'tr'.

* Translate app/assets/locales/en.json in tr

100% translated source file: 'app/assets/locales/en.json'
on 'tr'.

* Translate app/assets/locales/en.json in tr

100% translated source file: 'app/assets/locales/en.json'
on 'tr'.

* Translate app/assets/locales/en.json in tr

100% translated source file: 'app/assets/locales/en.json'
on 'tr'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Updates for file config/locales/en.yml in tr on branch master (bigbluebutton#5381)

* Translate config/locales/en.yml in tr

100% translated source file: 'config/locales/en.yml'
on 'tr'.

* Translate config/locales/en.yml in tr

100% translated source file: 'config/locales/en.yml'
on 'tr'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Translate config/locales/en.yml in de (bigbluebutton#5378)

100% translated source file: 'config/locales/en.yml'
on 'de'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Translate app/assets/locales/en.json in de (bigbluebutton#5377)

100% translated source file: 'app/assets/locales/en.json'
on 'de'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Updates for file app/assets/locales/en.json in el on branch master (bigbluebutton#5375)

* Translate app/assets/locales/en.json in el

100% translated source file: 'app/assets/locales/en.json'
on 'el'.

* Translate app/assets/locales/en.json in el

100% translated source file: 'app/assets/locales/en.json'
on 'el'.

* Translate app/assets/locales/en.json in el

100% translated source file: 'app/assets/locales/en.json'
on 'el'.

* Translate app/assets/locales/en.json in el

100% translated source file: 'app/assets/locales/en.json'
on 'el'.

* Translate app/assets/locales/en.json in el

100% translated source file: 'app/assets/locales/en.json'
on 'el'.

* Translate app/assets/locales/en.json in el

100% translated source file: 'app/assets/locales/en.json'
on 'el'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Translate config/locales/en.yml in zh_TW (bigbluebutton#5373)

100% translated source file: 'config/locales/en.yml'
on 'zh_TW'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Translate config/locales/en.yml in zh_TW (bigbluebutton#5372)

100% translated source file: 'config/locales/en.yml'
on 'zh_TW'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Updates for file config/locales/en.yml in gl on branch master (bigbluebutton#5370)

* Translate config/locales/en.yml in gl

100% translated source file: 'config/locales/en.yml'
on 'gl'.

* Translate config/locales/en.yml in gl

100% translated source file: 'config/locales/en.yml'
on 'gl'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Translate app/assets/locales/en.json in fr (bigbluebutton#5368)

100% translated source file: 'app/assets/locales/en.json'
on 'fr'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Updates for file config/locales/en.yml in fr on branch master (bigbluebutton#5367)

* Translate config/locales/en.yml in fr

100% translated source file: 'config/locales/en.yml'
on 'fr'.

* Translate config/locales/en.yml in fr

100% translated source file: 'config/locales/en.yml'
on 'fr'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Bump puma from 5.6.5 to 5.6.7 (bigbluebutton#5387)

Bumps [puma](https://github.com/puma/puma) from 5.6.5 to 5.6.7.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](puma/puma@v5.6.5...v5.6.7)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* [Snyk] Fix for 2 vulnerabilities (bigbluebutton#5391)

* fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-ACTIVESUPPORT-5851458
- https://snyk.io/vuln/SNYK-RUBY-RAILTIES-5851410

* Update Gemfile.lock

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Fix CI (bigbluebutton#5432)

* Fix Greenlight CI

* Rubocop fixes

* fix: Gemfile & Gemfile.lock to reduce vulnerabilities (bigbluebutton#5399)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-ACTIVESUPPORT-5851458
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
- https://snyk.io/vuln/SNYK-RUBY-RAILTIES-5851410

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* fix: Gemfile & Gemfile.lock to reduce vulnerabilities (bigbluebutton#5408)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-ACTIVESUPPORT-5851458
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
- https://snyk.io/vuln/SNYK-RUBY-RAILTIES-5851410

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* fix: config.env not found (bigbluebutton#5410)

`bin/start` should most likely read `bin/config.env` instead of `config.env` as the working directory is probably *not* `./bin` but `.`

* Migrate room access codes (bigbluebutton#5434)

* Upgrade cssbundling version (bigbluebutton#5438)

* Fix issue with recording resync deleting recordings (bigbluebutton#5449)

* Fix issue with room link throwing error when authenticated (bigbluebutton#5450)

* [Snyk] Security upgrade lograge from 0.13.0 to 0.14.0 (bigbluebutton#5447)

* fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917

* Update Gemfile.lock

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* fix: Gemfile to reduce vulnerabilities (bigbluebutton#5443)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-ACTIONCABLE-20338

Co-authored-by: snyk-bot <snyk-bot@snyk.io>

* [Snyk] Fix for 1 vulnerabilities (bigbluebutton#5442)

* fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917

* Update Gemfile.lock

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* fix: Gemfile to reduce vulnerabilities (bigbluebutton#5441)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Fix upgrade (bigbluebutton#5451)

* Fixed issues with default locale (bigbluebutton#5452)

* Add additional fail safe for action cable (bigbluebutton#5453)

* Added clear inteval when action cable works (bigbluebutton#5454)

* update changed recording URLs of already present formats instead of creating new format entries (bigbluebutton#5460)

* add hover tooltips for the copy-URL&delete buttons in room recording lists (bigbluebutton#5458)

* Increase file upload size to 30mb (bigbluebutton#5461)

* Fix bug with default locale (bigbluebutton#5462)

* Fixed issue in install script with secret generation (bigbluebutton#5466)

* add whitespace after uses of shared_by string, remove the whitespace from english locale (bigbluebutton#5468)

* Fix for superadmins when changing pages (bigbluebutton#5470)

* Fix for superadmins when changing pages

* eslint

* Fixed mixup with the ICS branch.

* Fixed missing import

* DBP-245 Recreate app/assets/builds/.keep

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: SebastianAppDev <128802341+SebastianAppDev@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Jesus Federico <jesus@123it.ca>
Co-authored-by: Marc Kohaupt <debuglevel@gmail.com>
Co-authored-by: Jan Kessler <Ithanil@users.noreply.github.com>
Co-authored-by: Nadler, Sebastian <sebastian.nadler@secunet.com>
  • Loading branch information
12 people authored Oct 26, 2023
1 parent a68d1b2 commit 36e56b4
Show file tree
Hide file tree
Showing 71 changed files with 1,390 additions and 499 deletions.
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,6 @@ Rails/Output:
Rails/RootPathnameMethods:
Enabled: false

Rails/ThreeStateBooleanColumn:
Enabled: false

22 changes: 11 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '>= 3.0'

gem 'active_model_serializers'
gem 'active_model_serializers', '>= 0.10.14'
gem 'active_storage_validations', '>= 1.0.4'
gem 'aws-sdk-s3', require: false
gem 'bcrypt', '~> 3.1.7'
gem 'bigbluebutton-api-ruby', '1.9.1'
gem 'bootsnap', require: false
gem 'cssbundling-rails', '>= 1.2.0'
gem 'data_migrate', '>= 9.0.0'
gem 'cssbundling-rails', '>= 1.3.3'
gem 'data_migrate', '>= 9.2.0'
gem 'dotenv-rails'
gem 'google-cloud-storage', '~> 1.44', require: false
gem 'hcaptcha'
gem 'hiredis', '~> 0.6.0'
gem 'i18n-language-mapping'
gem 'image_processing', '~> 1.2'
gem 'jbuilder'
gem 'jsbundling-rails', '>= 1.1.2'
gem 'jsbundling-rails', '>= 1.2.1'
gem 'jwt'
gem 'mini_magick', '>= 4.9.5'
gem 'omniauth', '~> 2.1.0'
gem 'omniauth_openid_connect'
gem 'omniauth_openid_connect', '>= 0.6.1'
gem 'omniauth-rails_csrf_protection', '~> 1.0.1'
gem 'pagy', '~> 5.10', '>= 5.10.1'
gem 'pagy', '~> 6.0', '>= 6.0.0'
gem 'pg'
gem 'puma', '~> 5.0'
gem 'rails', '~> 7.0.5', '>= 7.0.5.1'
gem 'puma', '~> 5.6'
gem 'rails', '~> 7.1.0'
gem 'redis', '~> 4.0'
gem 'sprockets-rails'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
Expand All @@ -41,9 +41,9 @@ end
group :development do
gem 'rubocop', '~> 1.26', require: false
gem 'rubocop-performance', '~> 1.13', require: false
gem 'rubocop-rails', '~> 2.17', '>= 2.17.4', require: false
gem 'rubocop-rails', '~> 2.18', '>= 2.18.0', require: false
gem 'rubocop-rspec', '~> 2.9.0', require: false
gem 'web-console'
gem 'web-console', '>= 4.2.1'
end

group :test do
Expand All @@ -58,6 +58,6 @@ group :test do
end

group :production do
gem 'lograge', '~> 0.13.0'
gem 'lograge', '~> 0.14.0'
gem 'remote_syslog_logger'
end
Loading

0 comments on commit 36e56b4

Please sign in to comment.