Merge branch 'api' of https://github.com/NARKOZ/gitlabhq
Conflicts: Gemfile.lock
This commit is contained in:
commit
318350e34f
9 changed files with 206 additions and 0 deletions
|
@ -4,6 +4,10 @@ Gitlab::Application.routes.draw do
|
|||
#
|
||||
get 'search' => "search#show"
|
||||
|
||||
# API
|
||||
require 'api'
|
||||
mount Gitlab::API => '/api'
|
||||
|
||||
# Optionally, enable Resque here
|
||||
require 'resque/server'
|
||||
mount Resque::Server.new, at: '/info/resque'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue