diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 20:09:54 -0400 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 20:09:54 -0400 |
| commit | f3c395c56a644d976aa9a5608300557600bc683e (patch) | |
| tree | 83cb961a721fa8c50903c70bb08ae14dd15ca58c /app/views/layouts/application.html.erb | |
| parent | 7575d8cc70a28b323db0486ed06ab8af33b1f21a (diff) | |
| parent | f85943114dba527a1f87abb03229553472f57c0c (diff) | |
solved merge conflicts
Diffstat (limited to 'app/views/layouts/application.html.erb')
| -rw-r--r-- | app/views/layouts/application.html.erb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8a5f985..de9f3b8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,6 +26,9 @@ <% if signed_in? %> <%= link_to current_user.user_name, current_user, :class => "user" %> <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> + <% if current_user.can? :edit_server %> + <%= link_to "Server settings", edit_server_path, :class => "server" %> + <% end %> <% else %> <%= link_to "Log in", new_session_path, :class => "signin" %> <%= link_to "Sign up", new_user_path, :class => "signup" %> |