Merge pull request #1851 from omu/develop

Merge develop into master

.gitignore

@@ -54,3 +54,7 @@ config/deploy_key
 db/encrypted_data/sample_data.sql.enc.gz
 db/encrypted_data/static_data.sql.enc.gz
 lib/templates/ldap/openldap-2.4-bcyrpt-module.tar.gz
+
+# RuboCop generates leftover config file when a common configuration is
+# inherited from a remote source. To avoid this, we have to ignore the file.
+/.rubocop-*-yml

.rubocop.yml

@@ -1,4 +1,4 @@
-inherit_from: .rubocop_common.yml
+inherit_from: https://raw.githubusercontent.com/omu/omu/master/etc/rubocop/rubocop.yml
 
 require:
   - rubocop-rails

Gemfile

@@ -8,54 +8,54 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 # core
 gem 'bootsnap', require: false
 gem 'puma'
-gem 'rails', '~> 6.0'
-gem 'redis', '~> 4.0'
+gem 'rails', '~> 6.0', '>= 6.0.3.2'
+gem 'redis', '~> 4.2'
 gem 'sidekiq'
 
 # database
 gem 'pg'
-gem 'pg_search'
-gem 'pghero'
-gem 'rein'
+gem 'pg_search', '>= 2.3.2'
+gem 'pghero', '>= 2.4.2'
+gem 'rein', '>= 5.1.0'
 
 # active-record
-gem 'ancestry'
+gem 'ancestry', '>= 3.0.7'
 
 # active-storage
 gem 'aws-sdk-s3', require: false
-gem 'image_processing', '~> 1.10.3'
+gem 'image_processing', '~> 1.11.0'
 gem 'ruby-vips', '~> 2.0.17'
 
 # authentication
 gem 'authy'
-gem 'devise'
-gem 'omniauth_openid_connect'
+gem 'devise', '>= 4.7.1'
+gem 'omniauth_openid_connect', '>= 0.3.3'
 
 # authorization
-gem 'pundit'
+gem 'pundit', '>= 2.1.0'
 
 # ldap
 gem 'net-ldap'
 
 # assets: core asset dependencies
 # TODO: The following line should be removed when sassc-rails has the latest version of sassc.
-gem 'sassc', '~> 2.2.1'
-gem 'sassc-rails'
+gem 'sassc', '~> 2.4.0'
+gem 'sassc-rails', '>= 2.1.2'
 
 gem 'uglifier', '>= 1.3.0'
-gem 'webpacker'
+gem 'webpacker', '>= 5.1.1'
 
 # view helpers: tools for forms, views, etc.
 gem 'chartkick'
 gem 'cocoon'
-gem 'font-awesome-rails'
-gem 'groupdate'
+gem 'font-awesome-rails', '>= 4.7.0.5'
+gem 'groupdate', '>= 5.0.0'
 gem 'pagy'
-gem 'simple_form'
-gem 'wicked_pdf'
+gem 'simple_form', '>= 5.0.2'
+gem 'wicked_pdf', '>= 2.0.2'
 
 # api
-gem 'jbuilder', '~> 2.9'
+gem 'jbuilder', '~> 2.10', '>= 2.10.0'
 
 # security
 gem 'bcrypt', '~> 3.1.7'
@@ -64,7 +64,7 @@ gem 'rack-attack'
 
 # validators
 gem 'telephone_number'
-gem 'valid_email2'
+gem 'valid_email2', '>= 3.2.2'
 
 # error tracking
 gem 'rollbar'
@@ -74,33 +74,34 @@ gem 'slack-notifier'
 gem 'friendly_id', '~> 5.3.0'
 
 # sms
-gem 'nexmo'
-gem 'smstools'
 gem 'twilio-ruby'
 
 # log
-gem 'lograge'
+gem 'lograge', '>= 0.11.2'
+
+# cron
+gem 'sidekiq-cron'
 
 group :development, :test do
   gem 'brakeman', require: false
-  gem 'bullet'
+  gem 'bullet', '>= 6.1.0'
   gem 'bundler-audit'
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
-  gem 'dotenv-rails'
-  gem 'erb_lint', require: false
-  gem 'lol_dba'
+  gem 'dotenv-rails', '>= 2.7.5'
+  gem 'erb_lint', '>= 0.0.32', require: false
+  gem 'lol_dba', '>= 2.2.0'
   gem 'rubocop'
   gem 'rubocop-minitest'
   gem 'rubocop-performance'
-  gem 'rubocop-rails'
+  gem 'rubocop-rails', '>= 2.5.2'
   gem 'simplecov', require: false
 end
 
 group :test do
   gem 'capybara'
   gem 'codacy-coverage', require: false
   gem 'minitest-focus'
-  gem 'webdrivers', '~> 4.2'
+  gem 'webdrivers', '~> 4.4'
   gem 'webmock'
 end
 
@@ -113,7 +114,7 @@ group :development do
   gem 'ruby-progressbar'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem 'web-console'
+  gem 'web-console', '>= 4.0.2'
 end
 
 # core plugins
@@ -127,4 +128,4 @@ Dir['plugins/tenant/**/*.gemspec'].each do |gemspec|
   gem name, path: File.dirname(gemspec), require: false
 end
 
-gem 'active_flag'
+gem 'active_flag', '>= 1.5.0'