diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 17:55:58 -0500 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 17:55:58 -0500 |
| commit | d37bfd1e96f01d6f0fae275924e89dfe17a94938 (patch) | |
| tree | 2b91210dd196a1e1d6fab67e561cba12dc43d8eb /app/views/users | |
| parent | bc42a479891d491aecd5477cfeedd986e9738438 (diff) | |
| parent | 19b135ec55e040c78009400f389d19ae58cc628c (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/edit.html.erb | 6 | ||||
| -rw-r--r-- | app/views/users/show.json.jbuilder | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb deleted file mode 100644 index 99bd4cc..0000000 --- a/app/views/users/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -<h1>Editing user</h1> - -<%= render 'form' %> - -<%= link_to 'Show', @user %> | -<%= link_to 'Back', users_path %> diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder deleted file mode 100644 index 1262e80..0000000 --- a/app/views/users/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.extract! @user, :id, :name, :pw_hash, :created_at, :updated_at |