提交 604870a6 编写于 作者: R Rémy Coutable

Merge branch 'api-no-convert' into 'master'

Don't convert data which already is the target type

With Grape's DSL we already enforce data types. We don't need to explicitly convert to string if there is already one.

See merge request !7740
......@@ -77,7 +77,7 @@ module API
)
begin
case params[:state].to_s
case params[:state]
when 'pending'
status.enqueue!
when 'running'
......
......@@ -48,7 +48,7 @@ module API
requires :id, type: Integer, desc: 'The project ID'
requires :branch_name, type: String, desc: 'The name of branch'
requires :commit_message, type: String, desc: 'Commit message'
requires :actions, type: Array, desc: 'Actions to perform in commit'
requires :actions, type: Array[Hash], desc: 'Actions to perform in commit'
optional :author_email, type: String, desc: 'Author email for commit'
optional :author_name, type: String, desc: 'Author name for commit'
end
......
......@@ -33,7 +33,7 @@ module API
groups = groups.search(params[:search]) if params[:search].present?
groups = groups.where.not(id: params[:skip_groups]) if params[:skip_groups].present?
groups = groups.reorder(params[:order_by] => params[:sort].to_sym)
groups = groups.reorder(params[:order_by] => params[:sort])
present paginate(groups), with: Entities::Group
end
......
......@@ -30,7 +30,7 @@ module API
end
get ':id/variables/:key' do
key = params[:key]
variable = user_project.variables.find_by(key: key.to_s)
variable = user_project.variables.find_by(key: key)
return not_found!('Variable') unless variable
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册