diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-08 21:31:30 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-08 21:31:30 +0000 |
| commit | a12664cdedfd5b34a0290f42782b7bd19856ce4f (patch) | |
| tree | 4e291d77465de3010a5eb3cfe6441e01324fb79b | |
| parent | 2d0056709228d1de4fb8304a9c66ee1ed001e12c (diff) | |
| parent | b6b780cbf4c75183e349f63371b42117127fc4d8 (diff) | |
| download | gitlab-ce-a12664cdedfd5b34a0290f42782b7bd19856ce4f.tar.gz | |
Merge branch '29165-subscribe-btn' into 'master'
Remove hidden text from subscribe button
Closes #29165
See merge request !9790
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 4 | ||||
| -rw-r--r-- | spec/features/dashboard_issues_spec.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 9a4e423f896..10867140d4f 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -6,10 +6,8 @@ .top-area = render 'shared/issuable/nav', type: :issues .nav-controls - = link_to params.merge(rss_url_options), class: 'btn' do + = link_to params.merge(rss_url_options), class: 'btn has-tooltip', title: 'Subscribe' do = icon('rss') - %span.icon-label - Subscribe = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue" = render 'shared/issuable/filter', type: :issues diff --git a/spec/features/dashboard_issues_spec.rb b/spec/features/dashboard_issues_spec.rb index aa75e1140f6..8c61cdebc4b 100644 --- a/spec/features/dashboard_issues_spec.rb +++ b/spec/features/dashboard_issues_spec.rb @@ -48,7 +48,7 @@ describe "Dashboard Issues filtering", feature: true, js: true do it 'updates atom feed link' do visit_issues(milestone_title: '', assignee_id: user.id) - link = find('.nav-controls a', text: 'Subscribe') + link = find('.nav-controls a[title="Subscribe"]') params = CGI.parse(URI.parse(link[:href]).query) auto_discovery_link = find('link[type="application/atom+xml"]', visible: false) auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query) |