diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-07-11 08:01:10 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-07-11 08:02:13 -0700 |
| commit | faf9543827450fcdeb463c8461ef4d483b03f84e (patch) | |
| tree | 8b6ca9e35877196c45c7e8bb2514bcc8221d4329 /lib/api/merge_requests.rb | |
| parent | e17ac5705dd84ede3ae079051adcb66200457338 (diff) | |
| download | gitlab-ce-faf9543827450fcdeb463c8461ef4d483b03f84e.tar.gz | |
Use view=simple for simplifying merge requests API
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index aace6553e2e..ac33b2b801c 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -48,7 +48,7 @@ module API merge_requests = paginate(merge_requests) .preload(:target_project) - return merge_requests if params[:simple] + return merge_requests if args[:view] == 'simple' merge_requests .preload(:notes, :author, :assignee, :milestone, :merge_request_diff, :labels) @@ -82,7 +82,7 @@ module API optional :labels, type: String, desc: 'Comma-separated list of label names' optional :created_after, type: DateTime, desc: 'Return merge requests created after the specified time' optional :created_before, type: DateTime, desc: 'Return merge requests created before the specified time' - optional :simple, type: Boolean, default: false, desc: 'Returns the `iid`, URL, title, description, and basic state of merge request' + optional :view, type: String, values: %w[simple], desc: 'If simple, returns the `iid`, URL, title, description, and basic state of merge request' use :pagination end get ":id/merge_requests" do @@ -94,7 +94,7 @@ module API current_user: current_user, project: user_project } - if params[:simple] + if params[:view] == 'simple' options[:with] = Entities::MergeRequestSimple else options[:issuable_metadata] = issuable_meta_data(merge_requests, 'MergeRequest') |