Merge branch 'sh-add-user-constraints' into 'master'

Fix missing constraints causing route failures when usernames with periods are used Closes #23131 See merge request !6758

Merge branch 'sh-add-user-constraints' into 'master'
4e963fed · Stan Hu · ed2fe984 · e72f2cfc · 4e963fed
Commit 4e963fed authored Oct 08, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

user.rb config/routes/user.rb +4 -1

No files found.
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -15,7 +15,10 @@ devise_scope :user do
 end

 constraints(UserUrlConstrainer.new) do
-  scope(path: ':username', as: :user, controller: :users) do
+  scope(path: ':username',
+        as: :user,
+        constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ },
+        controller: :users) do
    get '/', action: :show
  end
 end