Satsify new cop for EE

a4d09bda · Douwe Maan · 618e3ae8 · a4d09bda · a4d09bda
Commit a4d09bda authored Feb 22, 2017 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

app/controllers/groups/ldap_group_links_controller.rb app/controllers/groups/ldap_group_links_controller.rb +1 -3

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

No files found.
--- a/app/controllers/groups/ldap_group_links_controller.rb
+++ b/app/controllers/groups/ldap_group_links_controller.rb
@@ -32,9 +32,7 @@ class Groups::LdapGroupLinksController < Groups::ApplicationController
  private
  def require_ldap_enabled
-    unless Gitlab.config.ldap.enabled
+    render_404 unless Gitlab.config.ldap.enabled
-      render_404 and return
-    end
  end
  def ldap_group_link_params

--- a/lib/gitlab/geo.rb
+++ b/lib/gitlab/geo.rb
@@ -50,7 +50,7 @@ module Gitlab
      return false unless Gitlab::Geo.secondary?
      self.cache_value(:geo_oauth_application) do
-        Gitlab::Geo.current_node.oauth_application or raise OauthApplicationUndefinedError
+        Gitlab::Geo.current_node.oauth_application || raise(OauthApplicationUndefinedError)
      end
    end