diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:52:39 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:52:39 -0500 |
| commit | acb5be88f394b126c3fba48ceb9798403c5afae1 (patch) | |
| tree | d28ba5b07bc91cb92f02c9e490bff5501859e6fd /app/views/sessions | |
| parent | 9f246b9ec386ccb5e6665408d050cf71fc336283 (diff) | |
| parent | ec9b2d4f40bd6a878aeca3ca32ba2aafe3836da5 (diff) | |
Merge branch 'master' of github.com:LukeShu/leager
Conflicts:
app/controllers/users_controller.rb
app/views/users/index.html.erb
Diffstat (limited to 'app/views/sessions')
| -rw-r--r-- | app/views/sessions/new.html.erb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index f942cf6..2e7a0d3 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,5 +1,7 @@ <h1>Sign in</h1> - +<% if @fail %> + <p class="error">Email and password combination not found</p> +<% end %> <div class="row"> <div class="span6 offset3"> <%= form_for(:session, url: sessions_path) do |f| %> |