Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 23:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update gems and migrate sanitize to newer version

Browse source
This commit is contained in:
Reinier Balt 2014-06-25 22:11:03 +02:00
parent 64bd5b99c5
commit 4dfcc182da
2 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Gemfile.lock
View file

@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
RedCloth (4.2.9) RedCloth (4.2.9)
aasm (3.1.1) aasm (3.2.1)
actionmailer (4.1.1) actionmailer (4.1.1)
actionpack (= 4.1.1) actionpack (= 4.1.1)
actionview (= 4.1.1) actionview (= 4.1.1)
@ -40,13 +40,13 @@ GEM
rspec-expectations (>= 2.7.0) rspec-expectations (>= 2.7.0)
bcrypt (3.1.7) bcrypt (3.1.7)
builder (3.2.2) builder (3.2.2)
bullet (4.9.0) bullet (4.11.1)
activesupport activesupport (>= 3.0.0)
uniform_notifier (~> 1.6.0) uniform_notifier (>= 1.6.0)
cache_digests (0.3.1) cache_digests (0.3.1)
actionpack (>= 3.2) actionpack (>= 3.2)
thread_safe thread_safe
capybara (2.2.1) capybara (2.3.0)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -63,6 +63,7 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.7.0) coffee-script-source (1.7.0)
crass (0.2.0)
cucumber (1.3.15) cucumber (1.3.15)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.3) diff-lcs (>= 1.1.3)
@ -75,11 +76,11 @@ GEM
mime-types (~> 1.16) mime-types (~> 1.16)
nokogiri (~> 1.5) nokogiri (~> 1.5)
rails (>= 3, < 5) rails (>= 3, < 5)
database_cleaner (1.2.0) database_cleaner (1.3.0)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.3) docile (1.1.5)
erubis (2.7.0) erubis (2.7.0)
execjs (2.0.2) execjs (2.2.0)
factory_girl (4.4.0) factory_girl (4.4.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.4.1) factory_girl_rails (4.4.1)
@ -89,9 +90,9 @@ GEM
gherkin (2.12.2) gherkin (2.12.2)
multi_json (~> 1.3) multi_json (~> 1.3)
hike (1.2.3) hike (1.2.3)
htmlentities (4.3.1) htmlentities (4.3.2)
i18n (0.6.9) i18n (0.6.9)
jquery-rails (3.1.0) jquery-rails (3.1.1)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.1)
@ -102,15 +103,17 @@ GEM
metaclass (0.0.4) metaclass (0.0.4)
mime-types (1.25.1) mime-types (1.25.1)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.3.4) minitest (5.3.5)
mocha (1.1.0) mocha (1.1.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.10.0) multi_json (1.10.1)
multi_test (0.1.1) multi_test (0.1.1)
mysql2 (0.3.16) mysql2 (0.3.16)
nokogiri (1.6.2.1) nokogiri (1.6.2.1)
mini_portile (= 0.6.0) mini_portile (= 0.6.0)
polyglot (0.3.4) nokogumbo (1.1.9)
nokogiri
polyglot (0.3.5)
rack (1.5.2) rack (1.5.2)
rack-mini-profiler (0.9.1) rack-mini-profiler (0.9.1)
rack (>= 1.1.3) rack (>= 1.1.3)
@ -126,7 +129,7 @@ GEM
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.1) railties (= 4.1.1)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails_autolink (1.1.5) rails_autolink (1.1.6)
rails (> 3.1) rails (> 3.1)
railties (4.1.1) railties (4.1.1)
actionpack (= 4.1.1) actionpack (= 4.1.1)
@ -135,19 +138,23 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
ref (1.0.5) ref (1.0.5)
rspec-expectations (2.14.5) rspec-expectations (3.0.2)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rubyzip (1.1.3) rspec-support (~> 3.0.0)
safe_yaml (0.9.7) rspec-support (3.0.2)
sanitize (2.1.0) rubyzip (1.1.4)
safe_yaml (1.0.3)
sanitize (3.0.0)
crass (~> 0.2.0)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
nokogumbo (= 1.1.9)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.3) sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0) sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
selenium-webdriver (2.41.0) selenium-webdriver (2.42.0)
childprocess (>= 0.5.0) childprocess (>= 0.5.0)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip (~> 1.0) rubyzip (~> 1.0)
@ -177,20 +184,20 @@ GEM
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
ref ref
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.3) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
tolk (1.5.0) tolk (1.5.1)
safe_yaml (~> 0.8) safe_yaml (>= 0.8)
will_paginate will_paginate
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (1.1.0) tzinfo (1.2.1)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.0) uglifier (2.5.1)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
uniform_notifier (1.6.1) uniform_notifier (1.6.2)
websocket (1.0.7) websocket (1.0.7)
will_paginate (3.0.5) will_paginate (3.0.5)
xpath (2.0.0) xpath (2.0.0)

7
lib/tracks/utils.rb
View file

@ -27,10 +27,11 @@ module Tracks
rendered = helpers.auto_link(rendered, :link => :urls) rendered = helpers.auto_link(rendered, :link => :urls)
# add onenote and message protocols # add onenote and message protocols
Sanitize::Config::RELAXED[:protocols]['a']['href'] << 'onenote' config = Sanitize::Config.merge(Sanitize::Config::RELAXED,
Sanitize::Config::RELAXED[:protocols]['a']['href'] << 'message' :protocols => { 'a' => {'href' => Sanitize::Config::RELAXED[:protocols]['a']['href'] + ['onenote', 'message']}}
)
rendered = Sanitize.clean(rendered, Sanitize::Config::RELAXED) rendered = Sanitize.clean(rendered, config)
return rendered.html_safe return rendered.html_safe
end end