diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 22:12:19 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 22:12:19 +0900 |
| commit | d89c18901bde510da2668e676b3bf2f1e21deef2 (patch) | |
| tree | 57ddcc05bb1ca0d70bfb827d0e1ef4930c7ebf7b /lib/api/helpers.rb | |
| parent | afef38533727cf32a7be324243a25b4db5eb5498 (diff) | |
| parent | 666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff) | |
| download | gitlab-ce-d89c18901bde510da2668e676b3bf2f1e21deef2.tar.gz | |
Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 1c12166e434..5f9b94cc89c 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -328,6 +328,7 @@ module API finder_params[:archived] = params[:archived] finder_params[:search] = params[:search] if params[:search] finder_params[:user] = params.delete(:user) if params[:user] + finder_params[:custom_attributes] = params[:custom_attributes] if params[:custom_attributes] finder_params end |