diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-03-20 14:57:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-03-20 14:57:25 +0100 |
| commit | 2eb19ea3ea36916bbea72a8ccab3e6d15f602ac9 (patch) | |
| tree | 55c08bbb50e92ce76028f68a5267401a76bc4b02 /app/views/layouts | |
| parent | 8b830b8c3b32774e8ccf562b8bc9dbce3ecf3073 (diff) | |
| parent | 01fe50a72513a88f2168c8c0a649661b1382a42b (diff) | |
| download | gitlab-ce-2eb19ea3ea36916bbea72a8ccab3e6d15f602ac9.tar.gz | |
Merge branch 'master' into issue_12658
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 6 | ||||
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 714da410f56..bfa5937cf3f 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -45,6 +45,8 @@ %h1.title= title = render 'shared/outdated_browser' + - if @project && !@project.empty_repo? - :javascript - var findFileURL = "#{namespace_project_find_file_path(@project.namespace, @project, @ref || @project.repository.root_ref)}"; + - if ref = @ref || @project.repository.root_ref + :javascript + var findFileURL = "#{namespace_project_find_file_path(@project.namespace, @project, ref)}"; diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 0ae83ee01eb..86b46e8c75e 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -67,7 +67,7 @@ %span Issues - if @project.default_issues_tracker? - %span.count.issue_counter= number_with_delimiter(@project.issues.opened.count) + %span.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count) - if project_nav_tab? :merge_requests = nav_link(controller: :merge_requests) do |