diff options
author | Patricio Cano <suprnova32@gmail.com> | 2016-06-29 23:25:04 +0300 |
---|---|---|
committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-06 00:54:22 +0300 |
commit | 29c50c53159333bdd124d4d3584ae826f49c28ad (patch) | |
tree | 4f8e56e18100c64186f0e819a5b0112effcaab27 /lib/gitlab | |
parent | fbaabb3911c6fec25edc25bfffad94ae2a7c0e28 (diff) |
Default Git access protocol to `web`
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/git_access.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/protocol_access.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb index ae609021eb6..93b75a7bb05 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -5,7 +5,7 @@ module Gitlab attr_reader :actor, :project, :protocol - def initialize(actor, project, protocol) + def initialize(actor, project, protocol = 'web') @actor = actor @project = project @protocol = protocol @@ -50,8 +50,6 @@ module Gitlab end def check(cmd, changes = nil) - raise 'Access denied due to unspecified Git access protocol' unless protocol.present? - return build_status_object(false, "Git access over #{protocol.upcase} is not allowed") unless protocol_allowed? unless actor diff --git a/lib/gitlab/protocol_access.rb b/lib/gitlab/protocol_access.rb index 4c90654c59c..21aefc884be 100644 --- a/lib/gitlab/protocol_access.rb +++ b/lib/gitlab/protocol_access.rb @@ -1,12 +1,12 @@ module Gitlab module ProtocolAccess def self.allowed?(protocol) - if protocol.to_s == 'web' + if protocol == 'web' true elsif current_application_settings.enabled_git_access_protocol.blank? true else - protocol.to_s == current_application_settings.enabled_git_access_protocol + protocol == current_application_settings.enabled_git_access_protocol end end end |