diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-28 20:25:15 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-28 20:25:15 +0300 |
| commit | c454dec170da32fc83b8d78c61c3f452c819f0ed (patch) | |
| tree | df05c491f06e845a0e8266afcb23962e95160a4a /app/views/projects/issues/index.html.haml | |
| parent | a5f7934420e1d26682700e02aa8fc9333e808f47 (diff) | |
| parent | b78d06b78143b16dccc5d5afaa8796473b68bea1 (diff) | |
Merge branch 'master' into go-go-gadget-webpack
* master: (33 commits)
Improved code style on the issue_sidebar_spec.rb
add CHAGELOG.md entry for !8831
remove assets:compile step from relative_url docs
update scripts and docs to reference the newly namespaced rake task
namespace assets rake tasks to gitlab:assets:*
correct gzip files if they exist as well
automatically correct CSS urls on assets:precompile
remove hard-coded assets path for ace editor modules
Fixed cancel button in the services form not redirecting back to the integrations settings view
Fix search bar search param encoding
Fix a transient failure in the `Explore::ProjectsController` spec
Fix filtering with multiple words
Fix project name label's for reference in project settings
Fixed merge request tabs extra margin
Don't call `#uniq` on a relation
Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/
Move ApplicationSetting DEFAULTS to `.defaults` instead
Move a begin/rescue clause to ApplicationSetting.expire
Use badge partial as single source of truth instead of having 2 partials doing the same
Changes after review
...
Diffstat (limited to 'app/views/projects/issues/index.html.haml')
| -rw-r--r-- | app/views/projects/issues/index.html.haml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 2d1671a89df..8ea1a3a45e1 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -19,10 +19,8 @@ = render 'shared/issuable/nav', type: :issues .nav-controls - if current_user - = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10' do + = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do = icon('rss') - %span.icon-label - Subscribe - if can? current_user, :create_issue, @project = link_to new_namespace_project_issue_path(@project.namespace, @project, |