Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
0de1b9a6d3b9
Commit
7bb84e64
authored
May 06, 2016
by
Felipe Artur
Browse files
Change landing page when skipping confirmation email and add documentation
parent
0f3f42db82b9
Changes
7
Hide whitespace changes
Inline
Side-by-side
app/controllers/registrations_controller.rb
View file @
0de1b9a6
...
...
@@ -37,8 +37,8 @@ def build_resource(hash=nil)
super
end
def
after_sign_up_path_for
(
_resource
)
users_almost_there_path
def
after_sign_up_path_for
(
user
)
user
.
confirmed_at
.
present?
?
dashboard_projects_path
:
users_almost_there_path
end
def
after_inactive_sign_up_path_for
(
_resource
)
...
...
app/views/admin/application_settings/_form.html.haml
View file @
0de1b9a6
...
...
@@ -106,9 +106,9 @@
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
=
f
.
label
:s
kip
_confirmation_email
do
=
f
.
label
:s
end_user
_confirmation_email
do
=
f
.
check_box
:send_user_confirmation_email
Send
sign-up
email
c
on
firmation
Send
confirmation
email on
sign-up
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
...
...
db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
View file @
0de1b9a6
...
...
@@ -3,7 +3,7 @@ def up
add_column
:application_settings
,
:send_user_confirmation_email
,
:boolean
,
default:
false
#Sets confirmation email to true by default on existing installations.
A
pplication
S
etting
.
update_all
(
send_user_confirmation_email
:
true
)
execute
"UPDATE a
pplication
_s
etting
s SET
send_user_confirmation_email
=
true
"
end
def
down
...
...
doc/security/README.md
View file @
0de1b9a6
...
...
@@ -8,3 +8,4 @@
-
[
User File Uploads
](
user_file_uploads.md
)
-
[
How we manage the CRIME vulnerability
](
crime_vulnerability.md
)
-
[
Enforce Two-factor authentication
](
two_factor_authentication.md
)
-
[
Send email confirmation on sign-up
](
user_email_confirmation.md
)
doc/security/user_email_confirmation.md
0 → 100644
View file @
0de1b9a6
# User email confirmation at sign-up
Gitlab admin can enable email confirmation on sign-up, if you want to confirm all
user emails before they are able to sign-in.
In the Admin area under
**Settings**
(
`/admin/application_settings`
), go to section
**Sign-in Restrictions**
and look for
**Send confirmation email on sign-up**
option.
spec/controllers/registrations_controller_spec.rb
View file @
0de1b9a6
...
...
@@ -16,7 +16,7 @@
it
'logs user in directly'
do
post
(
:create
,
user_params
)
expect
(
ActionMailer
::
Base
.
deliveries
.
last
).
to
be_nil
expect
(
subject
.
current_user
).
to
be
expect
(
subject
.
current_user
).
to
_not
be_nil
end
end
...
...
spec/features/signup_spec.rb
View file @
0de1b9a6
...
...
@@ -2,22 +2,45 @@
feature
'Signup'
,
feature:
true
do
describe
'signup with no errors'
do
before
{
allow_any_instance_of
(
ApplicationSetting
).
to
receive
(
:send_user_confirmation_email
).
and_return
(
true
)
}
it
'creates the user account and sends a
confirmation email
'
do
user
=
build
(
:user
)
context
"when sending
confirmation email
"
do
before
{
allow_any_instance_of
(
ApplicationSetting
).
to
receive
(
:send_user_confirmation_email
).
and_return
(
true
)
}
visit
root_path
it
'creates the user account and sends a confirmation email'
do
user
=
build
(
:user
)
fill_in
'new_user_name'
,
with:
user
.
name
fill_in
'new_user_username'
,
with:
user
.
username
fill_in
'new_user_email'
,
with:
user
.
email
fill_in
'new_user_password'
,
with:
user
.
password
click_button
"Sign up"
visit
root_path
fill_in
'new_user_name'
,
with:
user
.
name
fill_in
'new_user_username'
,
with:
user
.
username
fill_in
'new_user_email'
,
with:
user
.
email
fill_in
'new_user_password'
,
with:
user
.
password
click_button
"Sign up"
expect
(
current_path
).
to
eq
users_almost_there_path
expect
(
page
).
to
have_content
(
"Please check your email to confirm your account"
)
expect
(
current_path
).
to
eq
users_almost_there_path
expect
(
page
).
to
have_content
(
"Please check your email to confirm your account"
)
end
end
context
"when not sending confirmation email"
do
before
{
allow_any_instance_of
(
ApplicationSetting
).
to
receive
(
:send_user_confirmation_email
).
and_return
(
false
)
}
it
'creates the user account and goes to dashboard'
do
user
=
build
(
:user
)
visit
root_path
fill_in
'new_user_name'
,
with:
user
.
name
fill_in
'new_user_username'
,
with:
user
.
username
fill_in
'new_user_email'
,
with:
user
.
email
fill_in
'new_user_password'
,
with:
user
.
password
click_button
"Sign up"
expect
(
current_path
).
to
eq
dashboard_projects_path
expect
(
page
).
to
have_content
(
"Welcome! You have signed up successfully."
)
end
end
end
describe
'signup with errors'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment