Merge commit 'b0de03cc0927083ab67c870a374e7e8463056084' into v2-infor…

…matik

* set to upstream v2.6
* commit 'b0de03cc0927083ab67c870a374e7e8463056084':
  Fixed migration erroring (bigbluebutton#1681)
  Fix date for duplicate rooms (bigbluebutton#1680)
  Translate '/config/locales/en.yml' in 'gl' (bigbluebutton#1676)
  Fixes for 2.6 (bigbluebutton#1677)
  Translate '/config/locales/en.yml' in 'de_DE' (bigbluebutton#1673)
  Translate '/config/locales/en.yml' in 'tr' (bigbluebutton#1639)
  Translate '/config/locales/en.yml' in 'nl' (bigbluebutton#1675)
  Translate '/config/locales/en.yml' in 'zh_CN' (bigbluebutton#1647)
  Translate /config/locales/en.yml in cs (bigbluebutton#1631)
  Translate /config/locales/en.yml in gl (bigbluebutton#1605)
  Translate '/config/locales/en.yml' in 'fr' (bigbluebutton#1602)
  Merge v2.6-alpha (bigbluebutton#1672)

.rubocop.yml

@@ -73,11 +73,11 @@ Style/RescueStandardError:
   Enabled: false
 
 # Align the elements of a hash literal if they span more than one line.
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 
 # Align the parameters of a method definition if they span more than one line.
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Enabled: false
 
 # Align ends corresponding to defs correctly.
@@ -93,7 +93,7 @@ Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
 # Align the arguments of a method call if they span more than one line.
-Layout/AlignArguments:
+Layout/ArgumentAlignment:
   Enabled: false
 
 #
@@ -120,7 +120,7 @@ Metrics/ClassLength:
   Enabled: false
 
 # Limit lines to 80 characters.
-Metrics/LineLength:
+Layout/LineLength:
   Max: 130
 
 # Avoid methods longer than 10 lines of code.
@@ -141,5 +141,39 @@ Metrics/CyclomaticComplexity:
   Max: 17
 
 # Checks for method parameter names that contain capital letters, end in numbers, or do not meet a minimal length.
-Naming/UncommunicativeMethodParamName:
-  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+
+Lint/LiteralInInterpolation:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+

Gemfile

@@ -8,7 +8,7 @@ git_source(:github) do |repo_name|
 end
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.3'
+gem 'rails', '~> 5.2.4.3'
 
 # Use Puma as the app server
 gem 'puma', '~> 3.12'
@@ -44,6 +44,8 @@ gem 'bcrypt', '~> 3.1.7'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.1.0', require: false
 
+gem 'sprockets', '< 4.0.0'
+
 # Authentication.
 gem 'omniauth'
 gem 'omniauth-twitter'