Vinoth Kannan 4ec2c1e9a9 DEV: don't merge email address if target user is not human. (#13915) ...

While merging two user accounts don't merge the source user's email address if the target user is not a human.

Co-authored-by: Alan Guo Xiang Tan <gxtan1990@gmail.com>

2021-08-03 10:04:35 +05:30

..

components

FIX: Use reply-to address for incoming emails if present (#13896)

2021-08-03 08:01:17 +10:00

fabricators

FIX: Validate value of custom dropdown user fields - dropdowns and multiple selects (#13890)

2021-07-30 13:50:47 -04:00

fixtures

FIX: Use reply-to address for incoming emails if present (#13896)

2021-08-03 08:01:17 +10:00

helpers

FIX: Assets for the theme tests page are not compressed (#13736)

2021-07-14 22:52:35 +03:00

import_export

FEATURE: Rake task to export groups (#9450)

2020-04-17 14:59:54 -07:00

initializers

FEATURE: A low priority filter for the review queue. (#12822)

2021-04-23 15:34:24 -03:00

integration

DEV: Isolate multisite specs (#13634)

2021-07-07 18:57:42 +02:00

integrity

DEV: Fix a flaky Onceoff spec (#13314)

2021-06-07 20:38:31 +02:00

jobs

FEATURE: Initial implementation of direct S3 uploads with uppy and stubs (#13787)

2021-07-28 08:42:25 +10:00

lib

FIX: Make search work with sub-sub-categories (#13901)

2021-08-02 14:04:13 +03:00

mailers

FEATURE: Use group SMTP job and mailer instead of UserNotifications change (#13489)

2021-06-28 08:55:13 +10:00

models

FEATURE: Add post edits count to user activity (#13495)

2021-08-02 10:15:53 -04:00

multisite

FEATURE: Initial implementation of direct S3 uploads with uppy and stubs (#13787)

2021-07-28 08:42:25 +10:00

requests

FEATURE: Add post edits count to user activity (#13495)

2021-08-02 10:15:53 -04:00

script/import_scripts

DEV: If disabled do not change setting after import (#12142)

2021-02-19 09:33:35 -07:00

serializers

DEV: Remove flaky topic_view_serializer spec (#13845)

2021-07-26 13:17:53 +10:00

services

DEV: don't merge email address if target user is not human. (#13915)

2021-08-03 10:04:35 +05:30

support

FIX: Make sure reset-new for tracked is not limited by per_page count (#13395)

2021-06-17 08:20:09 +10:00

tasks

FIX: remove migrate_from_s3 task that silently corrupts data (#11703)

2021-01-17 22:33:29 +01:00

views/omniauth_callbacks

FEATURE: Use full page redirection for all external auth methods (#8092)

2019-10-08 12:10:43 +01:00

rails_helper.rb

DEV: Absorb onebox gem into core (#12979)

2021-05-26 15:11:35 +05:30

swagger_helper.rb

FEATURE: Let users select flair (#13587)

2021-07-08 10:46:21 +03:00