diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-04 17:30:03 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-04 17:30:03 +0300 |
| commit | 3569b2e2d715ffeecf27e26cf3d8c9ec08b8ad49 (patch) | |
| tree | 2c3ccbe19c476d543956a72d8a63cfbae5aa4bae /app/helpers/projects_helper.rb | |
| parent | f0248fa8c0620eb70e70b8ccdcff89ee7797ac4f (diff) | |
| parent | ebbbc7ef52fbd1d3339e2e21be967d313a074a28 (diff) | |
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'app/helpers/projects_helper.rb')
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 5f61dafaae5..0dc820e5d03 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -1,4 +1,6 @@ module ProjectsHelper + include Gitlab::CurrentSettings + def link_to_project(project) link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do title = content_tag(:span, project.name, class: 'project-name') @@ -60,7 +62,7 @@ module ProjectsHelper project_link = link_to project_path(project), { class: ("project-item-select-holder" unless show_new_nav?) } do output = - if show_new_nav? && project.avatar_url + if show_new_nav? && project.avatar_url && !Rails.env.test? project_icon(project, alt: project.name, class: 'avatar-tile', width: 16, height: 16) else "" |