Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into patch-1

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 4d48d2194f8..9d290c75ba9 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -215,6 +215,17 @@ module API
         @users = paginate @users
         present @users, with: Entities::User
       end
+
+      # Get a project labels
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      # Example Request:
+      #   GET /projects/:id/labels
+      get ':id/labels' do
+        @labels = user_project.issues_labels
+        present @labels, with: Entities::Label
+      end
     end
   end
 end