1 files changed, 16 insertions, 24 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 70f8fa2aa62..8edfa481c10 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -16,53 +16,49 @@ module Gitlab
       # Get a single project
       #
       # Parameters:
-      #   id (required) - The code of a project
+      #   id (required) - The ID or code name of a project
       # Example Request:
       #   GET /projects/:id
       get ":id" do
-        @project = current_user.projects.find_by_code(params[:id])
-        present @project, :with => Entities::Project
+        present user_project, :with => Entities::Project
       end
 
       # Get a project repository branches
       #
       # Parameters:
-      #   id (required) - The code of a project
+      #   id (required) - The ID or code name of a project
       # Example Request:
       #   GET /projects/:id/repository/branches
       get ":id/repository/branches" do
-        @project = current_user.projects.find_by_code(params[:id])
-        present @project.repo.heads.sort_by(&:name), :with => Entities::ProjectRepositoryBranches
+        present user_project.repo.heads.sort_by(&:name), :with => Entities::RepoObject
       end
 
       # Get a project repository tags
       #
       # Parameters:
-      #   id (required) - The code of a project
+      #   id (required) - The ID or code name of a project
       # Example Request:
       #   GET /projects/:id/repository/tags
       get ":id/repository/tags" do
-        @project = current_user.projects.find_by_code(params[:id])
-        present @project.repo.tags.sort_by(&:name).reverse, :with => Entities::ProjectRepositoryTags
+        present user_project.repo.tags.sort_by(&:name).reverse, :with => Entities::RepoObject
       end
 
       # Get a project snippet
       #
       # Parameters:
-      #   id (required) - The code of a project
+      #   id (required) - The ID or code name of a project
       #   snippet_id (required) - The ID of a project snippet
       # Example Request:
       #   GET /projects/:id/snippets/:snippet_id
       get ":id/snippets/:snippet_id" do
-        @project = current_user.projects.find_by_code(params[:id])
-        @snippet = @project.snippets.find(params[:snippet_id])
+        @snippet = user_project.snippets.find(params[:snippet_id])
         present @snippet, :with => Entities::ProjectSnippet
       end
 
       # Create a new project snippet
       #
       # Parameters:
-      #   id (required) - The code name of a project
+      #   id (required) - The ID or code name of a project
       #   title (required) - The title of a snippet
       #   file_name (required) - The name of a snippet file
       #   lifetime (optional) - The expiration date of a snippet
@@ -70,8 +66,7 @@ module Gitlab
       # Example Request:
       #   POST /projects/:id/snippets
       post ":id/snippets" do
-        @project = current_user.projects.find_by_code(params[:id])
-        @snippet = @project.snippets.new(
+        @snippet = user_project.snippets.new(
           :title      => params[:title],
           :file_name  => params[:file_name],
           :expires_at => params[:lifetime],
@@ -89,7 +84,7 @@ module Gitlab
       # Update an existing project snippet
       #
       # Parameters:
-      #   id (required) - The code name of a project
+      #   id (required) - The ID or code name of a project
       #   snippet_id (required) - The ID of a project snippet
       #   title (optional) - The title of a snippet
       #   file_name (optional) - The name of a snippet file
@@ -98,8 +93,7 @@ module Gitlab
       # Example Request:
       #   PUT /projects/:id/snippets/:snippet_id
       put ":id/snippets/:snippet_id" do
-        @project = current_user.projects.find_by_code(params[:id])
-        @snippet = @project.snippets.find(params[:snippet_id])
+        @snippet = user_project.snippets.find(params[:snippet_id])
         parameters = {
           :title      => (params[:title] || @snippet.title),
           :file_name  => (params[:file_name] || @snippet.file_name),
@@ -117,26 +111,24 @@ module Gitlab
       # Delete a project snippet
       #
       # Parameters:
-      #   id (required) - The code of a project
+      #   id (required) - The ID or code name of a project
       #   snippet_id (required) - The ID of a project snippet
       # Example Request:
       #   DELETE /projects/:id/snippets/:snippet_id
       delete ":id/snippets/:snippet_id" do
-        @project = current_user.projects.find_by_code(params[:id])
-        @snippet = @project.snippets.find(params[:snippet_id])
+        @snippet = user_project.snippets.find(params[:snippet_id])
         @snippet.destroy
       end
 
       # Get a raw project snippet
       #
       # Parameters:
-      #   id (required) - The code of a project
+      #   id (required) - The ID or code name of a project
       #   snippet_id (required) - The ID of a project snippet
       # Example Request:
       #   GET /projects/:id/snippets/:snippet_id/raw
       get ":id/snippets/:snippet_id/raw" do
-        @project = current_user.projects.find_by_code(params[:id])
-        @snippet = @project.snippets.find(params[:snippet_id])
+        @snippet = user_project.snippets.find(params[:snippet_id])
         present @snippet.content
       end
     end