diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-25 18:06:24 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-25 18:06:24 +0200 |
| commit | 4037a738945631c5fc58c464d4a9b12e9448387a (patch) | |
| tree | 427307dcc0a5ba74e36b10dba8e78e910550ab7d /config/routes.rb | |
| parent | e5a59331cf5221d39f9430480d449f30bbe8e63f (diff) | |
| parent | 22ff009a54b281f8db2fd28530b84ebf53bf9de6 (diff) | |
| download | gitlab-ce-4037a738945631c5fc58c464d4a9b12e9448387a.tar.gz | |
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index c361684dfe3..b4e1abd2768 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -156,6 +156,12 @@ Rails.application.routes.draw do get :new_user_map, path: :user_map post :create_user_map, path: :user_map end + + resource :gitlab_project, only: [:create, :new], controller: :gitlab_projects do + get :status + get :callback + get :jobs + end end # |