diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 08:57:54 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 08:57:54 +0000 |
| commit | b05cc8bc9aa5200a0fe3d2ce0afe18485a0aded5 (patch) | |
| tree | 7d0cea775b4cafded2409d448aade0f369eca221 /config | |
| parent | fbcde1aa779e56c7573cb86729e963b1bae186ff (diff) | |
| parent | 6bd3d72bbdf288ecf2eee718f2943821c1401a22 (diff) | |
| download | gitlab-ce-b05cc8bc9aa5200a0fe3d2ce0afe18485a0aded5.tar.gz | |
Merge branch 'global_labels' into 'master'
Global labels
https://dev.gitlab.org/gitlab/gitlabhq/issues/2353
See merge request !1240
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 5bf721d6b13..011af4825fa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -210,6 +210,8 @@ Gitlab::Application.routes.draw do resources :services end + resources :labels + root to: 'dashboard#index' end |