Fixed a situation where Geo.readonly? could incorrectly lock you down

576412e4 · Gabriel Mazetto · e05f19d7 · 576412e4
Commit 576412e4 authored Feb 21, 2016 by Gabriel Mazetto
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/geo.rb lib/gitlab/geo.rb +1 -1

No files found.
--- a/lib/gitlab/geo.rb
+++ b/lib/gitlab/geo.rb
@@ -21,7 +21,7 @@ module Gitlab
    end

    def self.readonly?
-      RequestStore.store[:geo_node_readonly] ||= self.enabled? && !self.current_node.primary?
+      RequestStore.store[:geo_node_readonly] ||= self.enabled? && self.current_node && !self.current_node.primary?
    end

    def self.geo_node?(host:, port:)