diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-24 11:54:42 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-24 11:54:42 +0400 |
| commit | e21ca9f8b140476f93eaa2c2a0d6bf96f28b6995 (patch) | |
| tree | ecaa584f33ed4d5231d07d6dddc8675feb8f19ad /config | |
| parent | 4a1e98e4b69800c0044110c1aff6cfdf972b57b6 (diff) | |
| parent | e1d307bf4b88afa59d851918c29ffbb61b01e8c5 (diff) | |
Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index f54f9ea5341..f8c68eb11a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -185,6 +185,7 @@ Gitlab::Application.routes.draw do post :archive post :unarchive post :upload_image + post :toggle_star get :autocomplete_sources get :import put :retry_import |