diff options
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 17 | ||||
| -rw-r--r-- | config/routes.rb | 4 | ||||
| -rw-r--r-- | lib/tasks/resque.rake | 1 |
4 files changed, 23 insertions, 0 deletions
@@ -23,6 +23,7 @@ gem "rdiscount" gem "acts-as-taggable-on", "~> 2.1.0" gem "drapper" gem "rchardet19", "~> 1.3.5" +gem "resque" group :assets do gem "sass-rails", "~> 3.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 54b1e25d6d2..8a45a02699c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,6 +143,8 @@ GEM rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) + rack-protection (1.1.4) + rack rack-ssl (1.3.2) rack rack-test (0.6.1) @@ -169,6 +171,14 @@ GEM rdiscount (1.6.8) rdoc (3.11) json (~> 1.4) + redis (2.2.2) + redis-namespace (1.0.3) + redis (< 3.0.0) + resque (1.19.0) + multi_json (~> 1.0) + redis-namespace (~> 1.0.2) + sinatra (>= 0.9.2) + vegas (~> 0.1.2) rspec (2.7.0) rspec-core (~> 2.7.0) rspec-expectations (~> 2.7.0) @@ -220,6 +230,10 @@ GEM multi_json (~> 1.0.3) simplecov-html (~> 0.5.3) simplecov-html (0.5.3) + sinatra (1.3.1) + rack (~> 1.3, >= 1.3.4) + rack-protection (~> 1.1, >= 1.1.2) + tilt (~> 1.3, >= 1.3.3) six (0.2.0) sprockets (2.0.3) hike (~> 1.2) @@ -244,6 +258,8 @@ GEM uglifier (1.1.0) execjs (>= 0.3.0) multi_json (>= 1.0.2) + vegas (0.1.8) + rack (>= 1.0.0) warden (1.1.0) rack (>= 1.0) xpath (0.1.4) @@ -279,6 +295,7 @@ DEPENDENCIES rails-footnotes (~> 3.7.5) rchardet19 (~> 1.3.5) rdiscount + resque rspec-rails ruby-debug19 sass-rails (~> 3.1.0) diff --git a/config/routes.rb b/config/routes.rb index ad8b0b31eaa..df210a20836 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ Gitlab::Application.routes.draw do + # Optionally, enable Resque here + # require 'resque/server' + # mount Resque::Server.new, at: '/info/resque' + get 'tags'=> 'tags#index' get 'tags/:tag' => 'projects#index' diff --git a/lib/tasks/resque.rake b/lib/tasks/resque.rake new file mode 100644 index 00000000000..9b30bb0a292 --- /dev/null +++ b/lib/tasks/resque.rake @@ -0,0 +1 @@ +require 'resque/tasks' |