8abeb70f96
Add latest changes from gitlab-org/gitlab@master
2025-02-20 21:07:14 +00:00
059cc73b5f
Add latest changes from gitlab-org/gitlab@master
2024-03-21 03:09:40 +00:00
99f4b14cb0
Add latest changes from gitlab-org/gitlab@master
2023-02-17 15:09:22 +00:00
709948b7a6
Add latest changes from gitlab-org/gitlab@master
2023-01-20 15:08:53 +00:00
48e30ea32f
Add latest changes from gitlab-org/gitlab@master
2022-04-21 15:10:09 +00:00
5d0c43f60d
Add latest changes from gitlab-org/gitlab@master
2022-01-13 09:15:32 +00:00
ecc11e5d60
Add latest changes from gitlab-org/gitlab@master
2021-12-10 15:10:24 +00:00
2ac4833015
Add latest changes from gitlab-org/gitlab@master
2020-10-08 18:08:32 +00:00
0b4bb101ea
Add latest changes from gitlab-org/gitlab@master
2020-10-01 18:10:20 +00:00
e33713136d
Externalize strings of email page in user profile
2019-06-10 08:41:22 +00:00
be42c05054
Enable more frozen string in app/controllers/
...
Enables frozen string for the following:
* app/controllers/dashboard/**/*.rb
* app/controllers/explore/**/*.rb
* app/controllers/google_api/**/*.rb
* app/controllers/groups/**/*.rb
* app/controllers/import/**/*.rb
* app/controllers/instance_statistics/**/*.rb
* app/controllers/ldap/**/*.rb
* app/controllers/oauth/**/*.rb
* app/controllers/profiles/**/*.rb
Partially addresses #47424 .
2018-09-23 12:48:02 -07:00
4ee08b77bc
Updates from `rubocop -a`
2018-07-09 21:13:08 +08:00
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
ed3c25e429
spacing and small optimisations
2017-10-01 17:07:26 +02:00
1dcb711110
refactor emails service
2017-09-28 08:46:39 +02:00
9621dd0c9d
refactor services to match EE signature
2017-09-28 08:46:39 +02:00
a32f1dddf2
fixes for rubocop
2017-09-23 15:26:04 +02:00
30e3a49e23
optimized the email services
2017-09-23 15:24:53 +02:00
d2267beb89
tweaks for rubocop
2017-09-23 15:23:11 +02:00
cf8a5bcaec
add verified/unverified labels to profile emails.
...
added "Resend confirmation email" for unverified emails
2017-09-23 15:23:11 +02:00
f9f4672275
Send a confirmation email when the user adds a secondary email address. Utilizes the Devise `confirmable` capabilities. Issue #37385
2017-09-23 15:23:11 +02:00
cfd475a45e
Removes default scope from sortable
2017-09-07 13:01:59 +01:00
4d70c47910
fix spec failures
2017-06-25 08:34:06 +02:00
0ee002c70e
more refactoring
2017-06-23 11:41:42 +02:00
785cbb79e2
refactor emails service
2017-06-23 11:41:42 +02:00
831b2fccf9
update missing email actions
2017-06-23 11:41:42 +02:00
3bab585bec
update to use emails destroy service
2017-06-23 11:41:42 +02:00
949808529c
updated emails, notifications and passwords controller
2017-06-23 11:41:41 +02:00
a544e46bb0
Add a rubocop rule to check if a method 'redirect_to' is used without explicitly set 'status' in 'destroy' actions of controllers
2017-06-07 09:45:16 +11:00
6a0ea605e8
Change deprecated usage of rendering without response body
...
`render nothing: true` has been deprecated.
For more information see [pr](https://github.com/rails/rails/pull/20336 )
2016-03-16 03:16:25 +02:00
4291e28af7
Merge branch 'change-primary-email' into 'master'
...
Allow primary email to be set to an email that you've already added.
Fixes gitlab-com/support-forum#106.
When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.
See merge request !591
2015-05-03 11:00:51 +00:00
26ad250989
Add a page title to every page.
2015-04-30 19:12:15 +02:00
d386bb7808
Allow primary email to be set to an email that you've already added.
2015-04-30 16:17:03 +02:00
7b28218f96
Allow user to choose which email to be public
...
This commit allows user to show one of their emails in profile page,
or don't show email in this page.
2015-04-14 19:42:48 +08:00
9dbd7e5aec
Allow notification email to be set separately from primary email.
...
Closes #1932 .
2015-02-07 23:19:17 +01:00
8fee5a0572
Make app works with strong params
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 23:24:17 +03:00
a73df4f72d
Allow oauth signup without email
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-07 14:09:29 +03:00
29cfd33d94
Add email aliases for users
...
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.
Notifications are sent when an email is added.
2014-02-13 22:59:39 -06:00
GitLab Bot
antony liu
gfyoung
Lin Jen-Shin
Douwe Maan
Alexandra
James Lopez
Tiago Botelho
blackst0ne
Mehmet Emin İNAÇ
Dmitriy Zaporozhets
Douwe Maan
Senorsen
Jason Hollingsworth