summaryrefslogtreecommitdiff
path: root/app/contexts
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-03 21:09:18 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-03 21:09:18 +0200
commit39ba934c0a65f571214998e056e925b61f389360 (patch)
treea1da1af6df76e1d49feffd48a6247ced3abd5684 /app/contexts
parente6c0673ef1108a93928c4d88ba273e12616b836b (diff)
downloadgitlab-ce-39ba934c0a65f571214998e056e925b61f389360.tar.gz
REpostiry, Team models
Diffstat (limited to 'app/contexts')
-rw-r--r--app/contexts/commit_load_context.rb2
-rw-r--r--app/contexts/notes/load_context.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/contexts/commit_load_context.rb b/app/contexts/commit_load_context.rb
index e43e5a07805..a14291b9b0d 100644
--- a/app/contexts/commit_load_context.rb
+++ b/app/contexts/commit_load_context.rb
@@ -9,7 +9,7 @@ class CommitLoadContext < BaseContext
status: :ok
}
- commit = project.commit(params[:id])
+ commit = project.repository.commit(params[:id])
if commit
commit = CommitDecorator.decorate(commit)
diff --git a/app/contexts/notes/load_context.rb b/app/contexts/notes/load_context.rb
index 9f8299f52f7..05626c31a25 100644
--- a/app/contexts/notes/load_context.rb
+++ b/app/contexts/notes/load_context.rb
@@ -18,7 +18,7 @@ module Notes
project.snippets.find(target_id).notes.fresh
when "wall"
# this is the only case, where the order is DESC
- project.common_notes.order("created_at DESC, id DESC").limit(50)
+ project.notes.common.inc_author_project.order("created_at DESC, id DESC").limit(50)
end
@notes = if after_id