Release OpenProject 10.3.0

opf · Dec 17, 2019 · b67422e · b67422e
2 parents d3ed5e7 + 15fc713
commit b67422e
Show file tree

Hide file tree

Showing 949 changed files with 24,220 additions and 4,723 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -27,6 +27,9 @@ checks:
 plugins:
   rubocop:
     enabled: true
+    checks:
+      Rubocop/Naming/ClassAndModuleCamelCase:
+        enabled: false
   # Codeclimate uses brakeman 4.3.1 which does not support rails 6
   # Check https://docs.codeclimate.com/docs/brakeman for updates.
   brakeman:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -207,9 +207,6 @@ SpecialGlobalVars:
 StringLiterals:
   Enabled: false
 
-VariableInterpolation:
-  Enabled: false
-
 TrivialAccessors:
   Enabled: false
 

diff --git a/.travis.yml b/.travis.yml
@@ -56,7 +56,9 @@ env:
 before_install:
 
   # work around https://github.com/travis-ci/travis-ci/issues/8969
-  - travis_retry gem update --system
+  # Currently causes error but as it will probably be required later on again,
+  # I leave the code as a reminder.
+  # - travis_retry gem update --system
   # Install latest bundler
   - gem install bundler
 
@@ -77,7 +79,7 @@ jobs:
       name: 'Prepare cache'
       script:
         # Run the dangerfile
-        - bundle exec danger --fail-on-errors=true || travis_terminate 1;
+        - bash script/ci/dangerfile.sh
         # Set up caching
         - bash script/ci/db_setup.sh
         - bash script/ci/cache_prepare.sh

diff --git a/Gemfile b/Gemfile
@@ -34,7 +34,7 @@ gem 'actionpack-xml_parser', '~> 2.0.0'
 gem 'activemodel-serializers-xml', '~> 1.0.1'
 gem 'activerecord-import', '~> 1.0.2'
 gem 'activerecord-session_store', '~> 1.1.0'
-gem 'rails', '~> 6.0.0'
+gem 'rails', '~> 6.0.1'
 gem 'responders', '~> 3.0'
 
 gem 'rdoc', '>= 2.4.2'
@@ -187,13 +187,6 @@ group :test do
   gem 'rack-test', '~> 1.1.0'
   gem 'shoulda-context', '~> 1.2'
 
-  # Require factory_bot for usage with openproject plugins testing
-  # FactoryBot needs to be available when loading app otherwise factory
-  # definitions from core are not available in the plugin thus specs break
-  gem 'factory_bot', '~> 4.8'
-  # require factory_bot_rails for convenience in core development
-  gem 'factory_bot_rails', '~> 4.8', require: false
-
   # Test prof provides factories from code
   # and other niceties
   gem 'test-prof', '~> 0.10.0'
@@ -211,6 +204,9 @@ group :test do
   gem 'retriable', '~> 3.1.1'
   gem 'rspec-retry', '~> 0.6.1'
 
+  # XML comparison tests
+  gem 'compare-xml', '~> 0.66', require: false
+
   gem 'rspec-example_disabler', git: 'https://github.com/finnlabs/rspec-example_disabler.git'
 
   # brings back testing for 'assigns' and 'assert_template' extracted in rails 5
@@ -251,6 +247,11 @@ end
 group :development, :test do
   gem 'thin', '~> 1.7.2'
 
+  # Require factory_bot for usage with openproject plugins testing
+  gem 'factory_bot', '~> 4.8'
+  # require factory_bot_rails for convenience in core development
+  gem 'factory_bot_rails', '~> 4.8'
+
   # Tracing and profiling gems
   gem 'flamegraph', require: false
   gem 'rack-mini-profiler', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -232,57 +232,57 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (6.0.0)
-      actionpack (= 6.0.0)
+    actioncable (6.0.1)
+      actionpack (= 6.0.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actionmailbox (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.0)
-      actionpack (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
+    actionmailer (6.0.1)
+      actionpack (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.0)
-      actionview (= 6.0.0)
-      activesupport (= 6.0.0)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (6.0.0)
-      actionpack (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actiontext (6.0.1)
+      actionpack (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.0)
-      activesupport (= 6.0.0)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.0)
-      activesupport (= 6.0.0)
+    activejob (6.0.1)
+      activesupport (= 6.0.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
     activerecord-import (1.0.2)
       activerecord (>= 3.2)
     activerecord-nulldb-adapter (0.4.0)
@@ -293,17 +293,17 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 1.5.2, < 3)
       railties (>= 4.0)
-    activestorage (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
+    activestorage (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.0)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
     acts_as_tree (2.9.0)
@@ -397,12 +397,14 @@ GEM
     colored2 (3.1.2)
     commonmarker (0.20.1)
       ruby-enum (~> 0.5)
+    compare-xml (0.66)
+      nokogiri (~> 1.8)
     concurrent-ruby (1.1.5)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    crass (1.0.5)
     crowdin-api (0.5.0)
       rest-client (~> 2.0)
     cucumber (3.1.2)
@@ -479,7 +481,7 @@ GEM
       nokogiri (>= 1.4.3)
     erbse (0.1.3)
       temple
-    erubi (1.8.0)
+    erubi (1.9.0)
     escape_utils (1.2.1)
     eventmachine (1.2.7)
     excon (0.62.0)
@@ -561,7 +563,7 @@ GEM
     jquery-tablesorter (1.27.0)
       railties (~> 6.0.0, >= 3.2)
     json (2.2.0)
-    json-jwt (1.10.0)
+    json-jwt (1.11.0)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
@@ -624,7 +626,7 @@ GEM
     net-ldap (0.16.1)
     netrc (0.11.0)
     newrelic_rpm (6.6.0.358)
-    nio4r (2.5.1)
+    nio4r (2.5.2)
     no_proxy_fix (0.1.2)
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
@@ -714,20 +716,20 @@ GEM
     rack_session_access (0.2.0)
       builder (>= 2.0.0)
       rack (>= 1.0.0)
-    rails (6.0.0)
-      actioncable (= 6.0.0)
-      actionmailbox (= 6.0.0)
-      actionmailer (= 6.0.0)
-      actionpack (= 6.0.0)
-      actiontext (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
-      activemodel (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    rails (6.0.1)
+      actioncable (= 6.0.1)
+      actionmailbox (= 6.0.1)
+      actionmailer (= 6.0.1)
+      actionpack (= 6.0.1)
+      actiontext (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
+      activemodel (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.0)
+      railties (= 6.0.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -736,22 +738,22 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (6.0.0)
-      actionpack (= 6.0.0)
-      activesupport (= 6.0.0)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.0)
-    rake (12.3.3)
+    rake (13.0.1)
     rbtree3 (0.5.0)
     rdoc (6.1.1)
     recaptcha (5.1.0)
@@ -969,6 +971,7 @@ DEPENDENCIES
   cells-erb (~> 0.1.0)
   cells-rails (~> 0.0.9)
   commonmarker (~> 0.20.1)
+  compare-xml (~> 0.66)
   cucumber (~> 3.1.0)
   cucumber-rails (~> 1.8.0)
   daemons
@@ -1054,7 +1057,7 @@ DEPENDENCIES
   rack-protection (~> 2.0.0)
   rack-test (~> 1.1.0)
   rack_session_access
-  rails (~> 6.0.0)
+  rails (~> 6.0.1)
   rails-controller-testing (~> 1.0.2)
   rails_12factor
   rdoc (>= 2.4.2)

diff --git a/app/assets/javascripts/custom-fields.js b/app/assets/javascripts/custom-fields.js
@@ -44,7 +44,8 @@
         possibleValues        = $('#custom_field_possible_values_attributes'),
         defaultValueFields    = $('#custom_field_default_value_attributes'),
         spanDefaultText       = $('#default_value_text'),
-        spanDefaultBool       = $('#default_value_bool');
+        spanDefaultBool       = $('#default_value_bool'),
+        textOrientationField  = $('#custom_field_text_orientation');
 
     var deactivate = function(element) {
       element.hide().find('input, textarea').not('.destroy_flag,.-cf-ignore-disabled').attr('disabled', true);
@@ -65,7 +66,7 @@
           unsearchable = function() { searchable.attr('checked', false).hide(); };
 
       // defaults (reset these fields before doing anything else)
-      $.each([spanDefaultBool, spanDefaultText, multiSelect], function(idx, element) {
+      $.each([spanDefaultBool, spanDefaultText, multiSelect, textOrientationField], function(idx, element) {
         deactivate(element);
       });
       show(defaultValueFields);
@@ -107,6 +108,11 @@
           hide(lengthField, regexpField, defaultValueFields);
           unsearchable();
           break;
+        case 'text':
+          show(lengthField, regexpField, searchable, textOrientationField);
+          deactivate(possibleValues);
+          activate(textOrientationField);
+          break;
         default:
           show(lengthField, regexpField, searchable);
           deactivate(possibleValues);