diff options
author | Nick Thomas <nick@gitlab.com> | 2018-08-16 15:31:11 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-08-16 15:31:11 +0000 |
commit | 85f1312736058a4cb67eb6eb03c8f608e7cdaf1e (patch) | |
tree | 7499e9d6c648bf278ed57ee3422363f0b9e6cfd7 /app | |
parent | 7e508fba7d0fcca8c448aff57d3be06f8288ccf6 (diff) | |
parent | caaadb87b1825417065f843ae65b8afd9367310c (diff) | |
download | gitlab-ce-85f1312736058a4cb67eb6eb03c8f608e7cdaf1e.tar.gz |
Merge branch 'zj-remove-repository-languages-feature-gate' into 'master'
Remove feature gates for Repository Languages
Closes #50291
See merge request gitlab-org/gitlab-ce!21186
Diffstat (limited to 'app')
-rw-r--r-- | app/views/projects/show.html.haml | 3 | ||||
-rw-r--r-- | app/workers/detect_repository_languages_worker.rb | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 8a5abb64515..df8a5742450 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -21,8 +21,7 @@ %nav.project-stats{ class: [container_class, ("limit-container-width" unless fluid_layout)] } = render 'stat_anchor_list', anchors: @project.statistics_anchors(show_auto_devops_callout: show_auto_devops_callout) = render 'stat_anchor_list', anchors: @project.statistics_buttons(show_auto_devops_callout: show_auto_devops_callout) - - if Feature.enabled?(:repository_languages, @project.namespace.becomes(Namespace)) - = repository_languages_bar(@project.repository_languages) + = repository_languages_bar(@project.repository_languages) %div{ class: [container_class, ("limit-container-width" unless fluid_layout)] } - if @project.archived? diff --git a/app/workers/detect_repository_languages_worker.rb b/app/workers/detect_repository_languages_worker.rb index cfbbbffc8a6..854b74b884a 100644 --- a/app/workers/detect_repository_languages_worker.rb +++ b/app/workers/detect_repository_languages_worker.rb @@ -16,8 +16,6 @@ class DetectRepositoryLanguagesWorker user = User.find_by(id: user_id) return unless project && user - return if Feature.disabled?(:repository_languages, project.namespace) - try_obtain_lease do ::Projects::DetectRepositoryLanguagesService.new(project, user).execute end |