diff options
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 12 | ||||
| -rw-r--r-- | lib/api/issues.rb | 32 | ||||
| -rw-r--r-- | lib/api/projects.rb | 32 | ||||
| -rw-r--r-- | lib/api/users.rb | 6 |
4 files changed, 41 insertions, 41 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index d86fb79c78b..96ccd87a407 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -11,8 +11,8 @@ module Gitlab class Project < Grape::Entity expose :id, :code, :name, :description, :path, :default_branch - expose :owner, :using => Entities::UserBasic - expose :private_flag, :as => :private + expose :owner, using: Entities::UserBasic + expose :private_flag, as: :private expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at end @@ -22,7 +22,7 @@ module Gitlab class ProjectSnippet < Grape::Entity expose :id, :title, :file_name - expose :author, :using => Entities::UserBasic + expose :author, using: Entities::UserBasic expose :expires_at, :updated_at, :created_at end @@ -34,9 +34,9 @@ module Gitlab expose :id expose (:project_id) {|issue| issue.project.id} expose :title, :description - expose :label_list, :as => :labels - expose :milestone, :using => Entities::Milestone - expose :assignee, :author, :using => Entities::UserBasic + expose :label_list, as: :labels + expose :milestone, using: Entities::Milestone + expose :assignee, :author, using: Entities::UserBasic expose :closed, :updated_at, :created_at end end diff --git a/lib/api/issues.rb b/lib/api/issues.rb index dcb6e53588c..2abc20ad34e 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -9,7 +9,7 @@ module Gitlab # Example Request: # GET /issues get do - present current_user.issues, :with => Entities::Issue + present current_user.issues, with: Entities::Issue end end @@ -21,7 +21,7 @@ module Gitlab # Example Request: # GET /projects/:id/issues get ":id/issues" do - present user_project.issues, :with => Entities::Issue + present user_project.issues, with: Entities::Issue end # Get a single project issue @@ -33,7 +33,7 @@ module Gitlab # GET /projects/:id/issues/:issue_id get ":id/issues/:issue_id" do @issue = user_project.issues.find(params[:issue_id]) - present @issue, :with => Entities::Issue + present @issue, with: Entities::Issue end # Create a new project issue @@ -49,16 +49,16 @@ module Gitlab # POST /projects/:id/issues post ":id/issues" do @issue = user_project.issues.new( - :title => params[:title], - :description => params[:description], - :assignee_id => params[:assignee_id], - :milestone_id => params[:milestone_id], - :label_list => params[:labels] + title: params[:title], + description: params[:description], + assignee_id: params[:assignee_id], + milestone_id: params[:milestone_id], + label_list: params[:labels] ) @issue.author = current_user if @issue.save - present @issue, :with => Entities::Issue + present @issue, with: Entities::Issue else error!({'message' => '404 Not found'}, 404) end @@ -80,16 +80,16 @@ module Gitlab put ":id/issues/:issue_id" do @issue = user_project.issues.find(params[:issue_id]) parameters = { - :title => (params[:title] || @issue.title), - :description => (params[:description] || @issue.description), - :assignee_id => (params[:assignee_id] || @issue.assignee_id), - :milestone_id => (params[:milestone_id] || @issue.milestone_id), - :label_list => (params[:labels] || @issue.label_list), - :closed => (params[:closed] || @issue.closed) + title: (params[:title] || @issue.title), + description: (params[:description] || @issue.description), + assignee_id: (params[:assignee_id] || @issue.assignee_id), + milestone_id: (params[:milestone_id] || @issue.milestone_id), + label_list: (params[:labels] || @issue.label_list), + closed: (params[:closed] || @issue.closed) } if @issue.update_attributes(parameters) - present @issue, :with => Entities::Issue + present @issue, with: Entities::Issue else error!({'message' => '404 Not found'}, 404) end diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 31bc7d88ea0..eb23641c605 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -10,7 +10,7 @@ module Gitlab # GET /projects get do @projects = current_user.projects - present @projects, :with => Entities::Project + present @projects, with: Entities::Project end # Get a single project @@ -20,7 +20,7 @@ module Gitlab # Example Request: # GET /projects/:id get ":id" do - present user_project, :with => Entities::Project + present user_project, with: Entities::Project end # Get a project repository branches @@ -30,7 +30,7 @@ module Gitlab # Example Request: # GET /projects/:id/repository/branches get ":id/repository/branches" do - present user_project.repo.heads.sort_by(&:name), :with => Entities::RepoObject + present user_project.repo.heads.sort_by(&:name), with: Entities::RepoObject end # Get a single branch @@ -42,7 +42,7 @@ module Gitlab # GET /projects/:id/repository/branches/:branch get ":id/repository/branches/:branch" do @branch = user_project.repo.heads.find { |item| item.name == params[:branch] } - present @branch, :with => Entities::RepoObject + present @branch, with: Entities::RepoObject end # Get a project repository tags @@ -52,7 +52,7 @@ module Gitlab # Example Request: # GET /projects/:id/repository/tags get ":id/repository/tags" do - present user_project.repo.tags.sort_by(&:name).reverse, :with => Entities::RepoObject + present user_project.repo.tags.sort_by(&:name).reverse, with: Entities::RepoObject end # Get a project snippet @@ -64,7 +64,7 @@ module Gitlab # GET /projects/:id/snippets/:snippet_id get ":id/snippets/:snippet_id" do @snippet = user_project.snippets.find(params[:snippet_id]) - present @snippet, :with => Entities::ProjectSnippet + present @snippet, with: Entities::ProjectSnippet end # Create a new project snippet @@ -79,15 +79,15 @@ module Gitlab # POST /projects/:id/snippets post ":id/snippets" do @snippet = user_project.snippets.new( - :title => params[:title], - :file_name => params[:file_name], - :expires_at => params[:lifetime], - :content => params[:code] + title: params[:title], + file_name: params[:file_name], + expires_at: params[:lifetime], + content: params[:code] ) @snippet.author = current_user if @snippet.save - present @snippet, :with => Entities::ProjectSnippet + present @snippet, with: Entities::ProjectSnippet else error!({'message' => '404 Not found'}, 404) end @@ -107,14 +107,14 @@ module Gitlab put ":id/snippets/:snippet_id" do @snippet = user_project.snippets.find(params[:snippet_id]) parameters = { - :title => (params[:title] || @snippet.title), - :file_name => (params[:file_name] || @snippet.file_name), - :expires_at => (params[:lifetime] || @snippet.expires_at), - :content => (params[:code] || @snippet.content) + title: (params[:title] || @snippet.title), + file_name: (params[:file_name] || @snippet.file_name), + expires_at: (params[:lifetime] || @snippet.expires_at), + content: (params[:code] || @snippet.content) } if @snippet.update_attributes(parameters) - present @snippet, :with => Entities::ProjectSnippet + present @snippet, with: Entities::ProjectSnippet else error!({'message' => '404 Not found'}, 404) end diff --git a/lib/api/users.rb b/lib/api/users.rb index ef3762f30fc..81cb2a0e684 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -10,7 +10,7 @@ module Gitlab # GET /users get do @users = User.all - present @users, :with => Entities::User + present @users, with: Entities::User end # Get a single user @@ -21,7 +21,7 @@ module Gitlab # GET /users/:id get ":id" do @user = User.find(params[:id]) - present @user, :with => Entities::User + present @user, with: Entities::User end end @@ -30,7 +30,7 @@ module Gitlab # Example Request: # GET /user get "/user" do - present @current_user, :with => Entities::User + present @current_user, with: Entities::User end end end |