Merge branch 'master' into feature/limit_user_leak

Conflicts:
	users/lib/warden/strategies/secure_remote_password.rb

1 files changed, 3 insertions, 0 deletions

diff --git a/users/app/views/v1/sessions/new.json.erb b/users/app/views/v1/sessions/new.json.erb
new file mode 100644
index 0000000..36154b8
--- /dev/null
+++ b/users/app/views/v1/sessions/new.json.erb
@@ -0,0 +1,3 @@
+{
+"errors": <%= raw @errors.to_json %>
+}