Refresh patch

This commit is contained in:
Pirate Praveen 2020-05-30 21:15:13 +05:30
parent bcb984ad78
commit 4e34de6884

View file

@ -848,7 +848,7 @@ Closes https://gitlab.com/gitlab-org/gitlab/-/issues/195960
+ class GroupImport < Grape::API::Instance + class GroupImport < Grape::API::Instance
MAXIMUM_FILE_SIZE = 50.megabytes.freeze MAXIMUM_FILE_SIZE = 50.megabytes.freeze
helpers do helpers Helpers::FileUploadHelpers
--- a/lib/api/group_labels.rb --- a/lib/api/group_labels.rb
+++ b/lib/api/group_labels.rb +++ b/lib/api/group_labels.rb
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@ -1399,7 +1399,7 @@ Closes https://gitlab.com/gitlab-org/gitlab/-/issues/195960
include PaginationParams include PaginationParams
include Helpers::CustomAttributes include Helpers::CustomAttributes
@@ -520,7 +520,7 @@ @@ -522,7 +522,7 @@
end end
params do params do
optional :search, type: String, desc: 'Return list of users matching the search criteria' optional :search, type: String, desc: 'Return list of users matching the search criteria'