Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2016-04-06 01:44:13 +0300
committerDrew Blessing <drew@gitlab.com>2016-04-06 22:56:40 +0300
commit935bf7271d88c8623312004dd6cba791b76503f5 (patch)
tree3463f6b8d1729bf21b96c2b8c8614cf2e5388bea /app/services/git_push_service.rb
parent779b9eac57cf45d77e4d62aa1b96e06928daa794 (diff)
Only update main language if it is not already set
Diffstat (limited to 'app/services/git_push_service.rb')
-rw-r--r--app/services/git_push_service.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 36c9ee92da1..dc74c02760b 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -55,15 +55,15 @@ class GitPushService < BaseService
end
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 push_to_new_branch? || push_to_existing_branch?
current_language = @project.repository.main_language
-
- unless current_language == @project.main_language
- return @project.update_attributes(main_language: current_language)
- end
-
+ @project.update_attributes(main_language: current_language)
true
end