bump gems

* Disabling a new linter that rubocop added
 * CommonMarker made SAFE the default
 * The FK support or the bump left some test data around between runs
This commit is contained in:
Peter Bhat Harkins 2018-10-18 08:25:06 -05:00
parent 6a6da094d9
commit 4620a9221b
5 changed files with 22 additions and 19 deletions

View File

@ -30,6 +30,8 @@ Layout/CaseIndentation:
EnforcedStyle: end
Layout/ElseAlignment:
Enabled: false
Layout/EmptyLineAfterGuardClause:
Enabled: false
Layout/EmptyLinesAroundExceptionHandlingKeywords:
Enabled: false
Layout/EndAlignment:

View File

@ -18,7 +18,7 @@ GEM
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.1.0)
actionpack-page_caching (1.1.1)
actionpack (>= 4.0.0, < 6)
actionview (5.2.1)
activesupport (= 5.2.1)
@ -56,7 +56,7 @@ GEM
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
byebug (10.0.2)
capybara (3.6.0)
capybara (3.9.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@ -64,7 +64,7 @@ GEM
rack-test (>= 0.6.3)
xpath (~> 3.1)
chunky_png (1.3.10)
commonmarker (0.17.11)
commonmarker (0.18.1)
ruby-enum (~> 0.5)
concurrent-ruby (1.0.5)
crass (1.0.4)
@ -75,10 +75,10 @@ GEM
actionmailer (>= 4.0, < 6)
activesupport (>= 4.0, < 6)
execjs (2.7.0)
factory_bot (4.11.0)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.11.0)
factory_bot (~> 4.11.0)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
faker (1.9.1)
i18n (>= 0.7)
@ -89,7 +89,7 @@ GEM
activerecord (>= 3.1)
railties (>= 3.1)
htmlentities (4.3.4)
i18n (1.1.0)
i18n (1.1.1)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.1)
jquery-rails (4.3.3)
@ -105,9 +105,9 @@ GEM
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.2)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
@ -116,7 +116,7 @@ GEM
minitest (5.11.3)
mysql2 (0.5.2)
nio4r (2.3.1)
nokogiri (1.8.4)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
oauth (0.5.4)
parallel (1.12.1)
@ -163,7 +163,7 @@ GEM
chunky_png (~> 1.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.1)
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
@ -178,7 +178,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.58.2)
rubocop (0.59.2)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
@ -186,7 +186,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.28.0)
rubocop-rspec (1.30.0)
rubocop (>= 0.58.0)
ruby-enum (0.7.2)
i18n
@ -212,7 +212,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.18)
uglifier (4.1.19)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.4.0)
unicorn (5.4.1)
@ -222,7 +222,7 @@ GEM
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.1.0)
xpath (3.2.0)
nokogiri (~> 1.8)
PLATFORMS

View File

@ -41,9 +41,7 @@ class ApplicationController < ActionController::Base
end
def increase_traffic_counter
if Rails.application.read_only?
return true
end
return true if Rails.application.read_only?
@traffic = 1.0

View File

@ -11,7 +11,7 @@ class Markdowner
walk_text_nodes(root) {|n| postprocess_text_node(n) }
ng = Nokogiri::HTML(root.to_html([:SAFE], exts))
ng = Nokogiri::HTML(root.to_html([:DEFAULT], exts))
# change <h1>, <h2>, etc. headings to just bold tags
ng.css("h1, h2, h3, h4, h5, h6").each do |h|

View File

@ -10,6 +10,9 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f }
Moderation.destroy_all
Tag.destroy_all
Tag.create!([{ tag: "tag1" }, { tag: "tag2" }])
Vote.destroy_all
Story.destroy_all
User.destroy_all
RSpec.configure do |config|
# ## Mock Framework