Skip to content

Commit

Permalink
Merge branch 'master' into snyk-fix-2f1edc35d1856b42f99bf03d81f5b813
Browse files Browse the repository at this point in the history
  • Loading branch information
farhatahmad authored Oct 3, 2023
2 parents 7a03359 + 16bf14f commit 605df3b
Show file tree
Hide file tree
Showing 44 changed files with 1,121 additions and 302 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.build.push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
- v2
- v3
- translations*
- snyk*
- dependabot*

jobs:
main:
Expand Down
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

12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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 'data_migrate', '>= 9.1.0'
gem 'dotenv-rails'
gem 'google-cloud-storage', '~> 1.44', require: false
gem 'hcaptcha'
Expand All @@ -24,12 +24,12 @@ gem 'jsbundling-rails', '>= 1.1.2'
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.0.7', '>= 7.0.7.1'
gem 'redis', '~> 4.0'
gem 'sprockets-rails'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
Expand All @@ -41,7 +41,7 @@ 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', '>= 4.2.1'
end
Expand Down
Loading

0 comments on commit 605df3b

Please sign in to comment.