GitLab Bot
|
beab869416
|
Add latest changes from gitlab-org/gitlab@master
|
2021-04-12 21:11:12 +00:00 |
|
GitLab Bot
|
d91ff791fb
|
Add latest changes from gitlab-org/gitlab@master
|
2020-07-14 03:09:24 +00:00 |
|
Douwe Maan
|
0c0c2ecd99
|
Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
# Conflicts:
# app/controllers/admin/users_controller.rb
# app/controllers/confirmations_controller.rb
# app/controllers/profiles/emails_controller.rb
# app/models/user.rb
# app/services/emails/base_service.rb
# app/services/emails/destroy_service.rb
# app/views/devise/mailer/confirmation_instructions.html.haml
# lib/api/users.rb
# spec/services/emails/destroy_service_spec.rb
|
2017-10-05 12:48:22 +02:00 |
|
Brett Walker
|
a6045df701
|
move #cta properly under #content
|
2017-09-23 15:23:11 +02:00 |
|
Brett Walker
|
b1e68922a4
|
refactored the account confirmation into a partial. Also made the
text in the `.text` version consistent with the `.html` version
|
2017-09-23 15:23:11 +02:00 |
|