Miroirs/devdocs
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/devdocs synced 2024-11-16 19:48:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump Sinatra (2.0) and ActiveSupport (5.1)

Browse source
This commit is contained in:
Thibaut Courouble 2017-05-07 18:33:54 -04:00
parent b6fc76f59e
commit 666f010dd0
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Gemfile.lock
View file

@ -1,12 +1,12 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (5.0.2) activesupport (5.1.0)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7) i18n (~> 0.7)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
backports (3.7.0) backports (3.8.0)
better_errors (2.1.1) better_errors (2.1.1)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
@ -35,6 +35,7 @@ GEM
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.10.1) minitest (5.10.1)
multi_json (1.12.1) multi_json (1.12.1)
mustermann (1.0.0)
nokogiri (1.7.1) nokogiri (1.7.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
options (2.3.2) options (2.3.2)
@ -45,24 +46,25 @@ GEM
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
rack (1.6.5) rack (2.0.1)
rack-protection (1.5.3) rack-protection (2.0.0)
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rake (12.0.0) rake (12.0.0)
rr (1.2.0) rr (1.2.0)
sass (3.4.23) sass (3.4.23)
sinatra (1.4.8) sinatra (2.0.0)
rack (~> 1.5) mustermann (~> 1.0)
rack-protection (~> 1.4) rack (~> 2.0)
tilt (>= 1.3, < 3) rack-protection (= 2.0.0)
sinatra-contrib (1.4.7) tilt (~> 2.0)
sinatra-contrib (2.0.0)
backports (>= 2.0) backports (>= 2.0)
multi_json multi_json
rack-protection mustermann (~> 1.0)
rack-test rack-protection (= 2.0.0)
sinatra (~> 1.4.0) sinatra (= 2.0.0)
tilt (>= 1.3, < 3) tilt (>= 1.3, < 3)
slop (3.6.0) slop (3.6.0)
sprockets (3.7.1) sprockets (3.7.1)

4
lib/app.rb
View file

@ -305,7 +305,7 @@ class App < Sinatra::Application
CODE CODE
end end
get %r{\A/feed(?:\.atom)?\z} do get %r{/feed(?:\.atom)?} do
content_type 'application/atom+xml' content_type 'application/atom+xml'
settings.news_feed settings.news_feed
end end
@ -325,7 +325,7 @@ class App < Sinatra::Application
'codeigniter~3.0' => 'codeigniter~3' 'codeigniter~3.0' => 'codeigniter~3'
} }
get %r{\A/([\w~\.%]+)(\-[\w\-]+)?(/.*)?\z} do |doc, type, rest| get %r{/([\w~\.%]+)(\-[\w\-]+)?(/.*)?} do |doc, type, rest|
doc.sub! '%7E', '~' doc.sub! '%7E', '~'
if DOC_REDIRECTS.key?(doc) if DOC_REDIRECTS.key?(doc)