diff options
| author | jessib <jessib@riseup.net> | 2013-08-27 12:18:35 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-08-27 12:18:35 -0700 |
| commit | dc41ae0a3fb0a137e716d8ec63084b0ec3a7299b (patch) | |
| tree | c09fef161f105e7c03c35d1edcb2d257144cb97d /app/views | |
| parent | a87c750d1f12f15272beb117f8ee12ab711cc6d1 (diff) | |
| parent | e481b8cbc05a858674a59ef36d695973622f6b3a (diff) | |
Merge branch 'master' into billing_with_tests
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/_navigation.html.haml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 3eb2289..fb018a9 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,7 +1,6 @@ %ul.nav.sidenav = link_to_navigation t(:overview), user_overview_path(@user), :active => controller?(:overviews) = link_to_navigation t(:account_settings), edit_user_path(@user), :active => controller?(:users) - = link_to_navigation t(:email_settings), edit_user_email_settings_path(@user), :active => controller?(:email_settings) = link_to_navigation t(:support_tickets), auto_tickets_path, :active => controller?(:tickets) = link_to_navigation t(:billing_settings), show_or_new_customer_link(@user), :active => controller?(:customer, :payments, :subscriptions, :credit_card_info) if engine_enabled('LeapWebBilling') = link_to_navigation t(:logout), logout_path, :method => :delete |