diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 143 | ||||
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | lib/core_ext/markdown_handler.rb | 3 |
4 files changed, 82 insertions, 68 deletions
@@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.2.3' +gem 'rails', '~> 6.0.0' # Use mysql as the database for Active Record # gem 'mysql2' # Use SCSS for stylesheets diff --git a/Gemfile.lock b/Gemfile.lock index 14ab1e1..71c12c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,48 +1,61 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.3) - actionpack (= 5.2.3) + actioncable (6.0.0) + actionpack (= 6.0.0) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) + actionmailbox (6.0.0) + actionpack (= 6.0.0) + activejob (= 6.0.0) + activerecord (= 6.0.0) + activestorage (= 6.0.0) + activesupport (= 6.0.0) + mail (>= 2.7.1) + actionmailer (6.0.0) + actionpack (= 6.0.0) + actionview (= 6.0.0) + activejob (= 6.0.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) + actionpack (6.0.0) + actionview (= 6.0.0) + activesupport (= 6.0.0) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.0) + actionpack (= 6.0.0) + activerecord (= 6.0.0) + activestorage (= 6.0.0) + activesupport (= 6.0.0) + nokogiri (>= 1.8.5) + actionview (6.0.0) + activesupport (= 6.0.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.3) - activesupport (= 5.2.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.0) + activesupport (= 6.0.0) globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) - arel (>= 9.0) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) + activemodel (6.0.0) + activesupport (= 6.0.0) + activerecord (6.0.0) + activemodel (= 6.0.0) + activesupport (= 6.0.0) + activestorage (6.0.0) + actionpack (= 6.0.0) + activejob (= 6.0.0) + activerecord (= 6.0.0) marcel (~> 0.3.1) - activesupport (5.2.3) + activesupport (6.0.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - arel (9.0.0) + zeitwerk (~> 2.1, >= 2.1.8) ast (2.4.0) bindex (0.8.1) builder (3.2.3) @@ -70,10 +83,10 @@ GEM elasticsearch-transport (7.3.0) faraday multi_json - erubi (1.8.0) + erubi (1.9.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (0.15.4) + faraday (0.16.1) multipart-post (>= 1.2, < 3) ffi (1.11.1) globalid (0.4.2) @@ -103,11 +116,11 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.12.1) multi_json (1.13.1) multipart-post (2.1.1) - nio4r (2.4.0) - nokogiri (1.10.3) + nio4r (2.5.2) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) octicons (9.1.1) nokogiri (>= 1.6.3.1) @@ -115,25 +128,27 @@ GEM octicons (= 9.1.1) rails parallel (1.17.0) - parser (2.6.3.0) + parser (2.6.4.1) ast (~> 2.4.0) rack (2.0.7) - rack-protection (2.0.5) + rack-protection (2.0.7) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) + 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) bundler (>= 1.3.0) - railties (= 5.2.3) + railties (= 6.0.0) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -142,22 +157,22 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) + railties (6.0.0) + actionpack (= 6.0.0) + activesupport (= 6.0.0) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (12.3.3) + rake (13.0.0) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) rdiscount (2.2.0.1) - rdoc (6.1.1) - redis (4.1.2) + rdoc (6.2.0) + redis (4.1.3) rubocop (0.73.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -172,9 +187,8 @@ GEM rubocop (>= 0.72.0) ruby-progressbar (1.10.1) ruby_dep (1.5.0) - sassc (2.0.1) + sassc (2.2.1) ffi (~> 1.9) - rake sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) @@ -183,11 +197,11 @@ GEM tilt sdoc (1.0.0) rdoc (>= 5.0) - sidekiq (5.2.7) - connection_pool (~> 2.2, >= 2.2.2) - rack (>= 1.5.0) - rack-protection (>= 1.5.0) - redis (>= 3.3.5, < 5) + sidekiq (6.0.0) + connection_pool (>= 2.2.2) + rack (>= 2.0.0) + rack-protection (>= 2.0.0) + redis (>= 4.1.0) spring (2.1.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -202,13 +216,13 @@ GEM rack (>= 1, < 3) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.9) - turbolinks (5.2.0) + tilt (2.0.10) + turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.20) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.6.0) web-console (3.7.0) @@ -219,6 +233,7 @@ GEM websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) + zeitwerk (2.1.10) PLATFORMS ruby @@ -232,7 +247,7 @@ DEPENDENCIES listen nokogiri octicons_helper - rails (~> 5.2.3) + rails (~> 6.0.0) rails-controller-testing rdiscount rubocop (= 0.73.0) @@ -248,4 +263,4 @@ DEPENDENCIES web-console (~> 3.0) BUNDLED WITH - 1.17.3 + 2.0.2 diff --git a/config/application.rb b/config/application.rb index e5cb95e..661c4ee 100644 --- a/config/application.rb +++ b/config/application.rb @@ -20,7 +20,7 @@ Bundler.require(*Rails.groups) module Packages class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 5.1 + config.load_defaults "6.0" # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers diff --git a/lib/core_ext/markdown_handler.rb b/lib/core_ext/markdown_handler.rb index f5ffa7b..a08ed18 100644 --- a/lib/core_ext/markdown_handler.rb +++ b/lib/core_ext/markdown_handler.rb @@ -5,8 +5,7 @@ module MarkdownHandler @erb ||= ActionView::Template.registered_template_handler(:erb) end - def self.call(template) - compiled_source = erb.call(template) + def self.call(template, source) "RDiscount.new(begin;#{compiled_source};end).to_html" end end |