Merge branch 'dev' into scrolling-issues-in-activity-tab

3 years ago · 83a28d41bc
parent 851622f004 4a1148acb2
commit 83a28d41bc
6045 changed files with 10561 additions and 7463 deletions
--- a/.env.example
+++ b/.env.example
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 # If you place a .env file into the root directory of OpenProject
--- a/.gitignore
+++ b/.gitignore
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 # See https://help.github.com/articles/ignoring-files for more about ignoring files.
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -126,6 +126,11 @@ Rails/I18nLocaleAssignment:
  Exclude:
    - 'spec/**/*.rb'

+# The http verbs in Rack::Test do not accept named parameters (params: params)
+Rails/HttpPositionalArguments:
+  Exclude:
+    - 'spec/requests/api/v3/**/*.rb'
+
 # For feature specs, we tend to have longer specs that cover a larger part of the functionality.
 # This is done for multiple reasons:
 # * performance, as setting up integration tests is costly
@ -179,9 +184,14 @@ RSpec/LeadingSubject:
 RSpec/NamedSubject:
  Enabled: false

-RSpec/FilePath:
-  Enabled: false
-
+RSpec/ContextWording:
+  Prefixes:
+    - when
+    - with
+    - without
+    - if
+    - unless
+    - for

 Style/Alias:
  Enabled: false
--- a/docs/COPYRIGHT.rdoc
+++ b/docs/COPYRIGHT.rdoc
@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

+See LICENSE for the full GPLv3 license text.
+
 ---

 OpenProject is a derivative work based on ChiliProject, whose Copyright follows.
--- a/docs/COPYRIGHT_short.rdoc
+++ b/docs/COPYRIGHT_short.rdoc
@ -22,4 +22,4 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-See docs/COPYRIGHT.rdoc for more details.
+See COPYRIGHT and LICENSE files for more details.
--- a/13
+++ b/13
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 source 'https://rubygems.org'
@ -73,7 +73,7 @@ gem 'htmldiff'
 gem 'stringex', '~> 2.8.5'

 # CommonMark markdown parser with GFM extension
-gem 'commonmarker', '~> 0.22.0'
+gem 'commonmarker', '~> 0.23.0'

 # HTML pipeline for transformations on text formatter output
 # such as sanitization or additional features
@ -97,6 +97,7 @@ gem 'svg-graph', '~> 2.2.0'

 gem 'date_validator', '~> 0.12.0'
 gem 'email_validator', '~> 2.2.3'
+gem 'json_schemer', '~> 0.2.18'
 gem 'ruby-duration', '~> 3.2.0'

 # provide compatible filesystem information for available storage
@ -192,9 +193,9 @@ gem 'mini_magick', '~> 4.11.0', require: false

 # Sentry error reporting, loaded on demand
 group :sentry do
-  gem "sentry-delayed_job", '~> 4.6.0', require: false
-  gem "sentry-rails", '~> 4.6.0', require: false
-  gem "sentry-ruby", '~> 4.6.0',  require: false
+  gem "sentry-delayed_job", '~> 4.7.0', require: false
+  gem "sentry-rails", '~> 4.7.0', require: false
+  gem "sentry-ruby", '~> 4.7.0',  require: false
 end

 group :test do
@ -288,7 +289,7 @@ group :development, :test do
  gem 'danger-brakeman'
 end

-gem 'bootsnap', '~> 1.7.0', require: false
+gem 'bootsnap', '~> 1.8.0', require: false

 # API gems
 gem 'grape', '~> 1.5.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -164,7 +164,7 @@ PATH
  remote: modules/two_factor_authentication
  specs:
    openproject-two_factor_authentication (1.0.0)
-      aws-sdk-sns (~> 1.44.0)
+      aws-sdk-sns (~> 1.45.0)
      messagebird-rest (~> 1.4.2)
      rotp (~> 6.1)

@ -277,30 +277,30 @@ GEM
      activerecord (>= 4.0)
    awesome_nested_set (3.4.0)
      activerecord (>= 4.0.0, < 7.0)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.491.0)
-    aws-sdk-core (3.119.1)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.499.0)
+    aws-sdk-core (3.121.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.46.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-kms (1.48.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.99.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-s3 (1.102.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sdk-sns (1.45.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.44.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+    aws-sigv4 (1.4.0)
      aws-eventstream (~> 1, >= 1.0.2)
    bcrypt (3.1.16)
    bindata (2.4.10)
    binding_of_caller (1.0.0)
      debug_inspector (>= 0.0.1)
-    bootsnap (1.7.7)
+    bootsnap (1.8.1)
      msgpack (~> 1.0)
    brakeman (5.1.1)
    browser (5.3.1)
@ -344,7 +344,7 @@ GEM
      open4 (~> 1.3)
    coderay (1.1.3)
    colored2 (3.1.2)
-    commonmarker (0.22.0)
+    commonmarker (0.23.1)
    compare-xml (0.66)
      nokogiri (~> 1.8)
    concurrent-ruby (1.1.9)
@ -356,7 +356,7 @@ GEM
    crass (1.0.6)
    crowdin-api (0.6.0)
      rest-client (~> 2.0)
-    daemons (1.4.0)
+    daemons (1.4.1)
    dalli (2.7.11)
    danger (8.3.1)
      claide (~> 1.0)
@ -428,6 +428,8 @@ GEM
      dry-core (~> 0.5, >= 0.5)
      dry-inflector (~> 0.1, >= 0.1.2)
      dry-logic (~> 1.0, >= 1.0.2)
+    ecma-re-validator (0.3.0)
+      regexp_parser (~> 2.0)
    em-http-request (1.1.7)
      addressable (>= 2.3.4)
      cookiejar (!= 0.3.1)
@ -456,7 +458,7 @@ GEM
      railties (>= 5.0.0)
    faker (2.19.0)
      i18n (>= 1.6, < 2)
-    faraday (1.7.0)
+    faraday (1.7.1)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@ -478,7 +480,7 @@ GEM
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
    fastimage (2.2.5)
-    ffi (1.15.3)
+    ffi (1.15.4)
    flamegraph (0.9.5)
    fog-aws (3.12.0)
      fog-core (~> 2.1)
@ -521,6 +523,7 @@ GEM
      rack (>= 1.3.0)
      rack-accept
    gravatar_image_tag (1.2.0)
+    hana (1.3.7)
    hashdiff (1.0.1)
    hashery (2.1.2)
    hashie (3.6.0)
@ -549,6 +552,11 @@ GEM
      activesupport (>= 4.2)
      aes_key_wrap
      bindata
+    json_schemer (0.2.18)
+      ecma-re-validator (~> 0.3)
+      hana (~> 1.3)
+      regexp_parser (~> 2.0)
+      uri_template (~> 0.7)
    json_spec (1.1.5)
      multi_json (~> 1.0)
      rspec (>= 2.0, < 4.0)
@ -593,7 +601,7 @@ GEM
    method_source (1.0.0)
    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
+    mime-types-data (3.2021.0901)
    mini_magick (4.11.0)
    mini_mime (1.1.1)
    mini_portile2 (2.6.1)
@ -612,13 +620,13 @@ GEM
    netrc (0.11.0)
    nio4r (2.5.8)
    no_proxy_fix (0.1.2)
-    nokogiri (1.12.3)
+    nokogiri (1.12.4)
      mini_portile2 (~> 2.6.1)
      racc (~> 1.4)
    octokit (4.21.0)
      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.13.2)
+    oj (3.13.5)
    okcomputer (1.18.4)
    omniauth-saml (1.10.3)
      omniauth (~> 1.3, >= 1.3.2)
@ -698,7 +706,7 @@ GEM
      rack (>= 1.0, < 3)
    rack-cors (1.1.1)
      rack (>= 2.0.0)
-    rack-mini-profiler (2.3.2)
+    rack-mini-profiler (2.3.3)
      rack (>= 1.2.0)
    rack-oauth2 (1.18.0)
      activesupport
@ -803,7 +811,7 @@ GEM
    rspec-retry (0.6.2)
      rspec-core (> 3.3)
    rspec-support (3.10.2)
-    rubocop (1.19.1)
+    rubocop (1.20.0)
      parallel (~> 1.10)
      parser (>= 3.0.0.0)
      rainbow (>= 2.2.2, < 4.0)
@ -814,7 +822,7 @@ GEM
      unicode-display_width (>= 1.4.0, < 3.0)
    rubocop-ast (1.11.0)
      parser (>= 3.0.1.1)
-    rubocop-rails (2.11.3)
+    rubocop-rails (2.12.1)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.7.0, < 2.0)
@ -829,7 +837,7 @@ GEM
    ruby-prof (1.4.3)
    ruby-progressbar (1.11.0)
    ruby-rc4 (0.1.5)
-    ruby-saml (1.12.2)
+    ruby-saml (1.13.0)
      nokogiri (>= 1.10.5)
      rexml
    ruby2_keywords (0.0.5)
@ -851,22 +859,22 @@ GEM
    sawyer (0.8.2)
      addressable (>= 2.3.5)
      faraday (> 0.8, < 2.0)
-    secure_headers (6.3.2)
+    secure_headers (6.3.3)
    selenium-webdriver (3.142.7)
      childprocess (>= 0.5, < 4.0)
      rubyzip (>= 1.2.2)
    semantic (1.6.1)
-    sentry-delayed_job (4.6.5)
+    sentry-delayed_job (4.7.2)
      delayed_job (>= 4.0)
-      sentry-ruby-core (~> 4.6.0)
-    sentry-rails (4.6.5)
+      sentry-ruby-core (~> 4.7.0)
+    sentry-rails (4.7.2)
      railties (>= 5.0)
-      sentry-ruby-core (~> 4.6.0)
-    sentry-ruby (4.6.5)
+      sentry-ruby-core (~> 4.7.0)
+    sentry-ruby (4.7.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      faraday (>= 1.0)
-      sentry-ruby-core (= 4.6.5)
-    sentry-ruby-core (4.6.5)
+      sentry-ruby-core (= 4.7.2)
+    sentry-ruby-core (4.7.2)
      concurrent-ruby
      faraday
    shoulda-context (2.0.0)
@ -874,7 +882,7 @@ GEM
      activesupport (>= 5.2.0)
    spreadsheet (1.2.9)
      ruby-ole
-    spring (2.1.1)
+    spring (3.0.0)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
    sprockets (3.7.2)
@ -899,7 +907,7 @@ GEM
    temple (0.8.2)
    terminal-table (3.0.1)
      unicode-display_width (>= 1.1.1, < 3)
-    test-prof (1.0.6)
+    test-prof (1.0.7)
    thor (1.1.0)
    tilt (2.0.10)
    timecop (0.9.4)
@ -921,6 +929,7 @@ GEM
    unicorn-worker-killer (0.4.5)
      get_process_mem (~> 0)
      unicorn (>= 4, < 7)
+    uri_template (0.7.0)
    validate_email (0.1.6)
      activemodel (>= 3.0)
      mail (>= 2.2.5)
@ -970,7 +979,7 @@ DEPENDENCIES
  aws-sdk-core (~> 3.107)
  aws-sdk-s3 (~> 1.91)
  bcrypt (~> 3.1.6)
-  bootsnap (~> 1.7.0)
+  bootsnap (~> 1.8.0)
  brakeman (~> 5.1.0)
  browser (~> 5.3.0)
  budgets!
@ -980,7 +989,7 @@ DEPENDENCIES
  carrierwave_direct (~> 2.1.0)
  cells-erb (~> 0.1.0)
  cells-rails (~> 0.0.9)
-  commonmarker (~> 0.22.0)
+  commonmarker (~> 0.23.0)
  compare-xml (~> 0.66)
  costs!
  daemons
@ -1010,6 +1019,7 @@ DEPENDENCIES
  html-pipeline (~> 2.14.0)
  htmldiff
  i18n-js (~> 3.9.0)
+  json_schemer (~> 0.2.18)
  json_spec (~> 1.1.4)
  ladle
  launchy (~> 2.5.0)
@ -1094,9 +1104,9 @@ DEPENDENCIES
  secure_headers (~> 6.3.0)
  selenium-webdriver (~> 3.14)
  semantic (~> 1.6.1)
-  sentry-delayed_job (~> 4.6.0)
-  sentry-rails (~> 4.6.0)
-  sentry-ruby (~> 4.6.0)
+  sentry-delayed_job (~> 4.7.0)
+  sentry-rails (~> 4.7.0)
+  sentry-ruby (~> 4.7.0)
  shoulda-context (~> 2.0)
  shoulda-matchers (~> 5.0)
  spring
--- a/2
+++ b/2
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 guard :rspec do # , :cli => "--drb" do
--- a/docs/COPYING.rdoc
+++ b/docs/COPYING.rdoc
--- a/README.md
+++ b/README.md
@ -54,7 +54,7 @@ For more information on how to disclose a security vulnerability, [please see th
 ## License

 OpenProject is licensed under the terms of the GNU General Public License version 3.
-See [docs/COPYRIGHT.rdoc](docs/COPYRIGHT.rdoc) for details.
+See [COPYRIGHT and LICENSE files](COPYRIGHT and LICENSE files) for details.

 ## Credits

--- a/2
+++ b/2
@ -24,7 +24,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 # Add your own tasks in files placed in lib/tasks ending in .rake,
--- a/app/assets/images/logo_openproject_narrow.svg
+++ b/app/assets/images/logo_openproject_narrow.svg
--- a/app/cells/individual_principal_base_filter_cell.rb
+++ b/app/cells/individual_principal_base_filter_cell.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 class IndividualPrincipalBaseFilterCell < RailsCell
--- a/app/cells/placeholder_users/placeholder_user_filter_cell.rb
+++ b/app/cells/placeholder_users/placeholder_user_filter_cell.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module PlaceholderUsers
--- a/app/cells/placeholder_users/row_cell.rb
+++ b/app/cells/placeholder_users/row_cell.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module PlaceholderUsers
--- a/app/cells/placeholder_users/table_cell.rb
+++ b/app/cells/placeholder_users/table_cell.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module PlaceholderUsers
--- a/app/cells/user_filter_cell.rb
+++ b/app/cells/user_filter_cell.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 class UserFilterCell < IndividualPrincipalBaseFilterCell
--- a/app/cells/users/user_filter_cell.rb
+++ b/app/cells/users/user_filter_cell.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Users
--- a/app/cells/versions/row_cell.rb
+++ b/app/cells/versions/row_cell.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Versions
--- a/app/cells/views/individual_principal_base_filter/show.erb
+++ b/app/cells/views/individual_principal_base_filter/show.erb
@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-See docs/COPYRIGHT.rdoc for more details.
+See COPYRIGHT and LICENSE files for more details.

 ++#%>

--- a/app/cells/views/projects/row/show.erb
+++ b/app/cells/views/projects/row/show.erb
@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-See docs/COPYRIGHT.rdoc for more details.
+See COPYRIGHT and LICENSE files for more details.

 ++#%>

--- a/app/cells/views/projects/table/show.erb
+++ b/app/cells/views/projects/table/show.erb
@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-See docs/COPYRIGHT.rdoc for more details.
+See COPYRIGHT and LICENSE files for more details.

 ++#%>

@ -100,4 +100,4 @@ See docs/COPYRIGHT.rdoc for more details.
  <% if paginated? %>
    <%= pagination_links_full model %>
  <% end %>
-</div>
+</div>
--- a/app/cells/views/row/show.erb
+++ b/app/cells/views/row/show.erb
@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-See docs/COPYRIGHT.rdoc for more details.
+See COPYRIGHT and LICENSE files for more details.

 ++#%>

--- a/app/cells/views/table/show.erb
+++ b/app/cells/views/table/show.erb
@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-See docs/COPYRIGHT.rdoc for more details.
+See COPYRIGHT and LICENSE files for more details.

 ++#%>

--- a/app/contracts/admin_only_contract.rb
+++ b/app/contracts/admin_only_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 # A contract that only checks whether the current user is an admin
--- a/app/contracts/attachments/create_contract.rb
+++ b/app/contracts/attachments/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Attachments
--- a/app/contracts/attachments/delete_contract.rb
+++ b/app/contracts/attachments/delete_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Attachments
--- a/app/contracts/attachments/prepare_upload_contract.rb
+++ b/app/contracts/attachments/prepare_upload_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Attachments
--- a/app/contracts/attachments/validate_replacements.rb
+++ b/app/contracts/attachments/validate_replacements.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'model_contract'
--- a/app/contracts/attribute_help_texts/base_contract.rb
+++ b/app/contracts/attribute_help_texts/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module AttributeHelpTexts
--- a/app/contracts/attribute_help_texts/create_contract.rb
+++ b/app/contracts/attribute_help_texts/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module AttributeHelpTexts
--- a/app/contracts/attribute_help_texts/update_contract.rb
+++ b/app/contracts/attribute_help_texts/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module AttributeHelpTexts
--- a/app/contracts/authentication/omniauth_auth_hash_contract.rb
+++ b/app/contracts/authentication/omniauth_auth_hash_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Authentication
--- a/app/contracts/backups/create_contract.rb
+++ b/app/contracts/backups/create_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Backups
--- a/app/contracts/base_contract.rb
+++ b/app/contracts/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 class BaseContract < Disposable::Twin
--- a/app/contracts/concerns/assignable_custom_field_values.rb
+++ b/app/contracts/concerns/assignable_custom_field_values.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module AssignableCustomFieldValues
--- a/app/contracts/concerns/requires_admin_guard.rb
+++ b/app/contracts/concerns/requires_admin_guard.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module RequiresAdminGuard
--- a/app/contracts/concerns/requires_enterprise_guard.rb
+++ b/app/contracts/concerns/requires_enterprise_guard.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module RequiresEnterpriseGuard
--- a/app/contracts/concerns/single_table_inheritance_model_contract.rb
+++ b/app/contracts/concerns/single_table_inheritance_model_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module SingleTableInheritanceModelContract
--- a/app/contracts/concerns/unchanged_project.rb
+++ b/app/contracts/concerns/unchanged_project.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module UnchangedProject
--- a/app/contracts/custom_actions/cu_contract.rb
+++ b/app/contracts/custom_actions/cu_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'model_contract'
--- a/app/contracts/custom_actions/execute_contract.rb
+++ b/app/contracts/custom_actions/execute_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module CustomActions
--- a/app/contracts/custom_fields/base_contract.rb
+++ b/app/contracts/custom_fields/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module CustomFields
--- a/app/contracts/custom_fields/create_contract.rb
+++ b/app/contracts/custom_fields/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module CustomFields
--- a/app/contracts/custom_fields/update_contract.rb
+++ b/app/contracts/custom_fields/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module CustomFields
--- a/app/contracts/delete_contract.rb
+++ b/app/contracts/delete_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 class DeleteContract < ModelContract
--- a/app/contracts/empty_contract.rb
+++ b/app/contracts/empty_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 class EmptyContract < ModelContract
--- a/app/contracts/groups/base_contract.rb
+++ b/app/contracts/groups/base_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Groups
--- a/app/contracts/groups/create_contract.rb
+++ b/app/contracts/groups/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Groups
--- a/app/contracts/groups/delete_contract.rb
+++ b/app/contracts/groups/delete_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Groups
--- a/app/contracts/groups/update_contract.rb
+++ b/app/contracts/groups/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Groups
--- a/app/contracts/members/base_contract.rb
+++ b/app/contracts/members/base_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Members
--- a/app/contracts/members/create_contract.rb
+++ b/app/contracts/members/create_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Members
--- a/app/contracts/members/delete_contract.rb
+++ b/app/contracts/members/delete_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Members
--- a/app/contracts/members/update_contract.rb
+++ b/app/contracts/members/update_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Members
--- a/app/contracts/messages/base_contract.rb
+++ b/app/contracts/messages/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Messages
--- a/app/contracts/messages/create_contract.rb
+++ b/app/contracts/messages/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 # TODO: This is but a stub
--- a/app/contracts/messages/update_contract.rb
+++ b/app/contracts/messages/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 # TODO: This is but a stub
--- a/app/contracts/model_contract.rb
+++ b/app/contracts/model_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require_relative './base_contract'
--- a/app/contracts/notifications/create_contract.rb
+++ b/app/contracts/notifications/create_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Notifications
--- a/app/contracts/oauth/application_contract.rb
+++ b/app/contracts/oauth/application_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module OAuth
--- a/app/contracts/placeholder_users/base_contract.rb
+++ b/app/contracts/placeholder_users/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module PlaceholderUsers
--- a/app/contracts/placeholder_users/create_contract.rb
+++ b/app/contracts/placeholder_users/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module PlaceholderUsers
--- a/app/contracts/placeholder_users/delete_contract.rb
+++ b/app/contracts/placeholder_users/delete_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module PlaceholderUsers
--- a/app/contracts/placeholder_users/update_contract.rb
+++ b/app/contracts/placeholder_users/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module PlaceholderUsers
--- a/app/contracts/projects/archive_contract.rb
+++ b/app/contracts/projects/archive_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Projects
--- a/app/contracts/projects/archiver.rb
+++ b/app/contracts/projects/archiver.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Projects
--- a/app/contracts/projects/base_contract.rb
+++ b/app/contracts/projects/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Projects
--- a/app/contracts/projects/copy_contract.rb
+++ b/app/contracts/projects/copy_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Projects
--- a/app/contracts/projects/create_contract.rb
+++ b/app/contracts/projects/create_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Projects
--- a/app/contracts/projects/delete_contract.rb
+++ b/app/contracts/projects/delete_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'model_contract'
--- a/app/contracts/projects/enabled_modules_contract.rb
+++ b/app/contracts/projects/enabled_modules_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Projects
--- a/app/contracts/projects/unarchive_contract.rb
+++ b/app/contracts/projects/unarchive_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Projects
--- a/app/contracts/projects/update_contract.rb
+++ b/app/contracts/projects/update_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Projects
--- a/app/contracts/queries/base_contract.rb
+++ b/app/contracts/queries/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'model_contract'
--- a/app/contracts/queries/copy_contract.rb
+++ b/app/contracts/queries/copy_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'queries/base_contract'
--- a/app/contracts/queries/create_contract.rb
+++ b/app/contracts/queries/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'queries/base_contract'
--- a/app/contracts/queries/update_contract.rb
+++ b/app/contracts/queries/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'queries/base_contract'
--- a/app/contracts/queries/update_form_contract.rb
+++ b/app/contracts/queries/update_form_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'queries/base_contract'
--- a/app/contracts/relations/base_contract.rb
+++ b/app/contracts/relations/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'model_contract'
--- a/app/contracts/relations/create_contract.rb
+++ b/app/contracts/relations/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'relations/base_contract'
--- a/app/contracts/relations/delete_contract.rb
+++ b/app/contracts/relations/delete_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Relations
--- a/app/contracts/relations/update_contract.rb
+++ b/app/contracts/relations/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'relations/base_contract'
--- a/app/contracts/roles/base_contract.rb
+++ b/app/contracts/roles/base_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Roles
--- a/app/contracts/roles/create_contract.rb
+++ b/app/contracts/roles/create_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Roles
--- a/app/contracts/roles/update_contract.rb
+++ b/app/contracts/roles/update_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Roles
--- a/app/contracts/settings/update_contract.rb
+++ b/app/contracts/settings/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Settings
--- a/app/contracts/types/base_contract.rb
+++ b/app/contracts/types/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 require 'model_contract'
--- a/app/contracts/user_preferences/base_contract.rb
+++ b/app/contracts/user_preferences/base_contract.rb
@ -25,15 +25,32 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module UserPreferences
  class BaseContract < ::BaseContract
+    property :settings
+
    validate :user_allowed_to_access
+    validates :settings,
+              not_nil: true,
+              json: {
+                schema: ->(*) {
+                  UserPreferences::Schema.schema
+                },
+                if: -> { model.settings.present? }
+              }
+
+    validate :time_zone_correctness,
+             if: -> { model.time_zone.present? }

    protected

+    def time_zone_correctness
+      errors.add(:time_zone, :inclusion) if model.time_zone.present? && model.canonical_time_zone.nil?
+    end
+
    ##
    # User preferences can only be accessed with the manage_user permission
    # or if an active, logged user is editing their own prefs
--- a/app/contracts/user_preferences/update_contract.rb
+++ b/app/contracts/user_preferences/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module UserPreferences
--- a/app/contracts/users/base_contract.rb
+++ b/app/contracts/users/base_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Users
--- a/app/contracts/users/create_contract.rb
+++ b/app/contracts/users/create_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Users
--- a/app/contracts/users/delete_contract.rb
+++ b/app/contracts/users/delete_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Users
--- a/app/contracts/users/update_contract.rb
+++ b/app/contracts/users/update_contract.rb
@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Users
--- a/app/contracts/versions/base_contract.rb
+++ b/app/contracts/versions/base_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Versions
--- a/app/contracts/versions/create_contract.rb
+++ b/app/contracts/versions/create_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Versions
--- a/app/contracts/versions/delete_contract.rb
+++ b/app/contracts/versions/delete_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Versions
--- a/app/contracts/versions/update_contract.rb
+++ b/app/contracts/versions/update_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module Versions
--- a/app/contracts/wiki_pages/base_contract.rb
+++ b/app/contracts/wiki_pages/base_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 # Validates both the wiki page as well as its associated wiki content. The two are
--- a/app/contracts/wiki_pages/copy_contract.rb
+++ b/app/contracts/wiki_pages/copy_contract.rb
@ -23,7 +23,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# See docs/COPYRIGHT.rdoc for more details.
+# See COPYRIGHT and LICENSE files for more details.
 #++

 module WikiPages
--- a/Show More
+++ b/Show More