Commit 85f13127 authored by Nick Thomas's avatar Nick Thomas

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
parents 7e508fba caaadb87
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
%nav.project-stats{ class: [container_class, ("limit-container-width" unless fluid_layout)] } %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_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) = 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)] } %div{ class: [container_class, ("limit-container-width" unless fluid_layout)] }
......
...@@ -16,8 +16,6 @@ class DetectRepositoryLanguagesWorker ...@@ -16,8 +16,6 @@ class DetectRepositoryLanguagesWorker
user = User.find_by(id: user_id) user = User.find_by(id: user_id)
return unless project && user return unless project && user
return if Feature.disabled?(:repository_languages, project.namespace)
try_obtain_lease do try_obtain_lease do
::Projects::DetectRepositoryLanguagesService.new(project, user).execute ::Projects::DetectRepositoryLanguagesService.new(project, user).execute
end end
......
...@@ -155,6 +155,16 @@ The repository graph displays visually the Git flow strategy used in that reposi ...@@ -155,6 +155,16 @@ The repository graph displays visually the Git flow strategy used in that reposi
Find it under your project's **Repository > Graph**. Find it under your project's **Repository > Graph**.
## Repository Languages
For the default branch of each repository, GitLab will determine what programming languages
were used and display this on the projects pages.
![Repository Languages bar](img/repository_languages.png)
Not all files are detected, among others; documentation,
vendored code, and most markup languages are excluded.
## Compare ## Compare
Select branches to compare and view the changes inline: Select branches to compare and view the changes inline:
......
...@@ -5,10 +5,6 @@ describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_ ...@@ -5,10 +5,6 @@ describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_
subject { described_class.new(project, project.owner) } subject { described_class.new(project, project.owner) }
before do
allow(Feature).to receive(:disabled?).and_return(false)
end
describe '#execute' do describe '#execute' do
context 'without previous detection' do context 'without previous detection' do
it 'inserts new programming languages in the database' do it 'inserts new programming languages in the database' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment