aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2012-04-13 15:30:57 +0200
committerAlban Peignier2012-04-13 15:30:57 +0200
commitfbd28336699cd88a8cc748cfbefe20f5ba9230c2 (patch)
tree01d5b62fcee5301cc3b4e1c4babd7c1fde7e6601
parent52fff6acfd118057f4ad8498de90d93449c0bfa3 (diff)
downloadchouette-core-fbd28336699cd88a8cc748cfbefe20f5ba9230c2.tar.bz2
Update activerecord-jdbcpostgresql-adapter to support template. Refs #6
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 5c2b7c20f..3ef133015 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'apartment', :git => 'git://github.com/dryade/apartment.git'
gem "map_layers", "~> 0.0.4"
platforms :jruby do
- gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git'
+ gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git'
gem 'activerecord-jdbcsqlite3-adapter'
gem 'jruby-openssl'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 6bd050f69..13ae21736 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,16 +11,12 @@ GIT
GIT
remote: git://github.com/dryade/activerecord-jdbc-adapter.git
- revision: 5b45a0a417e146e92db8c57b5c600cdeb9e957bf
+ revision: a26a00e58251af4fed878b117701e8f7e16dce9e
specs:
activerecord-jdbc-adapter (1.2.2)
activerecord-jdbcpostgresql-adapter (1.2.2)
activerecord-jdbc-adapter (~> 1.2.2)
jdbc-postgres (>= 9.0, < 9.2)
- activerecord-jdbcsqlite3-adapter (1.2.2)
- activerecord-jdbc-adapter (~> 1.2.2)
- jdbc-sqlite3 (~> 3.7.2)
- jdbc-postgres (9.1.901)
jdbc-sqlite3 (3.7.2)
GIT
@@ -86,6 +82,9 @@ GEM
activesupport (= 3.1.3)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
+ activerecord-jdbcsqlite3-adapter (1.2.1)
+ activerecord-jdbc-adapter (~> 1.2.1)
+ jdbc-sqlite3 (~> 3.7.2)
activeresource (3.1.3)
activemodel (= 3.1.3)
activesupport (= 3.1.3)
@@ -170,6 +169,7 @@ GEM
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
+ jdbc-postgres (9.0.801)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)