Merge branch 'bugfixes' into dependabot/bundler/rack-2.1.4

gems-uff · Jul 2, 2020 · 67901be · 67901be
2 parents 678715c + 36053c5
commit 67901be
Show file tree

Hide file tree

Showing 348 changed files with 74,289 additions and 83 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ env:
   global:
     - CC_TEST_REPORTER_ID=e124d2db428c426bc2e4a984bbc007b5ecf7c0ee2533b687adac0f301048afae
 language: ruby
-rvm: 2.4
+rvm: 2.7
 cache: bundler
 before_script: 
   - bundle exec rake db:reset

diff --git a/Gemfile b/Gemfile
@@ -1,23 +1,23 @@
 source 'https://rubygems.org'
 
-# The following line is necessary to allow RVM choosing the correct ruby version. RVM 2.0 will probably be able to interpret the "~>" symbol and we will be able to safely remove the "#ruby=2.4" line.
-#ruby=2.4
-ruby '~> 2.4.0'
+# The following line is necessary to allow RVM choosing the correct ruby version. RVM 2.0 will probably be able to interpret the "~>" symbol and we will be able to safely remove the "#ruby=2.7" line.
+#ruby=2.7
+ruby '~> 2.7.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.4.3'
+gem 'rails', '~> 6.0.3.2'
 
 gem 'rubyzip', '~> 1.3.0'
 gem 'loofah', '~> 2.3.1'
-gem 'rails-html-sanitizer', '~> 1.0.4'
+gem 'rails-html-sanitizer'
 gem 'rack', '~> 2.1.4'
 gem 'ffi', '>= 1.9.24'
-gem "nokogiri", "~> 1.10.8"
-gem "actionview", "~> 5.2.4.2"
+gem "nokogiri", "~> 1.11.0.rc2"
+gem "actionview", "~> 6.0.3.2"
 gem "rake", "~> 12.3.3"
-gem 'activestorage', '~> 5.2.4.3'
-gem 'actionpack', '~> 5.2.4.3'
-gem 'activesupport', '~> 5.2.4.3'
+gem 'activestorage', '~> 6.0.3.2'
+gem 'actionpack', '~> 6.0.3.2'
+gem 'activesupport', '~> 6.0.3.2'
 
 gem 'rspec-collection_matchers'
 
@@ -79,11 +79,10 @@ gem 'simple-navigation'
 
 # Notification
 gem 'rufus-scheduler'
-gem 'codemirror-rails'
 
 # Image
 gem 'carrierwave', '1.3.1'
-gem 'carrierwave-activerecord', :git => 'https://github.com/gems-uff/carrierwave-activerecord.git', :branch => 'rails5'
+gem 'carrierwave-activerecord', :git => 'https://github.com/gems-uff/carrierwave-activerecord.git', :branch => 'rails6'
 
 
 group :development, :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,11 +10,11 @@ GIT
 
 GIT
   remote: https://github.com/gems-uff/carrierwave-activerecord.git
-  revision: a74a4a4235567fe65cad172fd61695d01d920bbd
-  branch: rails5
+  revision: 61c995e75059f3142b71cbc020cda1e93f583834
+  branch: rails6
   specs:
     carrierwave-activerecord (0.1.0rc15)
-      activerecord (~> 5.0)
+      activerecord (~> 6.0)
       carrierwave (>= 0.10.0)
 
 GIT
@@ -33,50 +33,63 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.3)
-      actionpack (= 5.2.4.3)
+    actioncable (6.0.3.2)
+      actionpack (= 6.0.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
+    actionmailbox (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_scaffold_duplicate (1.1.3)
       active_scaffold (>= 3.6.0.pre)
-    activejob (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activejob (6.0.3.2)
+      activesupport (= 6.0.3.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
-      arel (>= 9.0)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activestorage (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
     awesome_print (1.8.0)
     bcrypt (3.1.13)
     better_errors (2.6.0)
@@ -93,8 +106,6 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     choice (0.2.0)
-    codemirror-rails (5.16.0)
-      railties (>= 3.0, < 6.0)
     coderay (1.1.2)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -137,7 +148,7 @@ GEM
     gjman (0.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jbuilder (2.10.0)
@@ -174,15 +185,14 @@ GEM
     mime-types-data (3.2019.1009)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.1)
     mysql2 (0.5.3)
     mysql2 (0.5.3-x86-mingw32)
     nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.9-x86-mingw32)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.0.rc2)
+      mini_portile2 (~> 2.5.0)
+    nokogiri (1.11.0.rc2-x86-mingw32)
     odf-report (0.7.0)
       mime-types
       nokogiri (>= 1.10.0)
@@ -205,18 +215,20 @@ GEM
     rack (2.1.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    rails (6.0.3.2)
+      actioncable (= 6.0.3.2)
+      actionmailbox (= 6.0.3.2)
+      actionmailer (= 6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actiontext (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.3)
+      railties (= 6.0.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -226,14 +238,14 @@ GEM
       activesupport (>= 4.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rake (12.3.3)
     rdoc (6.2.1)
     recordselect (3.10.1)
@@ -290,7 +302,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     spring (2.1.0)
-    sprockets (3.7.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -316,7 +328,8 @@ GEM
     webrick (1.6.0)
     websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.3.1)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)
 
@@ -325,12 +338,12 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  actionpack (~> 5.2.4.3)
-  actionview (~> 5.2.4.2)
+  actionpack (~> 6.0.3.2)
+  actionview (~> 6.0.3.2)
   active_scaffold!
   active_scaffold_duplicate (>= 1.1.0)
-  activestorage (~> 5.2.4.3)
-  activesupport (~> 5.2.4.3)
+  activestorage (~> 6.0.3.2)
+  activesupport (~> 6.0.3.2)
   awesome_print
   better_errors
   binding_of_caller
@@ -339,7 +352,6 @@ DEPENDENCIES
   carrierwave (= 1.3.1)
   carrierwave-activerecord!
   clamsy!
-  codemirror-rails
   coffee-rails
   devise (~> 4.7.1)
   exception_notification (= 2.6.1)
@@ -353,16 +365,16 @@ DEPENDENCIES
   kaminari
   loofah (~> 2.3.1)
   mysql2
-  nokogiri (~> 1.10.8)
+  nokogiri (~> 1.11.0.rc2)
   odf-report
   paper_trail
   prawn
   prawn-table
   prawn_rails
   rack (~> 2.1.4)
-  rails (~> 5.2.4.3)
+  rails (~> 6.0.3.2)
   rails-erd
-  rails-html-sanitizer (~> 1.0.4)
+  rails-html-sanitizer
   rake (~> 12.3.3)
   rdoc
   recordselect
@@ -383,7 +395,7 @@ DEPENDENCIES
   webrick
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.7.1p83
 
 BUNDLED WITH
    2.1.4
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -0,0 +1,3 @@
+  //= link_tree ../images
+  //= link_directory ../javascripts .js
+  //= link_directory ../stylesheets .css
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,9 +14,9 @@
 //= require jquery-ui
 //= require jquery_ujs
 //= require active_scaffold
+//= require codemirror/lib/codemirror
+//= require codemirror/mode/javascript/javascript
 //= require codemirror
-//= require codemirror/modes/sql
-//= require codemirror/modes/xml
 //= require_tree .
 
 

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -16,6 +16,7 @@
  *= require active_scaffold_colors
  *= require jquery-ui
  *= require jquery-ui/datepicker
+ *= require codemirror/lib/codemirror
  *= require codemirror
  *= require_tree .
  *= require active_scaffold_overrides

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -18,7 +18,7 @@ class ApplicationController < ActionController::Base
   clear_helpers
 
 
-  ActiveScaffold.set_defaults do |config|
+  ActiveScaffold.defaults do |config|
     config.ignore_columns.add [:created_at, :updated_at, :lock_version, :versions]
     config.create.link.label = :create_link
     config.delete.link.label = "<i title='#{I18n.t('active_scaffold.delete_link')}' class='fa fa-trash-o'></i>".html_safe

diff --git a/config/initializers/active_scaffold.rb b/config/initializers/active_scaffold.rb
@@ -3,6 +3,6 @@
 
 ActiveScaffold.js_framework = :jquery
 
-ActiveScaffold.set_defaults do |config|
+ActiveScaffold.defaults do |config|
   config.security.default_permission = false
-end
+end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -1,5 +1,6 @@
 # Copyright (c) Universidade Federal Fluminense (UFF).
 # This file is part of SAPOS. Please, consult the license terms in the LICENSE file.
 
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
 Rails.application.config.assets.precompile += %w( active_scaffold/indicator.gif )
 
diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity