diff options
| -rw-r--r-- | app/views/help/markdown.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/_new_form.html.haml | 2 | ||||
| -rw-r--r-- | lib/gitlab/graph/json_builder.rb | 10 | ||||
| -rw-r--r-- | vendor/assets/javascripts/branch-graph.js | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/app/views/help/markdown.html.haml b/app/views/help/markdown.html.haml index 46bcd895274..92c1e49be49 100644 --- a/app/views/help/markdown.html.haml +++ b/app/views/help/markdown.html.haml @@ -121,7 +121,7 @@ - if @project = current_user.authorized_projects.first - if issue = @project.issues.first %p For example in your #{link_to @project.name, project_path(@project)} project, writing: - %pre= "This is related to ##{issue.id}. @#{current_user.name} is working on solving it." + %pre= "This is related to ##{issue.id}. @#{current_user.username} is working on solving it." %p becomes: - = markdown "This is related to ##{issue.id}. @#{current_user.name} is working on solving it." + = markdown "This is related to ##{issue.id}. @#{current_user.username} is working on solving it." - @project = nil # Prevent this from bubbling up to page title diff --git a/app/views/projects/_new_form.html.haml b/app/views/projects/_new_form.html.haml index 131a4de4218..2d5f3923e80 100644 --- a/app/views/projects/_new_form.html.haml +++ b/app/views/projects/_new_form.html.haml @@ -17,4 +17,4 @@ = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen'} %hr %p.padded - All created project are private. You choose who can see project and commit to repository. + New projects are private by default. You choose who can see the project and commit to repository. diff --git a/lib/gitlab/graph/json_builder.rb b/lib/gitlab/graph/json_builder.rb index 4a48b3b5675..a3157aa4b4d 100644 --- a/lib/gitlab/graph/json_builder.rb +++ b/lib/gitlab/graph/json_builder.rb @@ -16,6 +16,7 @@ module Gitlab @commits = collect_commits @days = index_commits + @space = 0 end def to_json(*args) @@ -97,8 +98,8 @@ module Gitlab if leaves.empty? return end - space = find_free_space(leaves, map) - leaves.each{|l| l.space = space} + @space = find_free_space(leaves, map) + leaves.each{|l| l.space = @space} # and mark it as reserved min_time = leaves.last.time parents = leaves.last.parents.collect @@ -115,7 +116,7 @@ module Gitlab else max_time = parent_time - 1 end - mark_reserved(min_time..max_time, space) + mark_reserved(min_time..max_time, @space) # Visit branching chains leaves.each do |l| @@ -139,9 +140,10 @@ module Gitlab reserved += @_reserved[day] end space = base_space(leaves, map) - while reserved.include? space do + while (reserved.include? space) || (space == @space) do space += 1 end + space end diff --git a/vendor/assets/javascripts/branch-graph.js b/vendor/assets/javascripts/branch-graph.js index 805423bc70d..af3b572a4e3 100644 --- a/vendor/assets/javascripts/branch-graph.js +++ b/vendor/assets/javascripts/branch-graph.js @@ -121,7 +121,7 @@ if (c.space == this.commits[i].space) { r.path([ "M", x, y, - "L", x - 20 * (c.time + 1), y + "L", cx, cy ]).attr({ stroke: this.colors[c.space], "stroke-width": 2 @@ -351,4 +351,4 @@ function textWrap(t, width) { t.attr({ "y": b.y + h }); -}
\ No newline at end of file +} |