Permalink
Browse files

Merge branch 'master' of github.com:kartikrustagi/Words

Conflicts:
	config.ru
  • Loading branch information...
2 parents 99b82cb + 350b767 commit 08ada68059982baec2e2c230e6ecf2489ca7177b @kartikrustagi committed Apr 5, 2012
Showing with 10 additions and 7 deletions.
  1. +2 −0 .gitignore
  2. +4 −3 Gemfile
  3. +2 −0 Gemfile.lock
  4. +1 −2 app.rb
  5. +1 −2 config.ru
View
@@ -1,2 +1,4 @@
*~
+*.bundle
*.pyc
+*.swp
View
@@ -1,7 +1,8 @@
source "http://rubygems.org"
gem "sinatra"
-gem "haml"
+gem "haml", :require => 'Haml'
gem "sequel"
-gem "shotgun"
-gem "mysql"
+gem "shotgun", :group => :development
+gem "mysql", :group => :development
+gem "pg", :group => :deployment
View
@@ -3,6 +3,7 @@ GEM
specs:
haml (3.1.4)
mysql (2.8.1)
+ pg (0.13.2)
rack (1.4.1)
rack-protection (1.2.0)
rack
@@ -21,6 +22,7 @@ PLATFORMS
DEPENDENCIES
haml
mysql
+ pg
sequel
shotgun
sinatra
View
3 app.rb
@@ -1,5 +1,4 @@
-require 'sinatra/base'
-require 'Haml'
+require "bundler/setup"
require_relative 'db/db_config.rb'
require_relative 'db/models/init.rb'
View
@@ -1,5 +1,4 @@
-require 'sinatra/base'
-require 'haml'
+require "bundler/setup"
path = File.expand_path("../",__FILE__)
$LOAD_PATH.unshift(".") unless $LOAD_PATH.include?(".")

0 comments on commit 08ada68

Please sign in to comment.