diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-08-07 23:20:09 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-08-07 23:20:09 +0300 |
| commit | 7767ceef47a57baf2bc03f609e3dbf77ed44c9aa (patch) | |
| tree | 0d057168bfba56bff88f2bf1b4e8f19af0aa2204 /app/views/layouts/header/_new.html.haml | |
| parent | 1d5a306596e56398c3f6f46feafd1f4ce23c3c2c (diff) | |
| parent | b12107a0b953b566cd58db30ae880800a4a695a6 (diff) | |
Merge branch 'master' into ide
* master: (177 commits)
Add changelog
Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
Make contextual sidebar collapsible
Fixed sidebar context header hover colors
Use correct `Environment`-class within `Gitlab` namespace
Remove gl.Activities from Commits page
Move `let` calls inside the `describe` block using them
Add `/assign me` alias support for assigning issuables to oneself
GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
Use `broken_storage` in the fs_shards_spec.
Eager load project creators for project dashboards
Memoize a user's personal projects count
Remove redundant query from User#recent_push
Improve checking if projects would be returned
Change spelling of gitlab-shell
Remove unused #tree-holder
Add custom linter for inline JavaScript to haml_lint
Rename user_can_admin? because it's more accurate
Synchronous zanata community contribution translation
Add Korean translation to i18n
...
Diffstat (limited to 'app/views/layouts/header/_new.html.haml')
| -rw-r--r-- | app/views/layouts/header/_new.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml index 40c86131494..fa94925d537 100644 --- a/app/views/layouts/header/_new.html.haml +++ b/app/views/layouts/header/_new.html.haml @@ -38,7 +38,7 @@ = icon('tachometer fw') %li = link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do - = icon('hashtag fw') + = custom_icon('issues') - issues_count = assigned_issuables_count(:issues) %span.badge.issues-count{ class: ('hidden' if issues_count.zero?) } = number_with_delimiter(issues_count) |