diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 18:58:24 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 18:58:24 +0300 |
| commit | 3f2db9d971dd92b446e2a615ed758090079a8c64 (patch) | |
| tree | c3034fc5bde8c3d0d2516de01e67d44c0c796fa1 /app/controllers/projects_controller.rb | |
| parent | 5b43eeee97f8e06a4ada4b173cb972c20d58d8ed (diff) | |
| parent | ac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff) | |
| download | gitlab-ce-button-focus-state.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-statebutton-focus-state
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f94e2a84fa2..3af62c7696c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -139,7 +139,7 @@ class ProjectsController < Projects::ApplicationController participants = ::Projects::ParticipantsService.new(@project, current_user).execute(note_type, note_id) @suggestions = { - emojis: AwardEmoji.urls, + emojis: Gitlab::AwardEmoji.urls, issues: autocomplete.issues, milestones: autocomplete.milestones, mergerequests: autocomplete.merge_requests, |