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

Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse

Browse Source 
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
This commit is contained in:
Robin Ward
2013-02-26 10:42:49 -05:00
parent a42637eb73 cafc75b238
commit 1221c393a3
383 changed files with 4225 additions and 2226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/oneboxer/github_blob_onebox.rb
View File

@ -6,7 +6,7 @@ module Oneboxer
matcher /^https?:\/\/(?:www\.)?github\.com\/[^\/]+\/[^\/]+\/blob\/.*/
favicon 'github.png'
def translate_url
def translate_url
m = @url.match(/github\.com\/(?<user>[^\/]+)\/(?<repo>[^\/]+)\/blob\/(?<sha1>[^\/]+)\/(?<file>[^#]+)(#(L(?<from>[^-]*)(-L(?<to>.*))?))?/mi)
if m
@from = (m[:from] || -1).to_i
@ -19,7 +19,7 @@ module Oneboxer
def parse(data)
if @from > 0
if @from > 0
if @to < 0
@from = @from - 10
@to = @from + 20
@ -42,7 +42,7 @@ module Oneboxer
truncated = true
end
{content: data, truncated: truncated}
{content: data, truncated: truncated}
end
end