Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

Gemfile.lock

@@ -64,6 +64,7 @@ GEM
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
+    ast (2.4.0)
     autoprefixer-rails (9.7.4)
       execjs
     awesome_print (1.8.0)
@@ -75,6 +76,8 @@ GEM
     axlsx_rails (0.5.2)
       actionpack (>= 3.1)
       axlsx (>= 2.0.1)
+    backport (1.1.2)
+    benchmark (0.1.0)
     bindex (0.8.1)
     bootsnap (1.4.6)
       msgpack (~> 1.0)
@@ -107,6 +110,7 @@ GEM
       activerecord (>= 3.1.0, < 7)
     diff-lcs (1.3)
     diffy (3.3.0)
+    e2mmap (0.1.0)
     elasticsearch (7.5.0)
       elasticsearch-api (= 7.5.0)
       elasticsearch-transport (= 7.5.0)
@@ -140,6 +144,7 @@ GEM
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
+    jaro_winkler (1.5.4)
     jbuilder (2.10.0)
       activesupport (>= 5.0.0)
     jquery-rails (4.3.5)
@@ -170,6 +175,7 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
+    maruku (0.7.3)
     method_source (0.9.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
@@ -205,8 +211,11 @@ GEM
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
     parallel (1.19.1)
+    parser (2.7.1.1)
+      ast (~> 2.4.0)
     pdfkit (0.8.4.1)
     popper_js (1.16.0)
+    powerpack (0.1.2)
     public_suffix (4.0.3)
     puma (3.12.2)
     rack (2.0.9)
@@ -245,6 +254,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
@@ -271,6 +281,8 @@ GEM
     regexp_parser (1.7.0)
     request_store (1.5.0)
       rack (>= 1.4)
+    reverse_markdown (1.4.0)
+      nokogiri
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -300,7 +312,15 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rubocop (0.52.1)
+      parallel (~> 1.10)
+      parser (>= 2.4.0.2, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-ole (1.2.12.2)
+    ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
     ruby_dep (1.5.0)
     rubyzip (1.3.0)
@@ -346,6 +366,20 @@ GEM
       rack (~> 2.0)
       rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
+    solargraph (0.38.6)
+      backport (~> 1.1)
+      benchmark
+      bundler (>= 1.17.2)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      maruku (~> 0.7, >= 0.7.3)
+      nokogiri (~> 1.9, >= 1.9.1)
+      parser (~> 2.3)
+      reverse_markdown (~> 1.0, >= 1.0.5)
+      rubocop (~> 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9)
     spreadsheet (1.2.6)
       ruby-ole (>= 1.0)
     spring (2.0.2)
@@ -384,6 +418,7 @@ GEM
     wkhtmltopdf-binary (0.12.5.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -437,6 +472,7 @@ DEPENDENCIES
   rqrcode (~> 0.10.1)
   rqrcode_png
   rspec-rails (~> 3.8)
+  rubocop (~> 0.52.0)
   ruby-ole
   rubyzip
   sass-rails (~> 5.0)
@@ -446,6 +482,7 @@ DEPENDENCIES
   simple_form
   simple_xlsx_reader
   sinatra
+  solargraph (~> 0.38.0)
   spreadsheet
   spring
   spring-watcher-listen (~> 2.0.0)