Permalink
Browse files

checking in

  • Loading branch information...
1 parent ce11eb7 commit 4648981e37288ca29eaad1db058bbbf0484c54a9 @joshkerr committed May 14, 2012
Showing with 37 additions and 2 deletions.
  1. +4 −1 Gemfile
  2. +25 −1 Gemfile.lock
  3. +8 −0 config/database.yml
View
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
gem 'rails', '~> 3'
@@ -13,6 +13,9 @@ gem 'redcarpet'
# gem 'bcrypt-ruby', '~> 3', require: 'bcrypt'
gem 'stringex', '~> 1', git: 'git://github.com/rsl/stringex.git'
gem 'kaminari', '~> 0.13'
+gem 'taps'
+gem 'heroku'
+gem 'mysql'
group :production do
# gem 'newrelic_rpm', '~> 3'
View
@@ -5,7 +5,7 @@ GIT
stringex (1.3.2)
GEM
- remote: https://rubygems.org/
+ remote: http://rubygems.org/
specs:
actionmailer (3.2.0)
actionpack (= 3.2.0)
@@ -34,6 +34,7 @@ GEM
activesupport (3.2.0)
i18n (~> 0.6)
multi_json (~> 1.0)
+ addressable (2.2.8)
arel (3.0.2)
builder (3.0.0)
capybara (1.1.2)
@@ -72,6 +73,11 @@ GEM
foreman (0.41.0-x86-mingw32)
thor (>= 0.13.6)
win32console (~> 1.3.0)
+ heroku (2.25.0)
+ launchy (>= 0.3.2)
+ netrc (~> 0.7.1)
+ rest-client (~> 1.6.1)
+ rubyzip
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
@@ -83,12 +89,17 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
+ launchy (2.1.0)
+ addressable (~> 2.2.6)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
multi_json (1.1.0)
+ mysql (2.8.1)
+ mysql (2.8.1-x86-mingw32)
+ netrc (0.7.1)
nokogiri (1.5.2)
nokogiri (1.5.2-x86-mingw32)
pg (0.13.2)
@@ -128,6 +139,8 @@ GEM
rdoc (3.12)
json (~> 1.4)
redcarpet (2.1.1)
+ rest-client (1.6.7)
+ mime-types (>= 1.16)
rubyzip (0.9.6.1)
sass (3.1.15)
sass-rails (3.2.5)
@@ -139,7 +152,10 @@ GEM
ffi (~> 1.0)
multi_json (~> 1.0)
rubyzip
+ sequel (3.20.0)
sexp_processor (3.1.0)
+ sinatra (1.0)
+ rack (>= 1.0)
spork (0.9.0)
spork (0.9.0-x86-mingw32)
win32-process
@@ -149,6 +165,11 @@ GEM
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
sqlite3 (1.3.5-x86-mingw32)
+ taps (0.3.24)
+ rack (>= 1.0.1)
+ rest-client (>= 1.4.0, < 1.7.0)
+ sequel (~> 3.20.0)
+ sinatra (~> 1.0.0)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -185,8 +206,10 @@ DEPENDENCIES
factory_girl_rails (~> 1)
faker (~> 1)
foreman (~> 0.40)
+ heroku
jquery-rails (~> 2)
kaminari (~> 0.13)
+ mysql
pg (~> 0.13)
rails (~> 3)
rails_best_practices (~> 1)
@@ -195,5 +218,6 @@ DEPENDENCIES
spork (~> 0.9)
sqlite3 (~> 1)
stringex (~> 1)!
+ taps
thin (~> 1)
uglifier (~> 1)
View
@@ -25,3 +25,11 @@ production:
username:
password:
host: localhost
+
+wordpress:
+ adapter: mysql
+ encoding: utf8
+ database: wordpress
+ username: wp_user
+ password: Argus1809.
+ host: kerr.tv

0 comments on commit 4648981

Please sign in to comment.