Commit 1c9b9b7a3b0ae2ee60e4cda5d1ac2541c17302f8
1 parent
2677bc3a
Exists in
master
and in
4 other branches
Added Resque as a dependency
Showing
4 changed files
with
23 additions
and
0 deletions
Show diff stats
Gemfile
| @@ -23,6 +23,7 @@ gem "rdiscount" | @@ -23,6 +23,7 @@ gem "rdiscount" | ||
| 23 | gem "acts-as-taggable-on", "~> 2.1.0" | 23 | gem "acts-as-taggable-on", "~> 2.1.0" |
| 24 | gem "drapper" | 24 | gem "drapper" |
| 25 | gem "rchardet19", "~> 1.3.5" | 25 | gem "rchardet19", "~> 1.3.5" |
| 26 | +gem "resque" | ||
| 26 | 27 | ||
| 27 | group :assets do | 28 | group :assets do |
| 28 | gem "sass-rails", "~> 3.1.0" | 29 | gem "sass-rails", "~> 3.1.0" |
Gemfile.lock
| @@ -143,6 +143,8 @@ GEM | @@ -143,6 +143,8 @@ GEM | ||
| 143 | rack (>= 0.4) | 143 | rack (>= 0.4) |
| 144 | rack-mount (0.8.3) | 144 | rack-mount (0.8.3) |
| 145 | rack (>= 1.0.0) | 145 | rack (>= 1.0.0) |
| 146 | + rack-protection (1.1.4) | ||
| 147 | + rack | ||
| 146 | rack-ssl (1.3.2) | 148 | rack-ssl (1.3.2) |
| 147 | rack | 149 | rack |
| 148 | rack-test (0.6.1) | 150 | rack-test (0.6.1) |
| @@ -169,6 +171,14 @@ GEM | @@ -169,6 +171,14 @@ GEM | ||
| 169 | rdiscount (1.6.8) | 171 | rdiscount (1.6.8) |
| 170 | rdoc (3.11) | 172 | rdoc (3.11) |
| 171 | json (~> 1.4) | 173 | json (~> 1.4) |
| 174 | + redis (2.2.2) | ||
| 175 | + redis-namespace (1.0.3) | ||
| 176 | + redis (< 3.0.0) | ||
| 177 | + resque (1.19.0) | ||
| 178 | + multi_json (~> 1.0) | ||
| 179 | + redis-namespace (~> 1.0.2) | ||
| 180 | + sinatra (>= 0.9.2) | ||
| 181 | + vegas (~> 0.1.2) | ||
| 172 | rspec (2.7.0) | 182 | rspec (2.7.0) |
| 173 | rspec-core (~> 2.7.0) | 183 | rspec-core (~> 2.7.0) |
| 174 | rspec-expectations (~> 2.7.0) | 184 | rspec-expectations (~> 2.7.0) |
| @@ -220,6 +230,10 @@ GEM | @@ -220,6 +230,10 @@ GEM | ||
| 220 | multi_json (~> 1.0.3) | 230 | multi_json (~> 1.0.3) |
| 221 | simplecov-html (~> 0.5.3) | 231 | simplecov-html (~> 0.5.3) |
| 222 | simplecov-html (0.5.3) | 232 | simplecov-html (0.5.3) |
| 233 | + sinatra (1.3.1) | ||
| 234 | + rack (~> 1.3, >= 1.3.4) | ||
| 235 | + rack-protection (~> 1.1, >= 1.1.2) | ||
| 236 | + tilt (~> 1.3, >= 1.3.3) | ||
| 223 | six (0.2.0) | 237 | six (0.2.0) |
| 224 | sprockets (2.0.3) | 238 | sprockets (2.0.3) |
| 225 | hike (~> 1.2) | 239 | hike (~> 1.2) |
| @@ -244,6 +258,8 @@ GEM | @@ -244,6 +258,8 @@ GEM | ||
| 244 | uglifier (1.1.0) | 258 | uglifier (1.1.0) |
| 245 | execjs (>= 0.3.0) | 259 | execjs (>= 0.3.0) |
| 246 | multi_json (>= 1.0.2) | 260 | multi_json (>= 1.0.2) |
| 261 | + vegas (0.1.8) | ||
| 262 | + rack (>= 1.0.0) | ||
| 247 | warden (1.1.0) | 263 | warden (1.1.0) |
| 248 | rack (>= 1.0) | 264 | rack (>= 1.0) |
| 249 | xpath (0.1.4) | 265 | xpath (0.1.4) |
| @@ -279,6 +295,7 @@ DEPENDENCIES | @@ -279,6 +295,7 @@ DEPENDENCIES | ||
| 279 | rails-footnotes (~> 3.7.5) | 295 | rails-footnotes (~> 3.7.5) |
| 280 | rchardet19 (~> 1.3.5) | 296 | rchardet19 (~> 1.3.5) |
| 281 | rdiscount | 297 | rdiscount |
| 298 | + resque | ||
| 282 | rspec-rails | 299 | rspec-rails |
| 283 | ruby-debug19 | 300 | ruby-debug19 |
| 284 | sass-rails (~> 3.1.0) | 301 | sass-rails (~> 3.1.0) |
config/routes.rb
| 1 | Gitlab::Application.routes.draw do | 1 | Gitlab::Application.routes.draw do |
| 2 | 2 | ||
| 3 | + # Optionally, enable Resque here | ||
| 4 | + # require 'resque/server' | ||
| 5 | + # mount Resque::Server.new, at: '/info/resque' | ||
| 6 | + | ||
| 3 | get 'tags'=> 'tags#index' | 7 | get 'tags'=> 'tags#index' |
| 4 | get 'tags/:tag' => 'projects#index' | 8 | get 'tags/:tag' => 'projects#index' |
| 5 | 9 |
| @@ -0,0 +1 @@ | @@ -0,0 +1 @@ | ||
| 1 | +require 'resque/tasks' |