diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:19:20 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:19:20 -0400 |
| commit | 82840d22116835474614b80ebe72c282bcfc5f5e (patch) | |
| tree | ea24c3648274c664ba014f28356ae353d049b643 /app/views/servers/show.html.erb | |
| parent | 0d42079611ed2aeacd71b926580fdc3b943cf1ba (diff) | |
| parent | d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb (diff) | |
Merge branch 'clean2'
Conflicts:
app/views/servers/show.html.erb
Diffstat (limited to 'app/views/servers/show.html.erb')
| -rw-r--r-- | app/views/servers/show.html.erb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb index 67f7647..aa6752a 100644 --- a/app/views/servers/show.html.erb +++ b/app/views/servers/show.html.erb @@ -1,2 +1,7 @@ +<p> + <strong>Default user permissions:</strong> + <%= @server.default_user_permissions %> +</p> + <%= link_to 'Edit', edit_server_path(@server) %> | <%= link_to 'Back', servers_path %> |