deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509

Browse source 
Conflicts:
	vendor/assets/javascripts/branch-graph.js
This commit is contained in:
Dmitriy Zaporozhets 2012-12-21 13:07:34 +02:00
commit a47032bc29
8 changed files with 276 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/views/projects/graph.html.haml
View file

@ -2,13 +2,15 @@
%br
.graph_holder
%h4
%small You can move around the graph by using arrow keys.
%small You can move around the graph by using the arrow keys.
#holder.graph
.loading.loading-gray
:javascript
var chunk1={commits:#{@commits_json}};
var days=#{@days_json};
initGraph();
var branch_graph;
$(function(){
branchGraph($("#holder")[0]);
GraphNav.init();
branch_graph = new BranchGraph($("#holder"), {
url: '#{url_for controller: 'projects', action: 'graph', format: :json}',
commit_url: '#{url_for controller: 'projects', action: 'show'}/commits/%s'
});
});