parent
aea9799197
commit
50ed43e490
|
@ -81,6 +81,7 @@ v 8.7.0 (unreleased)
|
||||||
- Remove "Congratulations!" tweet button on newly-created project. (Connor Shea)
|
- Remove "Congratulations!" tweet button on newly-created project. (Connor Shea)
|
||||||
- Fix admin/projects when using visibility levels on search (PotHix)
|
- Fix admin/projects when using visibility levels on search (PotHix)
|
||||||
- Build status notifications
|
- Build status notifications
|
||||||
|
- Update email confirmation interface
|
||||||
- API: Expose user location (Robert Schilling)
|
- API: Expose user location (Robert Schilling)
|
||||||
- API: Do not leak group existence via return code (Robert Schilling)
|
- API: Do not leak group existence via return code (Robert Schilling)
|
||||||
- ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
|
- ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
|
||||||
|
|
|
@ -144,6 +144,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.btn-lg {
|
||||||
|
padding: 12px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
.btn-transparent {
|
.btn-transparent {
|
||||||
color: $btn-transparent-color;
|
color: $btn-transparent-color;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
.well-confirmation {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
border-bottom: 1px solid #eee;
|
||||||
|
|
||||||
|
> h1 {
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
|
||||||
|
.lead {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.confirmation-content {
|
||||||
|
a {
|
||||||
|
color: $md-link-color;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,7 +1,16 @@
|
||||||
class ConfirmationsController < Devise::ConfirmationsController
|
class ConfirmationsController < Devise::ConfirmationsController
|
||||||
|
|
||||||
|
def almost_there
|
||||||
|
flash[:notice] = nil
|
||||||
|
render layout: "devise_empty"
|
||||||
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
|
def after_resending_confirmation_instructions_path_for(resource)
|
||||||
|
users_almost_there_path
|
||||||
|
end
|
||||||
|
|
||||||
def after_confirmation_path_for(resource_name, resource)
|
def after_confirmation_path_for(resource_name, resource)
|
||||||
if signed_in?(resource_name)
|
if signed_in?(resource_name)
|
||||||
after_sign_in_path_for(resource)
|
after_sign_in_path_for(resource)
|
||||||
|
|
|
@ -31,11 +31,11 @@ class RegistrationsController < Devise::RegistrationsController
|
||||||
end
|
end
|
||||||
|
|
||||||
def after_sign_up_path_for(_resource)
|
def after_sign_up_path_for(_resource)
|
||||||
new_user_session_path
|
users_almost_there_path
|
||||||
end
|
end
|
||||||
|
|
||||||
def after_inactive_sign_up_path_for(_resource)
|
def after_inactive_sign_up_path_for(_resource)
|
||||||
new_user_session_path
|
users_almost_there_path
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
.well-confirmation.text-center
|
||||||
|
%h1.prepend-top-0
|
||||||
|
Almost there...
|
||||||
|
%p.lead
|
||||||
|
Please check your email to confirm your account
|
||||||
|
%p.confirmation-content.text-center
|
||||||
|
No confirmation email received? Please check your spam folder or
|
||||||
|
.append-bottom-20.prepend-top-20.text-center
|
||||||
|
%a.btn.btn-lg.btn-success{ href: new_user_confirmation_path }
|
||||||
|
Request new confirmation email
|
|
@ -0,0 +1,17 @@
|
||||||
|
!!! 5
|
||||||
|
%html{ lang: "en"}
|
||||||
|
= render "layouts/head"
|
||||||
|
%body.ui_charcoal.login-page.application.navless
|
||||||
|
= render "layouts/header/empty"
|
||||||
|
= render "layouts/broadcast"
|
||||||
|
.container.navless-container
|
||||||
|
.content
|
||||||
|
= render "layouts/flash"
|
||||||
|
= yield
|
||||||
|
|
||||||
|
%hr
|
||||||
|
.container
|
||||||
|
.footer-links
|
||||||
|
= link_to "Explore", explore_root_path
|
||||||
|
= link_to "Help", help_path
|
||||||
|
= link_to "About GitLab", "https://about.gitlab.com/"
|
|
@ -418,6 +418,7 @@ Rails.application.routes.draw do
|
||||||
|
|
||||||
devise_scope :user do
|
devise_scope :user do
|
||||||
get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error
|
get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error
|
||||||
|
get '/users/almost_there' => 'confirmations#almost_there'
|
||||||
end
|
end
|
||||||
|
|
||||||
root to: "root#index"
|
root to: "root#index"
|
||||||
|
|
|
@ -13,8 +13,8 @@ feature 'Signup', feature: true do
|
||||||
fill_in 'user_password_sign_up', with: user.password
|
fill_in 'user_password_sign_up', with: user.password
|
||||||
click_button "Sign up"
|
click_button "Sign up"
|
||||||
|
|
||||||
expect(current_path).to eq user_session_path
|
expect(current_path).to eq users_almost_there_path
|
||||||
expect(page).to have_content("A message with a confirmation link has been sent to your email address.")
|
expect(page).to have_content("Please check your email to confirm your account")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue