Merge branch 'master' into deploy_keys

Conflicts:
	app/models/project.rb
This commit is contained in:
miks 2011-12-29 21:46:21 +02:00
commit f8ad4d2b42
35 changed files with 556 additions and 90 deletions

View file

@ -1,5 +1,8 @@
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'