diff options
| author | BaldinoF <baldinof@gmail.com> | 2016-04-17 18:17:27 +0200 |
|---|---|---|
| committer | BaldinoF <baldinof@gmail.com> | 2016-04-17 18:17:27 +0200 |
| commit | b04140a1e497c75a721bc4e5458907bf35a0a8b9 (patch) | |
| tree | 8005646150e1c6979061e56a30f661b18ec331c7 /lib/api/labels.rb | |
| parent | 3918fce5bd073e18addb7d1d4aaf3c81ce8150b0 (diff) | |
| parent | 5048064dc5e7ca30f65209c7ccd9fb90f9ac49db (diff) | |
| download | gitlab-ce-b04140a1e497c75a721bc4e5458907bf35a0a8b9.tar.gz | |
Merge branch 'master' into number_sign_for_external_issue_ref
Diffstat (limited to 'lib/api/labels.rb')
| -rw-r--r-- | lib/api/labels.rb | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/lib/api/labels.rb b/lib/api/labels.rb index 78ca58ad0d1..4af6bef0fa7 100644 --- a/lib/api/labels.rb +++ b/lib/api/labels.rb @@ -17,17 +17,18 @@ module API # Creates a new label # # Parameters: - # id (required) - The ID of a project - # name (required) - The name of the label to be deleted - # color (required) - Color of the label given in 6-digit hex - # notation with leading '#' sign (e.g. #FFAABB) + # id (required) - The ID of a project + # name (required) - The name of the label to be created + # color (required) - Color of the label given in 6-digit hex + # notation with leading '#' sign (e.g. #FFAABB) + # description (optional) - The description of label to be created # Example Request: # POST /projects/:id/labels post ':id/labels' do authorize! :admin_label, user_project required_attributes! [:name, :color] - attrs = attributes_for_keys [:name, :color] + attrs = attributes_for_keys [:name, :color, :description] label = user_project.find_label(attrs[:name]) conflict!('Label already exists') if label @@ -62,11 +63,12 @@ module API # Updates an existing label. At least one optional parameter is required. # # Parameters: - # id (required) - The ID of a project - # name (required) - The name of the label to be deleted - # new_name (optional) - The new name of the label - # color (optional) - Color of the label given in 6-digit hex - # notation with leading '#' sign (e.g. #FFAABB) + # id (required) - The ID of a project + # name (required) - The name of the label to be deleted + # new_name (optional) - The new name of the label + # color (optional) - Color of the label given in 6-digit hex + # notation with leading '#' sign (e.g. #FFAABB) + # description (optional) - The description of label to be created # Example Request: # PUT /projects/:id/labels put ':id/labels' do @@ -76,7 +78,7 @@ module API label = user_project.find_label(params[:name]) not_found!('Label not found') unless label - attrs = attributes_for_keys [:new_name, :color] + attrs = attributes_for_keys [:new_name, :color, :description] if attrs.empty? render_api_error!('Required parameters "new_name" or "color" ' \ |