Commit ede3446c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'confirmation_protection' of /home/git/repositories/gitlab/gitlabhq

parents dc5bd10d f537e4c9
...@@ -7,7 +7,8 @@ paths_to_be_protected = [ ...@@ -7,7 +7,8 @@ paths_to_be_protected = [
"#{Rails.application.config.relative_url_root}/users/sign_in", "#{Rails.application.config.relative_url_root}/users/sign_in",
"#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session.json", "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session.json",
"#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session", "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session",
"#{Rails.application.config.relative_url_root}/users" "#{Rails.application.config.relative_url_root}/users",
"#{Rails.application.config.relative_url_root}/users/confirmation"
] ]
unless Rails.env.test? unless Rails.env.test?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment