diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-25 17:58:20 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-25 17:58:20 +0400 |
| commit | 3a72af480d5a89a0cf5fd27e65e473c49e63eaad (patch) | |
| tree | 283ce8045df34394b32a674ad4f82123669d2b1d /app/controllers | |
| parent | 9cd5ff043a72001201b4c8192a45f8029ebe84ac (diff) | |
| parent | eaeb4a90d431ff5e1e6156c10f3118f70c3c4f8e (diff) | |
Merge branch 'use-more-rugged' into 'master'
Make GitLab CE works with new gitlab_git
Recently we removed grit dependency from `gitlab_git` in favor of rugged.
This changes make GitLab works with new library.
See merge request !194
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/projects/repositories_controller.rb | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index c344297ba8a..34bd682bd90 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -19,13 +19,7 @@ class Projects::CommitController < Projects::ApplicationController [] end - begin - @diffs = @commit.diffs - rescue Grit::Git::GitTimeout - @diffs = [] - @diff_timeout = true - end - + @diffs = @commit.diffs @note = project.build_commit_note(commit) @notes_count = project.notes.for_commit_id(commit.id).count @notes = project.notes.for_commit_id(@commit.id).not_inline.fresh diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb index f30eaadd928..c030320d037 100644 --- a/app/controllers/projects/repositories_controller.rb +++ b/app/controllers/projects/repositories_controller.rb @@ -5,7 +5,7 @@ class Projects::RepositoriesController < Projects::ApplicationController before_filter :require_non_empty_project def stats - @stats = Gitlab::Git::Stats.new(@repository.raw, @repository.root_ref) + @stats = Gitlab::Git::Stats.new(@repository.raw_repository, @repository.root_ref) @graph = @stats.graph end |