diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-30 18:47:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-30 18:47:55 +0000 |
| commit | 8039b9c3c6caedc19e0e44d086a007e8975134b7 (patch) | |
| tree | 859d1a25b2bbb17920315482a8ef4d85369fb936 /lib | |
| parent | c5e26e57282f8e9423c9281196e4bf317887d68e (diff) | |
| parent | 08134ad2909c4497dc5ef0e4b144ccc6330a9de8 (diff) | |
| download | gitlab-ce-8039b9c3c6caedc19e0e44d086a007e8975134b7.tar.gz | |
Merge branch '30410-revert-9347-and-10079' into 'master'
Resolve "Allow to disable username on checkout url"
Closes #30410 and #30174
See merge request !11792
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/url_sanitizer.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb index 9ce13feb79a..c81dc7e30d0 100644 --- a/lib/gitlab/url_sanitizer.rb +++ b/lib/gitlab/url_sanitizer.rb @@ -18,12 +18,6 @@ module Gitlab false end - def self.http_credentials_for_user(user) - return {} unless user.respond_to?(:username) - - { user: user.username } - end - def initialize(url, credentials: nil) @url = Addressable::URI.parse(url.strip) @credentials = credentials |