diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 12:09:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 12:09:29 +0300 |
commit | d05604c95aeed1e8bbf63abc0b363cb921f0996a (patch) | |
tree | 57d270a120ad0f9d0f37e2608a4a2375c591fed1 /app/assets/javascripts/lib | |
parent | 54cf74492603787dc62f75a7af87380f117e6364 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/lib')
-rw-r--r-- | app/assets/javascripts/lib/utils/url_utility.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js index e9c3fe0a406..a429770adea 100644 --- a/app/assets/javascripts/lib/utils/url_utility.js +++ b/app/assets/javascripts/lib/utils/url_utility.js @@ -73,6 +73,7 @@ export function getParameterValues(sParam, url = window.location) { * @param {String} url * @param {Object} options * @param {Boolean} options.spreadArrays - split array values into separate key/value-pairs + * @param {Boolean} options.sort - alphabetically sort params in the returned url (in asc order, i.e., a-z) */ export function mergeUrlParams(params, url, options = {}) { const { spreadArrays = false, sort = false } = options; |