github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-26 10:42:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Strip multiline comments in github oneboxes (#30040)

Browse Source 
We were already stripping comments from GitHub issue/PR oneboxes, but the regex was not correctly matching multiline comments.
This commit is contained in:
David Taylor
2024-12-02 18:08:55 +00:00
committed by GitHub
parent 31dadc8373
commit b47ae6d437
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/onebox/engine/github_pull_request_onebox.rb
View File

@ -12,8 +12,6 @@ module Onebox
include Onebox::Mixins::GithubBody include Onebox::Mixins::GithubBody
include Onebox::Mixins::GithubAuthHeader include Onebox::Mixins::GithubAuthHeader
GITHUB_COMMENT_REGEX = /(<!--.*?-->\r\n)/
matches_regexp(%r{^https?://(?:www\.)?(?:(?:\w)+\.)?(github)\.com(?:/)?(?:.)*/pull}) matches_regexp(%r{^https?://(?:www\.)?(?:(?:\w)+\.)?(github)\.com(?:/)?(?:.)*/pull})
always_https always_https

2
lib/onebox/engine/github_repo_onebox.rb
View File

@ -11,7 +11,7 @@ module Onebox
include JSON include JSON
include Onebox::Mixins::GithubAuthHeader include Onebox::Mixins::GithubAuthHeader
GITHUB_COMMENT_REGEX = /(<!--.*?-->\r\n)/ GITHUB_COMMENT_REGEX = /(<!--.*?-->\r\n)/m
matches_regexp(%r{^https?:\/\/(?:www\.)?(?!gist\.)[^\/]*github\.com\/[^\/]+\/[^\/]+\/?$}) matches_regexp(%r{^https?:\/\/(?:www\.)?(?!gist\.)[^\/]*github\.com\/[^\/]+\/[^\/]+\/?$})
always_https always_https

2
lib/onebox/mixins/github_body.rb
View File

@ -9,7 +9,7 @@ module Onebox
end end
module InstanceMethods module InstanceMethods
GITHUB_COMMENT_REGEX = /<!--.*?-->/ GITHUB_COMMENT_REGEX = /<!--.*?-->/m
MAX_BODY_LENGTH = 80 MAX_BODY_LENGTH = 80
def compute_body(body) def compute_body(body)