Commit 4c1538a9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use redis as cache storage. cache events

parent 40f18681
...@@ -103,6 +103,9 @@ gem 'settingslogic' ...@@ -103,6 +103,9 @@ gem 'settingslogic'
gem "foreman" gem "foreman"
gem "git" gem "git"
# Cache
gem "redis-rails"
group :assets do group :assets do
gem "sass-rails", "~> 3.2.5" gem "sass-rails", "~> 3.2.5"
gem "coffee-rails", "~> 3.2.2" gem "coffee-rails", "~> 3.2.2"
......
...@@ -329,8 +329,24 @@ GEM ...@@ -329,8 +329,24 @@ GEM
json (~> 1.4) json (~> 1.4)
redcarpet (2.2.2) redcarpet (2.2.2)
redis (3.0.2) redis (3.0.2)
redis-actionpack (3.2.3)
actionpack (~> 3.2.3)
redis-rack (~> 1.4.0)
redis-store (~> 1.1.0)
redis-activesupport (3.2.3)
activesupport (~> 3.2.3)
redis-store (~> 1.1.0)
redis-namespace (1.2.1) redis-namespace (1.2.1)
redis (~> 3.0.0) redis (~> 3.0.0)
redis-rack (1.4.2)
rack (~> 1.4.1)
redis-store (~> 1.1.0)
redis-rails (3.2.3)
redis-actionpack (~> 3.2.3)
redis-activesupport (~> 3.2.3)
redis-store (~> 1.1.0)
redis-store (1.1.3)
redis (>= 2.2.0)
request_store (1.0.5) request_store (1.0.5)
rspec (2.12.0) rspec (2.12.0)
rspec-core (~> 2.12.0) rspec-core (~> 2.12.0)
...@@ -504,6 +520,7 @@ DEPENDENCIES ...@@ -504,6 +520,7 @@ DEPENDENCIES
rb-fsevent rb-fsevent
rb-inotify rb-inotify
redcarpet (~> 2.2.2) redcarpet (~> 2.2.2)
redis-rails
rspec-rails (= 2.12.2) rspec-rails (= 2.12.2)
sass-rails (~> 3.2.5) sass-rails (~> 3.2.5)
sdoc sdoc
......
- if event.proper? - if event.proper?
%div.event-item = cache event do
%span.cgray.pull-right %div.event-item
#{time_ago_in_words(event.created_at)} ago. %span.cgray.pull-right
#{time_ago_in_words(event.created_at)} ago.
= image_tag gravatar_icon(event.author_email), class: "avatar s24" = image_tag gravatar_icon(event.author_email), class: "avatar s24"
- if event.push? - if event.push?
= render "events/event/push", event: event = render "events/event/push", event: event
.clearfix .clearfix
- elsif event.note? - elsif event.note?
= render "events/event/note", event: event = render "events/event/note", event: event
- else - else
= render "events/event/common", event: event = render "events/event/common", event: event
...@@ -40,7 +40,7 @@ Gitlab::Application.configure do ...@@ -40,7 +40,7 @@ Gitlab::Application.configure do
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
# Use a different cache store in production # Use a different cache store in production
config.cache_store = :memory_store config.cache_store = :redis_store
# Enable serving of images, stylesheets, and JavaScripts from an asset server # Enable serving of images, stylesheets, and JavaScripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com" # config.action_controller.asset_host = "http://assets.example.com"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment