diff options
| author | Michel Etienne | 2015-08-11 17:38:58 +0200 |
|---|---|---|
| committer | Michel Etienne | 2015-08-11 17:38:58 +0200 |
| commit | cf772e2612cd6a487073eed425b4c0770b1abf3e (patch) | |
| tree | d26dd43e02565e46a98108f6d1f8eb8eb87f0164 | |
| parent | e740f23239ff2fcad73b8933435518c20b8a025f (diff) | |
| parent | 2a226ea31078e66bb71fe73b1c58b643bb834fcc (diff) | |
| download | chouette-core-cf772e2612cd6a487073eed425b4c0770b1abf3e.tar.bz2 | |
Merge branch 'V3_0' of github.com:afimb/chouette2 into V3_0
| -rw-r--r-- | app/views/devise/registrations/edit.html.erb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 154ecf1c8..dd3051098 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -6,7 +6,7 @@ <div class="form-inputs"> <%= f.input :email, required: true, autofocus: true %> <%= f.input :name, required: true %> - + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p> <% end %> @@ -18,7 +18,6 @@ <div class="form-actions"> <%= f.button :submit %> + <%= link_to t("cancel"), :back %> </div> <% end %> - - |