Permalink
Browse files

Merge branch 'master' of github.com:robomc/kickoff

  • Loading branch information...
2 parents 9f79d22 + 1d0f89f commit 5a3b799f115c8eb033b091c2bb1f79e7c5c20cb6 Rob McGrail committed Jun 6, 2012
Showing with 6 additions and 6 deletions.
  1. +2 −6 modules/title.rb
  2. +4 −0 settings.rb
View
@@ -1,9 +1,5 @@
helpers do
- def title(arg)
- sitename = 'Kickoff'
- if arg
- sitename = sitename + ' | ' + arg
- end
- @title = sitename
+ def title(arg = nil)
+ @title = arg ? 'Kickoff | ' + arg : @title = 'Kickoff'
end
end
View
@@ -20,6 +20,10 @@
set :haml, {:format => :html5, :ugly => true, :escape_html => true}
end
+configure :test do
+ set :db, 'sqlite3://' + settings.root + '/db/test.sqlite3'
+end
+
# Rack configuration
# Serve static files in dev
if settings.development?

0 comments on commit 5a3b799

Please sign in to comment.