diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 17:57:24 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 17:57:24 -0500 |
| commit | c6ba6c11c7f0665064efdfc9385a5b8e1deaee50 (patch) | |
| tree | 6c48690a8873b8e3f3aeb0fadd137801cb548994 /app/views/users | |
| parent | 134360da46c1f8e5153c1c9eb5180ac990150d93 (diff) | |
| parent | d37bfd1e96f01d6f0fae275924e89dfe17a94938 (diff) | |
mergin' the wizard
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 |