diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-12 15:34:56 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-12 15:34:56 +0000 |
| commit | d65d5c2d1a7e19c0a5a3ff6fcd68ce7fdf0661a2 (patch) | |
| tree | 10a106be8beab442cb42cebf3e59a7c6b6684b91 | |
| parent | 0b8852d3c4cee2dba509fe56219036ab56a111e0 (diff) | |
| parent | c87068658924d170f7eea787c7f924ef42d288a6 (diff) | |
| download | gitlab-ce-d65d5c2d1a7e19c0a5a3ff6fcd68ce7fdf0661a2.tar.gz | |
Merge branch 'feature/fix-14753' into 'master'
Fix #14753: Check if head is born before trying to detect main language
This MR makes sure that head exists before trying to detect the main language.
This prevents errors on repo's without a master branch.
Closes #14753
See merge request !3654
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/models/repository.rb | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index a294c750ccb..382318a203c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -43,6 +43,9 @@ v 8.7.0 (unreleased) - API: Expose 'updated_at' for issue, snippet, and merge request notes (Robert Schilling) - API: User can leave a project through the API when not master or owner. !3613 +v 8.6.6 + - 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 - 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 8dead3a5884..462b48118ef 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -896,9 +896,9 @@ class Repository end def main_language - unless empty? - Linguist::Repository.new(rugged, rugged.head.target_id).language - end + return if empty? || rugged.head_unborn? + + Linguist::Repository.new(rugged, rugged.head.target_id).language end def avatar |