Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-17

app/models/repository.rb

@@ -499,12 +499,8 @@ class Repository
   end
 
   def root_ref
-    if raw_repository
-      raw_repository.root_ref
-    else
-      # When the repo does not exist we raise this error so no data is cached.
-      raise Gitlab::Git::Repository::NoRepository
-    end
+    # When the repo does not exist, or there is no root ref, we raise this error so no data is cached.
+    raw_repository&.root_ref or raise Gitlab::Git::Repository::NoRepository # rubocop:disable Style/AndOr
   end
   cache_method :root_ref
 

changelogs/unreleased/dm-dont-cache-nil-root-ref.yml

+---
+title: Don't cache a nil repository root ref to prevent caching issues
+merge_request:
+author:
+type: fixed