delta/gitlab/gitlab-ce.git/app/models/user.rb, branch pre-commit-prettier

Add BlocksJsonSerialization model concern and include it in User

2017-12-19T21:45:07+00:00

Make sure user email is read only when synced with LDAP

2017-12-15T11:48:48+00:00

Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'

2017-12-11T12:07:57+00:00

Pick 10.2.4 security fixes into master

See merge request gitlab-org/gitlab-ce!15821

Resolve conflicts in app/models/user.rb

2017-12-11T10:10:15+00:00

Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'

2017-12-08T21:47:18+00:00

(10.2) Avoid partial partial email adresses for matching

See merge request gitlab/gitlabhq!2232

(cherry picked from commit 081aa1e91a777c9acb31be4a1e76b3dd7032fa9a)

There are unresolved conflicts in app/models/user.rb.

fa85a3fd Don't allow searching for partial user emails

expire todo count calculations to be consistent with

2017-12-08T13:20:51+00:00

assigned_open_merge_requests_count and assigned_open_issues_count, which are used in the top header stats.  Also important for a Geo secondary, so that the pending todo stat gets updated on the same frequency as the users open issues/merge requests.

Resolve "Display member role per project"

2017-12-07T09:11:41+00:00

Consistently schedule Sidekiq jobs

2017-12-05T10:59:39+00:00

Merge branch 'sh-optimize-groups-api' into 'master'

2017-12-04T15:45:43+00:00

Optimize API /groups/:id/projects by preloading assocations

Closes #40308

See merge request gitlab-org/gitlab-ce!15475

Added default order to UserFinder

2017-12-04T09:49:53+00:00