Commit graph

28 commits

Author SHA1 Message Date
gfyoung
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
Lin Jen-Shin
4ee08b77bc Updates from rubocop -a 2018-07-09 21:13:08 +08: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
Alexandra
ed3c25e429 spacing and small optimisations 2017-10-01 17:07:26 +02:00
James Lopez
1dcb711110 refactor emails service 2017-09-28 08:46:39 +02:00
James Lopez
9621dd0c9d refactor services to match EE signature 2017-09-28 08:46:39 +02:00
Brett Walker
a32f1dddf2 fixes for rubocop 2017-09-23 15:26:04 +02:00
Brett Walker
30e3a49e23 optimized the email services 2017-09-23 15:24:53 +02:00
Brett Walker
d2267beb89 tweaks for rubocop 2017-09-23 15:23:11 +02:00
Brett Walker
cf8a5bcaec add verified/unverified labels to profile emails.
added "Resend confirmation email" for unverified emails
2017-09-23 15:23:11 +02:00
Brett Walker
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
Tiago Botelho
cfd475a45e Removes default scope from sortable 2017-09-07 13:01:59 +01:00
James Lopez
4d70c47910 fix spec failures 2017-06-25 08:34:06 +02:00
James Lopez
0ee002c70e more refactoring 2017-06-23 11:41:42 +02:00
James Lopez
785cbb79e2 refactor emails service 2017-06-23 11:41:42 +02:00
James Lopez
831b2fccf9 update missing email actions 2017-06-23 11:41:42 +02:00
James Lopez
3bab585bec update to use emails destroy service 2017-06-23 11:41:42 +02:00
James Lopez
949808529c updated emails, notifications and passwords controller 2017-06-23 11:41:41 +02:00
blackst0ne
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
Mehmet Emin İNAÇ
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
Dmitriy Zaporozhets
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
Douwe Maan
26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Douwe Maan
d386bb7808 Allow primary email to be set to an email that you've already added. 2015-04-30 16:17:03 +02:00
Senorsen
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
Douwe Maan
9dbd7e5aec Allow notification email to be set separately from primary email.
Closes #1932.
2015-02-07 23:19:17 +01:00
Dmitriy Zaporozhets
8fee5a0572
Make app works with strong params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 23:24:17 +03:00
Dmitriy Zaporozhets
a73df4f72d
Allow oauth signup without email
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-07 14:09:29 +03:00
Jason Hollingsworth
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