diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-02 07:48:28 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-02 07:48:28 +0000 |
| commit | b122be5ed55e3898196fb21e47fff40eb7dd6e0c (patch) | |
| tree | 709d2763de4f693086b1f0cbe8848df3a8ed5509 /app/controllers | |
| parent | 02dcecdb5f51f6988ede356d0d245d6cd7745520 (diff) | |
| parent | 732f892db308863f2a2db736949c94ae9d613678 (diff) | |
| download | gitlab-ce-b122be5ed55e3898196fb21e47fff40eb7dd6e0c.tar.gz | |
Merge branch 'security-id-potential-denial-languages' into 'master'
Return cached languages if they've been detected before
See merge request gitlab/gitlabhq!2998
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/graphs_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb index c80fce513f6..67d3f49af18 100644 --- a/app/controllers/projects/graphs_controller.rb +++ b/app/controllers/projects/graphs_controller.rb @@ -46,12 +46,8 @@ class Projects::GraphsController < Projects::ApplicationController def get_languages @languages = - if @project.repository_languages.present? - @project.repository_languages.map do |lang| - { value: lang.share, label: lang.name, color: lang.color, highlight: lang.color } - end - else - @project.repository.languages + ::Projects::RepositoryLanguagesService.new(@project, current_user).execute.map do |lang| + { value: lang.share, label: lang.name, color: lang.color, highlight: lang.color } end end |