summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-10-16 13:56:48 +0000
committerazul <azul@riseup.net>2017-10-16 13:56:48 +0000
commit3657d09bf7993bb5ac3393e3c5d8c7fb8cae0844 (patch)
treeb903a3f85193675596a611e396a3c0322d4b0302 /app
parent35b710c968d6e71e4d4210dbc2e00abc6f14f513 (diff)
parentaba11e35fa483ae72203854e323445e8330ed71b (diff)
Merge branch 'bugfix/8805-failed-login-with-locale' into 'master'
fix: login error message with locale set Closes #8805 See merge request leap/webapp!46
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1f37fea..d3cfc2b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -99,7 +99,7 @@ class ApplicationController < ActionController::Base
#
# URL paths for which we don't enforce the locale as the prefix of the path.
#
- NON_LOCALE_PATHS = /^\/(assets|webfinger|.well-known|rails|key|[0-9]+)($|\/)/
+ NON_LOCALE_PATHS = /^\/(assets|webfinger|.well-known|rails|key|[0-9]+|new)($|\/)/
#
# For some requests, we ignore locale determination.