Merge branch 'notifications' of git.rrerr.net:justask/justask into notifications

This commit is contained in:
nilsding 2014-12-14 12:27:45 +01:00
commit dd7d4311a4
2 changed files with 2 additions and 0 deletions

View File

@ -22,6 +22,7 @@
%ul.nav.navbar-nav
= nav_entry "Timeline", root_path
= nav_entry "Inbox", "/inbox", badge: inbox_count
= render "layouts/notifications"
%ul.nav.navbar-nav.navbar-right
%button.btn.btn-primary.navbar-btn.btn-sm{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
%i.fa.fa-pencil-square-o

View File

@ -0,0 +1 @@
= nav_entry "Notifications", "/notifications/index"