Only update main language if it is not already set
This commit is contained in:
parent
779b9eac57
commit
935bf7271d
|
@ -24,6 +24,7 @@ v 8.7.0 (unreleased)
|
||||||
- Build status notifications
|
- Build status notifications
|
||||||
|
|
||||||
v 8.6.5 (unreleased)
|
v 8.6.5 (unreleased)
|
||||||
|
- Only update repository language if it is not set to improve performance
|
||||||
- Check permissions when user attempts to import members from another project
|
- Check permissions when user attempts to import members from another project
|
||||||
|
|
||||||
v 8.6.4
|
v 8.6.4
|
||||||
|
|
|
@ -55,15 +55,15 @@ class GitPushService < BaseService
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_main_language
|
def update_main_language
|
||||||
|
# Performance can be bad so for now only check main_language once
|
||||||
|
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/14937
|
||||||
|
return if @project.main_language.present?
|
||||||
|
|
||||||
return unless is_default_branch?
|
return unless is_default_branch?
|
||||||
return unless push_to_new_branch? || push_to_existing_branch?
|
return unless push_to_new_branch? || push_to_existing_branch?
|
||||||
|
|
||||||
current_language = @project.repository.main_language
|
current_language = @project.repository.main_language
|
||||||
|
@project.update_attributes(main_language: current_language)
|
||||||
unless current_language == @project.main_language
|
|
||||||
return @project.update_attributes(main_language: current_language)
|
|
||||||
end
|
|
||||||
|
|
||||||
true
|
true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -164,21 +164,37 @@ describe GitPushService, services: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
context "after push" do
|
context "after push" do
|
||||||
before do
|
def execute
|
||||||
@service = execute_service(project, user, @oldrev, @newrev, ref)
|
execute_service(project, user, @oldrev, @newrev, ref)
|
||||||
end
|
end
|
||||||
|
|
||||||
context "to master" do
|
context "to master" do
|
||||||
let(:ref) { @ref }
|
let(:ref) { @ref }
|
||||||
|
|
||||||
it { expect(@service.update_main_language).to eq(true) }
|
context 'when main_language is nil' do
|
||||||
it { expect(project.main_language).to eq("Ruby") }
|
it 'obtains the language from the repository' do
|
||||||
|
expect(project.repository).to receive(:main_language)
|
||||||
|
execute
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'sets the project main language' do
|
||||||
|
execute
|
||||||
|
expect(project.main_language).to eq("Ruby")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when main_language is already set' do
|
||||||
|
it 'does not check the repository' do
|
||||||
|
execute # do an initial run to simulate lang being preset
|
||||||
|
expect(project.repository).not_to receive(:main_language)
|
||||||
|
execute
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "to other branch" do
|
context "to other branch" do
|
||||||
let(:ref) { 'refs/heads/feature/branch' }
|
let(:ref) { 'refs/heads/feature/branch' }
|
||||||
|
|
||||||
it { expect(@service.update_main_language).to eq(nil) }
|
|
||||||
it { expect(project.main_language).to eq(nil) }
|
it { expect(project.main_language).to eq(nil) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue