projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
2c837d8
)
Load memcached in case we are using it
author
Tom Hughes
<tom@compton.nu>
Sun, 2 Oct 2011 16:10:37 +0000
(17:10 +0100)
committer
Tom Hughes
<tom@compton.nu>
Mon, 14 Nov 2011 09:42:56 +0000
(09:42 +0000)
Gemfile
patch
|
blob
|
history
Gemfile.lock
patch
|
blob
|
history
diff --git
a/Gemfile
b/Gemfile
index 0a4f1638c8a0c964ffc5ac7b4e9c7c2c0f1ba457..40a8b66286f95c748805e327856aad8c02f75968 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-34,8
+34,8
@@
gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
# Load httpclient for SOAP support for Quova GeoIP queries
gem 'httpclient'
-#
Should only load if memcache is in use
-
#
gem 'memcached'
+#
Load memcache in case we are using it
+gem 'memcached'
# Gems needed for running tests
group :test do
diff --git
a/Gemfile.lock
b/Gemfile.lock
index dfa191d95e18ed6a3491f9dcd5d3945540f1f6a4..c96607d50e51dd644ecd9f47764108c5dcd624eb 100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-60,6
+60,7
@@
GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ memcached (1.3.3)
mime-types (1.16)
multi_json (1.0.3)
multipart-post (1.1.3)
@@
-150,6
+151,7
@@
DEPENDENCIES
dynamic_form
httpclient
libxml-ruby (>= 2.0.5)
+ memcached
oauth-plugin (>= 0.4.0.pre7)
open_id_authentication (>= 1.1.0)
pg