projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21a9282
)
add back pg gem
author
Tom Clegg <tom@clinicalfuture.com>
Tue, 15 Jan 2013 22:39:34 +0000
(14:39 -0800)
committer
Tom Clegg <tom@clinicalfuture.com>
Tue, 15 Jan 2013 22:39:34 +0000
(14:39 -0800)
Gemfile
patch
|
blob
|
history
Gemfile.lock
patch
|
blob
|
history
diff --git
a/Gemfile
b/Gemfile
index 090a4fd6ed6262896506e8cd9843ec0286f1a9af..caba64e269e317cfdf731e2bc039c1a62cea14f4 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-6,6
+6,7
@@
gem 'rails', '3.2.11'
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3'
+gem 'pg'
# Gems used only for assets and not required
diff --git
a/Gemfile.lock
b/Gemfile.lock
index 02573d48dff64f5b9e3a012f28a4bc203706719f..38bb22fb0d038b2c22842fcc34feb3f2cc5ea89a 100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-75,6
+75,7
@@
GEM
fastthread (>= 1.0.1)
rack
rake (>= 0.8.1)
+ pg (0.14.1)
polyglot (0.3.3)
rack (1.4.4)
rack-cache (1.2)
@@
-135,6
+136,7
@@
DEPENDENCIES
coffee-rails (~> 3.2.1)
jquery-rails
passenger
+ pg
rails (= 3.2.11)
rvm-capistrano
sass-rails (~> 3.2.3)