diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-05-20 21:08:57 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-05-20 21:08:57 +0000 |
| commit | ba5b47c2e36d284df6827fed8e59876619aa9501 (patch) | |
| tree | 50d6e05041157dea95d57eaf9b16d50501727901 /app/controllers/projects_controller.rb | |
| parent | 983b592cb7cbf3369e1af9e26f527876c6cca360 (diff) | |
| parent | 129bb6c2a71c8499daeb5d55f657b0eda8366bc8 (diff) | |
| download | gitlab-ce-ba5b47c2e36d284df6827fed8e59876619aa9501.tar.gz | |
Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master'
Implement special GitLab markdown reference for milestones
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions:
- Move changelog item to 8.8
- Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829
See merge request !3897
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6d2b6b60f13..9697b88c032 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -141,6 +141,7 @@ class ProjectsController < Projects::ApplicationController @suggestions = { emojis: AwardEmoji.urls, issues: autocomplete.issues, + milestones: autocomplete.milestones, mergerequests: autocomplete.merge_requests, members: participants } |