summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-11 10:30:24 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-11 10:30:24 +0100
commitb65c9f21c97371b6fbdeeae2e44f4111313b4337 (patch)
tree57004c8006c81bd34d82bbaf6108b93b2b9414ab
parent6dbf83677d0dbaea92ad2f3a9f76f1e6c38300d7 (diff)
Activated dalli as the memcached client.
-rw-r--r--Gemfile7
-rw-r--r--Gemfile.lock3
-rw-r--r--config/environments/production.rb2
3 files changed, 4 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index 0b9ba7a..8609613 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,18 +1,13 @@
source 'http://rubygems.org'
gem 'rails', '3.2.2'
-
gem 'bcrypt-ruby'
-
gem 'sqlite3'
-
gem 'mysql2'
-
gem 'cancan'
-
gem 'state_machine'
-
gem 'acts_as_list'
+gem 'dalli' # memcached
# Useful Rails 4 stuff
#
diff --git a/Gemfile.lock b/Gemfile.lock
index 039336c..fc4ba3a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,6 +54,7 @@ GEM
compass-rails (1.0.0.rc.3)
compass (~> 0.12.rc.0)
cookiejar (0.3.0)
+ dalli (2.6.0)
delayed_job (3.0.1)
activesupport (~> 3.0)
delayed_job_active_record (0.3.2)
@@ -103,7 +104,6 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- memcache-client (1.8.5)
mime-types (1.17.2)
mini_magick (3.4)
subexec (~> 0.2.1)
@@ -184,6 +184,7 @@ DEPENDENCIES
carrierwave
coffee-rails (~> 3.2.1)
compass-rails
+ dalli
delayed_job
delayed_job_active_record
factory_girl
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 26b2f35..f715d91 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -37,7 +37,7 @@ Gemeinschaft42c::Application.configure do
# config.logger = SyslogLogger.new
# Use a different cache store in production
- config.cache_store = :mem_cache_store
+ config.cache_store = :dalli_store
# Enable serving of images, stylesheets, and JavaScripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com"