Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/bigbluebutton/greenlight
Browse files Browse the repository at this point in the history
…into bigbluebutton-master
  • Loading branch information
Your Name committed Sep 25, 2023
2 parents a91eb30 + f739387 commit 84ee009
Show file tree
Hide file tree
Showing 149 changed files with 7,871 additions and 1,874 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/ci.build.prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,13 @@ jobs:
shell: bash
run: echo "##[set-output name=tag;]$(echo ${GITHUB_REF#refs/tags/} | cut -c 9-)"

- name: Extract Tag Release Major
id: ci_tag_release_major
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
shell: bash
run: echo "##[set-output name=tag;]$(echo ${{steps.ci_tag_release_version.outputs.tag}} | cut -f1-1 -d'.')"

- name: Build and Push
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v3
with:
push: true
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:v${{ steps.ci_tag_release_version.outputs.tag }}"
"${{ steps.ci_docker_repository.outputs.repository }}:v${{ steps.ci_tag_release_major.outputs.tag }}"
build-args: "VERSION_TAG=release-${{ steps.ci_tag_release_version.outputs.tag }}"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
Expand Down
1 change: 1 addition & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ header:
- '**/.keep'
- 'config/credentials.yml.enc'
- 'app/views'
- 'spec/fixtures'

comment: on-failure

Expand Down
5 changes: 4 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ RSpec/MultipleMemoizedHelpers:
RSpec/NestedGroups:
Max: 7

RSpec/StubbedMock:
Enabled: false

# Enable having lines with up to 150 charachters in length.
Layout/LineLength:
Max: 150
Expand Down Expand Up @@ -79,7 +82,7 @@ Metrics/CyclomaticComplexity:
Max: 16

Metrics/PerceivedComplexity:
Max: 13
Max: 15

Rails/Exit:
Exclude:
Expand Down
18 changes: 12 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '>= 3.0'

gem 'active_model_serializers'
gem 'active_storage_validations'
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'
gem 'data_migrate'
gem 'cssbundling-rails', '>= 1.2.0'
gem 'data_migrate', '>= 9.0.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'
gem 'jsbundling-rails', '>= 1.1.2'
gem 'jwt'
gem 'mini_magick', '>= 4.9.5'
gem 'omniauth', '~> 2.1.0'
Expand All @@ -28,7 +29,7 @@ gem 'omniauth-rails_csrf_protection', '~> 1.0.1'
gem 'pagy', '~> 5.10', '>= 5.10.1'
gem 'pg'
gem 'puma', '~> 5.0'
gem 'rails', '~> 7.0.4', '>= 7.0.4.3'
gem 'rails', '~> 7.0.5', '>= 7.0.5.1'
gem 'redis', '~> 4.0'
gem 'sprockets-rails'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
Expand All @@ -49,9 +50,14 @@ group :test do
gem 'capybara'
gem 'factory_bot_rails'
gem 'faker'
gem 'rspec-rails'
gem 'rspec-rails', '>= 6.0.2'
gem 'selenium-webdriver'
gem 'shoulda-matchers', '~> 5.0'
gem 'webdrivers'
gem 'webmock'
end

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

0 comments on commit 84ee009

Please sign in to comment.