summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-04 18:50:31 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-04 18:50:31 +0200
commitafbdbb0c959affbdb8725eafb8169025a8aede1e (patch)
tree87fec66647ef63d1abc5cae17192f1f10c1559bb /lib/api
parentdccd8b6eaa8b2e98b0245262a8e39df8fb8ae634 (diff)
downloadgitlab-ce-afbdbb0c959affbdb8725eafb8169025a8aede1e.tar.gz
Rspec fixes
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/notes.rb4
-rw-r--r--lib/api/projects.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index 4875ac4c03e..4613db54578 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -13,7 +13,7 @@ module Gitlab
# Example Request:
# GET /projects/:id/notes
get ":id/notes" do
- @notes = user_project.common_notes
+ @notes = user_project.notes.common
present paginate(@notes), with: Entities::Note
end
@@ -25,7 +25,7 @@ module Gitlab
# Example Request:
# GET /projects/:id/notes/:note_id
get ":id/notes/:note_id" do
- @note = user_project.common_notes.find(params[:note_id])
+ @note = user_project.notes.common.find(params[:note_id])
present @note, with: Entities::Note
end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index c71fd64838b..55c81f3158a 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -257,7 +257,7 @@ module Gitlab
per_page = params[:per_page] || 20
ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
- commits = user_project.commits(ref, nil, per_page, page * per_page)
+ commits = user_project.repository.commits(ref, nil, per_page, page * per_page)
present CommitDecorator.decorate(commits), with: Entities::RepoCommit
end
@@ -375,10 +375,10 @@ module Gitlab
ref = params[:sha]
- commit = user_project.commit ref
+ commit = user_project.repository.commit ref
not_found! "Commit" unless commit
- tree = Tree.new commit.tree, user_project, ref, params[:filepath]
+ tree = Tree.new commit.tree, ref, params[:filepath]
not_found! "File" unless tree.try(:tree)
content_type tree.mime_type