diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-12 10:29:59 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-12 10:29:59 +0200 |
| commit | 4346c39ba9578169e218ccae47501612051e6f04 (patch) | |
| tree | 1d32054c467811673daa5964f3323f36d9f2c484 | |
| parent | a5ce66d83637734f79bc61c7d1bf7c71e3d26afc (diff) | |
| download | gitlab-ce-project-page.tar.gz | |
Move "Forked from" above "Version".project-page
| -rw-r--r-- | app/views/projects/_aside.html.haml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/views/projects/_aside.html.haml b/app/views/projects/_aside.html.haml index 5edec7fe65c..c2f56996ba8 100644 --- a/app/views/projects/_aside.html.haml +++ b/app/views/projects/_aside.html.haml @@ -28,11 +28,20 @@ = link_to url_for_new_issue(@project, only_path: true), title: "New Issue", class: 'btn btn-sm append-right-10' do = icon("exclamation-circle fw") New Issue + - if can? current_user, :write_merge_request, @project = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-sm", title: "New Merge Request" do = icon("plus fw") New Merge Request + - if forked_from_project = @project.forked_from_project + .well + %h4 + = icon("code-fork fw") + Forked from + .pull-right + = link_to forked_from_project.namespace.try(:name), project_path(forked_from_project) + - if version = @repository.version .well %h4 @@ -42,14 +51,6 @@ = link_to version_url(@project) do = @repository.blob_by_oid(version.id).data - - if forked_from_project = @project.forked_from_project - .well - %h4 - = icon("code-fork fw") - Forked from - .pull-right - = link_to forked_from_project.namespace.try(:name), project_path(forked_from_project) - - @project.ci_services.each do |ci_service| - if ci_service.active? && ci_service.respond_to?(:builds_path) .well |