diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-08 15:12:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-08 15:12:33 +0000 |
| commit | 6225d57e55eaa0205e939e7ed6577636b0ee47cf (patch) | |
| tree | be54b280f0631a1e9c8e767c675e610c65925b2e /lib/gitlab/utils.rb | |
| parent | dcc096f21918399d7061372c0a22b9a5408a00a5 (diff) | |
| download | gitlab-ce-6225d57e55eaa0205e939e7ed6577636b0ee47cf.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/utils.rb')
| -rw-r--r-- | lib/gitlab/utils.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/gitlab/utils.rb b/lib/gitlab/utils.rb index 96cff024371..608545baf74 100644 --- a/lib/gitlab/utils.rb +++ b/lib/gitlab/utils.rb @@ -203,6 +203,13 @@ module Gitlab rescue Addressable::URI::InvalidURIError, TypeError end + def add_url_parameters(url, params) + uri = parse_url(url.to_s) + uri.query_values = uri.query_values.to_h.merge(params.to_h.stringify_keys) + uri.query_values = nil if uri.query_values.empty? + uri.to_s + end + def removes_sensitive_data_from_url(uri_string) uri = parse_url(uri_string) |