diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-18 19:34:32 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-18 19:34:32 +0300 |
| commit | 30d2d2381f608b7c926747d61a9231aa417ea5da (patch) | |
| tree | 16b5f2d3452210b2be232b0bae0ddfbb968ec460 /app/controllers/graphs_controller.rb | |
| parent | cc5440e82a396fe4967a0b31322d9bb67ee70057 (diff) | |
| parent | 60bb35161741338e585feedf09538f5935bba271 (diff) | |
| download | gitlab-ce-30d2d2381f608b7c926747d61a9231aa417ea5da.tar.gz | |
Merge branch 'feature/users_groups' into 6-0-dev
Diffstat (limited to 'app/controllers/graphs_controller.rb')
| -rw-r--r-- | app/controllers/graphs_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/graphs_controller.rb b/app/controllers/graphs_controller.rb index 5ae9c15c0f7..6c2ac5fcbf4 100644 --- a/app/controllers/graphs_controller.rb +++ b/app/controllers/graphs_controller.rb @@ -10,7 +10,7 @@ class GraphsController < ProjectResourceController format.js do @repo = @project.repository @stats = Gitlab::Git::GitStats.new(@repo.raw, @repo.root_ref) - @log = @stats.parsed_log.to_json + @log = @stats.parsed_log.to_json rescue [] end end end |