Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/gitlab/issuables_count_for_state.rb b/lib/gitlab/issuables_count_for_state.rb
index 660877b964a..f11dd520d2d 100644
--- a/lib/gitlab/issuables_count_for_state.rb
+++ b/lib/gitlab/issuables_count_for_state.rb
@@ -6,7 +6,7 @@ module Gitlab
     # The name of the Gitlab::SafeRequestStore cache key.
     CACHE_KEY = :issuables_count_for_state
     # The expiration time for the Rails cache.
-    CACHE_EXPIRES_IN = 10.minutes
+    CACHE_EXPIRES_IN = 1.hour
     THRESHOLD = 1000
 
     # The state values that can be safely casted to a Symbol.
diff --git a/lib/gitlab/saas.rb b/lib/gitlab/saas.rb
index 8d9d8415cb1..4066c8a7906 100644
--- a/lib/gitlab/saas.rb
+++ b/lib/gitlab/saas.rb
@@ -20,6 +20,10 @@ module Gitlab
     def self.dev_url
       'https://dev.gitlab.org'
     end
+
+    def self.registry_prefix
+      'registry.gitlab.com'
+    end
   end
 end