Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated Padrino/Sinatra pair to 0.9.20/1.1.2.

  • Loading branch information...
commit 677d60a1433173ed83f2433b49399d2d43071946 1 parent b7ebed8
Fred Wu authored
Showing with 28 additions and 27 deletions.
  1. +2 −2 Gemfile
  2. +24 −24 Gemfile.lock
  3. +2 −1  app/views/layouts/application.html.slim
4 Gemfile
View
@@ -19,5 +19,5 @@ gem 'rdiscount'
gem 'rack-test', :require => 'rack/test', :group => :test
# Padrino
-gem 'sinatra', '1.1.0', :require => 'sinatra/base'
-gem 'padrino', '0.9.19'
+gem 'sinatra', '1.1.2', :require => 'sinatra/base'
+gem 'padrino', '0.9.20'
48 Gemfile.lock
View
@@ -18,7 +18,7 @@ GEM
daemons (1.1.0)
eventmachine (0.12.10)
git (1.2.5)
- http_router (0.4.1)
+ http_router (0.5.2)
rack (>= 1.0.0)
url_mount (~> 0.2.1)
i18n (0.5.0)
@@ -30,31 +30,31 @@ GEM
mime-types (1.16)
mini_magick (3.2)
subexec (~> 0.0.4)
- padrino (0.9.19)
- padrino-admin (= 0.9.19)
- padrino-core (= 0.9.19)
- padrino-gen (= 0.9.19)
- padrino-helpers (= 0.9.19)
- padrino-mailer (= 0.9.19)
- padrino-admin (0.9.19)
- padrino-core (= 0.9.19)
- padrino-helpers (= 0.9.19)
- padrino-core (0.9.19)
+ padrino (0.9.20)
+ padrino-admin (= 0.9.20)
+ padrino-core (= 0.9.20)
+ padrino-gen (= 0.9.20)
+ padrino-helpers (= 0.9.20)
+ padrino-mailer (= 0.9.20)
+ padrino-admin (0.9.20)
+ padrino-core (= 0.9.20)
+ padrino-helpers (= 0.9.20)
+ padrino-core (0.9.20)
activesupport (>= 3.0.0)
- http_router (~> 0.4.0)
+ http_router (~> 0.5.0)
sinatra (>= 1.1.0)
thor (>= 0.14.3)
tzinfo
- padrino-gen (0.9.19)
+ padrino-gen (0.9.20)
bundler (>= 1.0.2)
git
- padrino-core (= 0.9.19)
- padrino-helpers (0.9.19)
+ padrino-core (= 0.9.20)
+ padrino-helpers (0.9.20)
i18n (>= 0.4.1)
- padrino-core (= 0.9.19)
- padrino-mailer (0.9.19)
+ padrino-core (= 0.9.20)
+ padrino-mailer (0.9.20)
mail (>= 2.2.0)
- padrino-core (= 0.9.19)
+ padrino-core (= 0.9.20)
polyglot (0.3.1)
rack (1.2.1)
rack-cache (1.0)
@@ -65,16 +65,16 @@ GEM
rack (>= 1.0)
rake (0.8.7)
rdiscount (1.6.5)
- sass (3.1.0.alpha.217)
- sinatra (1.1.0)
+ sass (3.1.0.alpha.218)
+ sinatra (1.1.2)
rack (~> 1.1)
- tilt (~> 1.1)
+ tilt (~> 1.2)
slim (0.8.3)
temple (~> 0.1.6)
tilt (~> 1.1)
sqlite3 (1.3.3)
subexec (0.0.4)
- temple (0.1.6)
+ temple (0.1.7)
thin (1.2.7)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -94,14 +94,14 @@ DEPENDENCIES
activerecord (~> 3.0.3)
carrierwave
mini_magick
- padrino (= 0.9.19)
+ padrino (= 0.9.20)
rack-cache (~> 1.0)
rack-flash
rack-test
rake
rdiscount
sass
- sinatra (= 1.1.0)
+ sinatra (= 1.1.2)
slim (>= 0.8.3)
sqlite3
thin
3  app/views/layouts/application.html.slim
View
@@ -39,4 +39,5 @@ html
#crowd-footer
#crowd-footer2
#crowd-footer-strip
- == partial 'layouts/google_analytics' if Padrino.env == :production
+ - if Padrino.env == :production
+ == partial 'layouts/google_analytics'
Please sign in to comment.
Something went wrong with that request. Please try again.