aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2012-02-15 12:05:38 +0100
committerLuc Donnet2012-02-15 12:05:38 +0100
commitd2121da8941e8e4154fe6970badcd44278e86074 (patch)
tree148e68e8c5a95ec5d01a1d796ea3398af0792c62
parentbefb5afa0ffa88ebced3b9db8f69091f0dcaee3b (diff)
downloadchouette-core-d2121da8941e8e4154fe6970badcd44278e86074.tar.bz2
Update gemfile to include apartment github
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock35
2 files changed, 19 insertions, 17 deletions
diff --git a/Gemfile b/Gemfile
index 0d2a63427..f4fc8a042 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,6 +51,7 @@ gem 'formtastic'
gem 'inherited_resources'
gem 'chouette-ninoxe', :git => 'git://chouette.dryade.priv/ninoxe'
+#gem 'chouette-ninoxe', :path => '/home/luc/projects/ninoxe'
group :development do
# gem 'less'
diff --git a/Gemfile.lock b/Gemfile.lock
index a38e4f514..70ee2d022 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,16 @@
GIT
- remote: git://chouette.dryade.priv/ninoxe
- revision: d5df3cff9665d43fe34ffda32301c0f0715d30e4
+ remote: git://github.com/dryade/activerecord-jdbc-adapter.git
+ revision: 5b45a0a417e146e92db8c57b5c600cdeb9e957bf
specs:
- chouette-ninoxe (0.0.8)
- GeoRuby
- activerecord
- composite_primary_keys
- geokit
+ 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
remote: git://github.com/mflorisson/pickle.git
@@ -27,17 +31,13 @@ GIT
shoulda-matchers (~> 1.0.0.beta1)
PATH
- remote: /home/luc/projects/activerecord-jdbc-adapter
+ remote: /home/luc/projects/ninoxe
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)
+ chouette-ninoxe (0.0.8)
+ GeoRuby
+ activerecord
+ composite_primary_keys
+ geokit
PATH
remote: ~/projects/apartment
@@ -184,6 +184,7 @@ GEM
net-ssh (>= 1.99.1)
nokogiri (1.5.0)
nokogiri (1.5.0-java)
+ pg (0.11.0)
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.1)