Merge pull request #1429 from omu/develop

Merge branch develop into master

Author: huseyin

.erb-lint.yml

@@ -14,7 +14,7 @@ linters:
         Enabled: false
       Style/FrozenStringLiteralComment:
         Enabled: false
-      Metrics/LineLength:
+      Layout/LineLength:
         Enabled: false
       Lint/UselessAssignment:
         Enabled: false

.gitallowed

@@ -2,8 +2,10 @@
 \byarn\.lock
 \bGemfile\.lock
 ^app/lib/nokul/database_url\.rb
-^README.md:[6-7]:
+^README.md:[6-8]:
 ^lib/templates/ldap/.*
+^test/controllers/accounts/settings/emails_controller_test.rb:23:
+^test/controllers/accounts/settings/passwords_controller_test.rb:25:
 ^test/fixtures/users.yml:(1|6|11|16):
 ^test/system/account_settings_page_flow_test.rb:20:
 ^test/system/login_page_flow_test.rb:15:

.gitattributes

@@ -11,7 +11,7 @@ Rails/UnknownEnv:
     - development
     - production
     - test
-Metrics/LineLength:
+Layout/LineLength:
   Exclude:
     - app/validators/employee_validator.rb # Won't fix
 Metrics/BlockLength:

.rubocop.yml

@@ -7,7 +7,7 @@ Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 Naming/MemoizedInstanceVariableName:

.rubocop_common.yml

@@ -1 +1 @@
-2.6.4
+2.7.0

.ruby-version

@@ -1,4 +1,4 @@
-FROM ondokuz/ruby:buster-19.1
+FROM ondokuz/ruby:buster-20.1
 
 ENV PATH=/app/bin:$PATH
 

Dockerfile

@@ -23,12 +23,13 @@ gem 'ancestry'
 
 # active-storage
 gem 'aws-sdk-s3', require: false
-gem 'image_processing', '~> 1.2'
-gem 'ruby-vips', '~> 2.0.16'
+gem 'image_processing', '~> 1.10.3'
+gem 'ruby-vips', '~> 2.0.17'
 
 # authentication
 gem 'authy'
 gem 'devise'
+gem 'omniauth_openid_connect'
 
 # authorization
 gem 'pundit'
@@ -99,7 +100,7 @@ group :test do
   gem 'capybara'
   gem 'codacy-coverage', require: false
   gem 'minitest-focus'
-  gem 'webdrivers', '~> 4.1'
+  gem 'webdrivers', '~> 4.2'
   gem 'webmock'
 end
 
@@ -125,3 +126,5 @@ Dir['plugins/tenant/**/*.gemspec'].each do |gemspec|
 
   gem name, path: File.dirname(gemspec), require: false
 end
+
+gem 'active_flag'