delta/gitlab/gitlab-ce.git/app/models/user.rb, branch chatops-deploy-command

Merge branch 'remove-unnecessary-self-from-user-model' into 'master'

2016-11-21T10:56:29+00:00


Remove unnecessary self from user model

self keyword nod needed. Code is more clean and understandable. https://github.com/bbatsov/ruby-style-guide#no-self-unless-required

See merge request !7551

Remove unnecessary self from user model

2016-11-18T21:51:39+00:00

Merge branch 'feature/precalculate-authorized-projects' into 'master'

2016-11-18T19:42:17+00:00


Precalculate authorized projects in database

## What does this MR do?
It caches user's authorized projects in database instead of using multiple unions, which should simplify and speed-up things since this operation (getting authorized projects) is used a lot.

## Are there points in the code the reviewer needs to double check?
Did we miss a scenario where we need to refresh the list of projects?

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
#23150 

See merge request !6839

Precalculate user's authorized projects in database

2016-11-18T18:25:45+00:00

Closes #23150

Merge branch 'chat-name-authorize' into 'master'

2016-11-17T18:08:24+00:00


Allows to authorize chat user against GitLab.

This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438

See merge request !7450

Create relation between chat user and GitLab user and allow to authorize them [ci skip]

2016-11-16T12:42:35+00:00

fix "Without projects" filter

2016-11-16T09:49:45+00:00

Merge branch 'use-separate-token-for-incoming-email' into 'master'

2016-11-08T10:47:45+00:00


Use separate email-friendly token for incoming email

See merge request !5914

implements reset incoming email token on issues modal and account page,

2016-11-07T15:56:18+00:00

reactivates all tests and writes more tests for it

Use separate email-friendly token for incoming email and let incoming

2016-11-07T15:55:42+00:00

email token be reset