Discource-C
/
discourse-adplugin
mirror of https://github.com/discourse/discourse-adplugin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Update rubocop-discourse to version 3.8.0 (#208)

This commit is contained in:
Loïc Guitaut 2024-05-28 11:11:14 +02:00 committed by GitHub
parent f5c1b6da59
commit 5f1e07c556
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Gemfile.lock
View File

@ -1,7 +1,7 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (7.1.3.2) activesupport (7.1.3.3)
base64 base64
bigdecimal bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
@ -13,27 +13,28 @@ GEM
tzinfo (~> 2.0) tzinfo (~> 2.0)
ast (2.4.2) ast (2.4.2)
base64 (0.2.0) base64 (0.2.0)
bigdecimal (3.1.6) bigdecimal (3.1.8)
concurrent-ruby (1.2.3) concurrent-ruby (1.2.3)
connection_pool (2.4.1) connection_pool (2.4.1)
drb (2.2.1) drb (2.2.1)
i18n (1.14.1) i18n (1.14.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
json (2.7.1) json (2.7.2)
language_server-protocol (3.17.0.3) language_server-protocol (3.17.0.3)
minitest (5.22.2) minitest (5.23.1)
mutex_m (0.2.0) mutex_m (0.2.0)
parallel (1.24.0) parallel (1.24.0)
parser (3.3.0.5) parser (3.3.1.0)
ast (~> 2.4.1) ast (~> 2.4.1)
racc racc
prettier_print (1.2.1) prettier_print (1.2.1)
racc (1.7.3) racc (1.8.0)
rack (3.0.11)
rainbow (3.1.1) rainbow (3.1.1)
regexp_parser (2.9.0) regexp_parser (2.9.2)
rexml (3.2.8) rexml (3.2.8)
strscan (>= 3.0.9) strscan (>= 3.0.9)
rubocop (1.61.0) rubocop (1.64.0)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
@ -41,25 +42,34 @@ GEM
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0) regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0) rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0) unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.1) rubocop-ast (1.31.3)
parser (>= 3.3.0.4) parser (>= 3.3.1.0)
rubocop-capybara (2.20.0) rubocop-capybara (2.20.0)
rubocop (~> 1.41) rubocop (~> 1.41)
rubocop-discourse (3.7.1) rubocop-discourse (3.8.0)
activesupport (>= 6.1) activesupport (>= 6.1)
rubocop (>= 1.59.0) rubocop (>= 1.59.0)
rubocop-capybara (>= 2.0.0) rubocop-capybara (>= 2.0.0)
rubocop-factory_bot (>= 2.0.0) rubocop-factory_bot (>= 2.0.0)
rubocop-rails (>= 2.25.0)
rubocop-rspec (>= 2.25.0) rubocop-rspec (>= 2.25.0)
rubocop-factory_bot (2.25.1) rubocop-factory_bot (2.25.1)
rubocop (~> 1.41) rubocop (~> 1.41)
rubocop-rspec (2.27.1) rubocop-rails (2.25.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (2.29.2)
rubocop (~> 1.40) rubocop (~> 1.40)
rubocop-capybara (~> 2.17) rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22) rubocop-factory_bot (~> 2.22)
rubocop-rspec_rails (~> 2.28)
rubocop-rspec_rails (2.28.3)
rubocop (~> 1.40)
ruby-progressbar (1.13.0) ruby-progressbar (1.13.0)
strscan (3.1.0) strscan (3.1.0)
syntax_tree (6.2.0) syntax_tree (6.2.0)
@ -76,4 +86,4 @@ DEPENDENCIES
syntax_tree syntax_tree
BUNDLED WITH BUNDLED WITH
2.5.4 2.5.10

2
app/controllers/adstxt_controller.rb
View File

@ -6,7 +6,7 @@ class AdstxtController < ::ApplicationController
skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
def index def index
raise Discourse::NotFound unless SiteSetting.ads_txt.present? raise Discourse::NotFound if SiteSetting.ads_txt.blank?
render plain: SiteSetting.ads_txt render plain: SiteSetting.ads_txt
end end

2
app/models/house_ad_setting.rb
View File

@ -48,7 +48,7 @@ module ::AdPlugin
end end
def self.update(setting_name, value) def self.update(setting_name, value)
raise Discourse::NotFound unless DEFAULTS.keys.include?(setting_name.to_sym) raise Discourse::NotFound if DEFAULTS.keys.exclude?(setting_name.to_sym)
ad_names = value&.split("|") || [] ad_names = value&.split("|") || []

9
package.json
View File

@ -1,10 +1,9 @@
{ {
"name": "discourse-adplugin",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@discourse/lint-configs": "^1.3.5", "@discourse/lint-configs": "1.3.9",
"ember-template-lint": "^5.13.0", "ember-template-lint": "6.0.0",
"eslint": "^8.56.0", "eslint": "8.57.0",
"prettier": "^2.8.8" "prettier": "2.8.8"
} }
} }