Created
November 25, 2011 18:12
-
-
Save leucos/1394105 to your computer and use it in GitHub Desktop.
Changes to sample_blog in padrino to make it work
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Gemfile b/Gemfile | |
index 8d95848..90fb80f 100644 | |
--- a/Gemfile | |
+++ b/Gemfile | |
@@ -2,12 +2,13 @@ source :rubygems | |
# Project requirements | |
gem 'bundler', '>= 0.9.26' | |
-gem 'rack-flash' | |
+gem 'sinatra-flash', :require => 'sinatra/flash' | |
gem 'thin' # or mongrel | |
# Component requirements | |
gem 'haml' | |
-gem 'activerecord', "= 2.3.8", :require => "active_record" | |
+gem 'sass' | |
+gem 'activerecord', :require => "active_record" | |
gem 'sqlite3-ruby', :require => "sqlite3" | |
# Test requirements | |
@@ -16,4 +17,4 @@ gem 'shoulda', :group => "test" | |
gem 'rack-test', :require => 'rack/test', :group => 'test' | |
# Padrino | |
-gem 'padrino', ">= 0.9.13" | |
+gem 'padrino' | |
diff --git a/admin/app.rb b/admin/app.rb | |
index 89329dc..6c5e2b9 100644 | |
--- a/admin/app.rb | |
+++ b/admin/app.rb | |
@@ -2,6 +2,7 @@ class Admin < Padrino::Application | |
register Padrino::Helpers | |
register Padrino::Mailer | |
register Padrino::Admin::AccessControl | |
+ register Padrino::Rendering | |
## | |
# Application-specific configuration options |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment