From 08c3936b83f3f67cbabf74289805a3938e2b7564 Mon Sep 17 00:00:00 2001 From: Jeroen Bobbeldijk Date: Mon, 11 Apr 2016 15:10:14 +0200 Subject: Check head unborn in rugged --- app/models/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 8dead3a5884..3e52ee5d0a2 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -896,7 +896,7 @@ class Repository end def main_language - unless empty? + unless empty? or rugged.head_unborn? Linguist::Repository.new(rugged, rugged.head.target_id).language end end -- cgit v1.2.1 From 27d2b355358b52d840153cbb100c2820fab29afe Mon Sep 17 00:00:00 2001 From: Jeroen Bobbeldijk Date: Mon, 11 Apr 2016 18:11:49 +0200 Subject: Add changelog, change code to guard clause --- CHANGELOG | 3 +++ app/models/repository.rb | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3561c541df0..a53a0615ca7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -35,6 +35,9 @@ v 8.7.0 (unreleased) - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591 - Update number of Todos in the sidebar when it's marked as "Done". !3600 +v 8.6.6 + - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 + v 8.6.5 - Fix importing from GitHub Enterprise. !3529 - Perform the language detection after updating merge requests in `GitPushService`, leading to faster visual feedback for the end-user. !3533 diff --git a/app/models/repository.rb b/app/models/repository.rb index 3e52ee5d0a2..a24ce45a38b 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -896,9 +896,9 @@ class Repository end def main_language - unless empty? or rugged.head_unborn? - Linguist::Repository.new(rugged, rugged.head.target_id).language - end + return nil if empty? || rugged.head_unborn? + + Linguist::Repository.new(rugged, rugged.head.target_id).language end def avatar -- cgit v1.2.1 From f36655dc8b796aac1a75cc28d4768280a9e2860b Mon Sep 17 00:00:00 2001 From: Jeroen Bobbeldijk Date: Mon, 11 Apr 2016 18:14:01 +0200 Subject: Dont return null --- app/models/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index a24ce45a38b..462b48118ef 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -896,7 +896,7 @@ class Repository end def main_language - return nil if empty? || rugged.head_unborn? + return if empty? || rugged.head_unborn? Linguist::Repository.new(rugged, rugged.head.target_id).language end -- cgit v1.2.1 From c87068658924d170f7eea787c7f924ef42d288a6 Mon Sep 17 00:00:00 2001 From: Jeroen Bobbeldijk Date: Tue, 12 Apr 2016 16:44:12 +0200 Subject: Add my name --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index a53a0615ca7..e77b659f261 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,7 +36,7 @@ v 8.7.0 (unreleased) - Update number of Todos in the sidebar when it's marked as "Done". !3600 v 8.6.6 - - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 + - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 (Jeroen Bobbeldijk) v 8.6.5 - Fix importing from GitHub Enterprise. !3529 -- cgit v1.2.1