diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-19 21:39:48 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-19 21:39:48 -0500 |
| commit | 70e59035c0803bbed29d69fe1c535a15f0249f53 (patch) | |
| tree | e3133aa80729558780acaf0155bab2dbc9355860 /app/views | |
| parent | 4784695860dea75864c801c6223fb348c5ac7cd3 (diff) | |
| download | gitlab-ce-70e59035c0803bbed29d69fe1c535a15f0249f53.tar.gz | |
Fix project find url so branch ref is not nil
Also adds autocomplete="off" to find input.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 8 | ||||
| -rw-r--r-- | app/views/projects/find_file/show.html.haml | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 10f80fae3c8..b83b5b1c9b0 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -37,6 +37,10 @@ %h1.title= title = render 'shared/outdated_browser' -- if @project +-if @project && !@project.empty_repo? && @ref :javascript - var findFileURL = '#{namespace_project_find_file_path(@project.namespace, @project, @ref || @project.repository.root_ref)}';
\ No newline at end of file + var findFileURL = '#{namespace_project_find_file_path(@project.namespace, @project, @ref)}'; + +-elsif @project && !@project.empty_repo? + :javascript + var findFileURL = '#{namespace_project_find_file_path(@project.namespace, @project, @project.repository.root_ref)}';
\ No newline at end of file diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml index 40a2a61d8a1..905f6bbbd48 100644 --- a/app/views/projects/find_file/show.html.haml +++ b/app/views/projects/find_file/show.html.haml @@ -10,7 +10,7 @@ = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do = @project.path %li.file-finder - %input#file_find.form-control.file-finder-input{type: "text", placeholder: 'Find by path'} + %input#file_find.form-control.file-finder-input{type: "text", placeholder: 'Find by path', autocomplete: 'off'} %div.tree-content-holder .table-holder |