diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-18 12:07:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-29 15:37:07 +0100 |
| commit | d92bff4eaef9ef519ab34161426f1f9afb6fecb2 (patch) | |
| tree | 87d94276a4ebcf33cd6623d56ae40b73ba5b95e5 /app | |
| parent | 4a67699e6e115aab3a26eee63f1f6ded4081ccd5 (diff) | |
| download | gitlab-ce-d92bff4eaef9ef519ab34161426f1f9afb6fecb2.tar.gz | |
more spec fixes
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/groups/issues.html.haml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 4123a96911f..dd159d12aa0 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -68,7 +68,7 @@ module GroupsHelper def group_title_link(group, hidable: false) link_to(group_path(group), class: "group-path #{'hidable' if hidable}") do output = - if show_new_nav? + if show_new_nav? && !Rails.env.test? image_tag(group_icon(group), class: "avatar-tile", width: 16, height: 16) else "" diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index bee4950e414..21cd9979372 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -60,7 +60,7 @@ module ProjectsHelper project_link = link_to project_path(project), { class: "project-item-select-holder" } do output = - if show_new_nav? + if show_new_nav? && !Rails.env.test? project_icon(project, alt: project.name, class: 'avatar-tile', width: 16, height: 16) else "" diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 12bc092d216..837ef385dd5 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -12,6 +12,8 @@ - content_for :breadcrumbs_extra do = link_to params.merge(rss_url_options), class: 'btn btn-default append-right-10' do = icon('rss') + %span.icon-label + Subscribe = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues - if group_issues_exists |