diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 17:55:00 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 17:55:00 +0300 |
| commit | d1f0ad45b029ef247addab56b73f66536162ab40 (patch) | |
| tree | 343ff75a610d282512d0ebfc69ec3aa9ab86b5f0 /app/views/projects | |
| parent | 8bfbafbb6b2166d3709187cf6b1cb7ff5f627d52 (diff) | |
| parent | 138ff057a1812ddfbc5ffc4f9406336ca7a3153e (diff) | |
Merge branch 'tooltip-change' into 'master'
Update project star/unstar tooltip
## What does this MR do?
Fixes project toggle star button tooltip to show actual tooltip for its state.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
- When you star a project tooltip wasn't changing.
- When you star a project and refresh the page, tooltip was still showing `Star Project`
## What are the relevant issue numbers?
Fixes #18143
## Screenshots (if relevant)
### Before
### After
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4672
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/buttons/_star.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/buttons/_star.html.haml b/app/views/projects/buttons/_star.html.haml index 02dbb2985a4..71cf5582a4c 100644 --- a/app/views/projects/buttons/_star.html.haml +++ b/app/views/projects/buttons/_star.html.haml @@ -1,5 +1,5 @@ - if current_user - = link_to toggle_star_namespace_project_path(@project.namespace, @project), class: 'btn star-btn toggle-star has-tooltip', method: :post, remote: true, title: "Star project" do + = link_to toggle_star_namespace_project_path(@project.namespace, @project), { class: 'btn star-btn toggle-star has-tooltip', method: :post, remote: true, title: current_user.starred?(@project) ? 'Unstar project' : 'Star project' } do - if current_user.starred?(@project) = icon('star fw') %span.starred Unstar |