diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-15 00:52:25 +0100 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-15 00:52:25 +0100 |
| commit | 30227869482bbbdbfea153f2b45ef3bb9a9fd218 (patch) | |
| tree | aff64071116447092751770d2896998f62d1b44a /app/controllers/commits_controller.rb | |
| parent | 8ee5fce9d64b70d8981896457484fae622d142c9 (diff) | |
| parent | aca0caa8cc1a6bd481f87dd810284e69d3747050 (diff) | |
| download | gitlab-ce-30227869482bbbdbfea153f2b45ef3bb9a9fd218.tar.gz | |
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
Diffstat (limited to 'app/controllers/commits_controller.rb')
| -rw-r--r-- | app/controllers/commits_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb index 3b8ebdb5ddc..534ae1edd31 100644 --- a/app/controllers/commits_controller.rb +++ b/app/controllers/commits_controller.rb @@ -9,10 +9,10 @@ class CommitsController < ProjectResourceController before_filter :require_non_empty_project def show - @repo = @project.repo + @repo = @project.repository @limit, @offset = (params[:limit] || 40), (params[:offset] || 0) - @commits = @project.commits(@ref, @path, @limit, @offset) + @commits = @repo.commits(@ref, @path, @limit, @offset) @commits = CommitDecorator.decorate(@commits) respond_to do |format| |