summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-291-1/+1
|\
| * Replace deprecated uniq on a Relation with distinctJasper Maes2018-10-261-1/+1
* | Merge branch 'fix_pat_auth-11-4' into 'security-11-4'Robert Speicher2018-10-291-1/+1
* | [master] Persist only SHA digest of PersonalAccessToken#tokenImre Farkas2018-10-291-10/+1
|/
* Resolve "Filter discussion (tab) by comments or activity in issues and merge ...Oswaldo Ferreira2018-10-231-0/+8
* Make getting a user by the username case insensitiveWilliam George2018-10-181-1/+1
* Backport CE changes for Ops Dashboard in EEPeter Leitzen2018-10-121-1/+1
* Clean up ActiveRecord code in TodoServiceYorick Peterse2018-10-081-0/+5
* Applies the CE backport of EE#657Tiago Botelho2018-09-241-4/+6
* Merge branch '45754-open-issues-from-archived-project-listed-in-group-issue-b...Douwe Maan2018-09-181-2/+2
|\
| * Filter out archived projects from issue/mr countBrett Walker2018-09-171-2/+2
* | Merge branch 'sh-fix-commit-email-migration' into 'master'Nick Thomas2018-09-181-1/+1
|\ \
| * | Return a default commit email if migration has not completedStan Hu2018-09-151-1/+1
| |/
* | Added FromUnion to easily select from a UNIONYorick Peterse2018-09-171-26/+23
|/
* Resolve "Add functionality to change what email address online actions commit...Nick Thomas2018-09-141-1/+38
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-2/+22
* Ask user explicitly about usage stats agreementJan Provaznik2018-09-071-0/+22
* Port changes for CODEOWNERS to CEBob Van Landuyt2018-09-061-2/+3
* Fix SQL error when sorting 2FA-enabled users by name in admin areaDmitriy Zaporozhets2018-08-211-6/+9
* Refactor AutocompleteControllerdefine-abstraction-levelsYorick Peterse2018-08-201-1/+44
* Whitelist existing destroy_all offensesblacklist-destroy-allYorick Peterse2018-08-161-1/+1
* Optimize querying User#manageable_groupsImre Farkas2018-08-061-14/+5
* Resolve "Remove ghost notification settings for groups and projects"🙈 jacopo beschi 🙉2018-08-021-1/+1
* Merge branch 'frozen-string-enable-app-models' into 'master'Rémy Coutable2018-08-021-0/+2
|\
| * Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-modelsgfyoung2018-07-261-0/+2
* | Merge branch 'bvl-user-status-message-35463' into 'master'Rémy Coutable2018-08-011-0/+2
|\ \
| * | Allow users to set a statusBob Van Landuyt2018-07-301-0/+2
| |/
* | Add support for searching users by confirmed e-mailsStan Hu2018-07-281-3/+7
|/
* Remove duplicated include IgnorableColumnLin Jen-Shin2018-07-191-1/+0
* Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-111-9/+13
* Resolve Naming/UncommunicativeMethodLin Jen-Shin2018-07-091-2/+2
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-2/+2
* Merge branch 'remove-is-shared-from-ci-runners' into 'master'Grzegorz Bizon2018-07-041-1/+1
|\
| * Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runnersKamil Trzciński2018-06-261-1/+1
* | Improve performance of User.without_projects scopeDouwe Maan2018-07-021-1/+1
|/
* Fix some N+1s when calculating notification recipientsSean McGivern2018-06-071-1/+4
* Export assigned issues in iCalendar feedImre Farkas2018-05-311-4/+4
* Merge branch '22846-notifications-broken-during-email-address-change-before-e...Douwe Maan2018-05-221-8/+19
|\
| * Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmedRémy Coutable2018-05-221-8/+19
* | Add NOT NULL constraints to project_authorizations.Andreas Brandl2018-05-211-1/+1
|/
* Resolve "Opening Project with invite but without accepting leads to 404 error...🙈 jacopo beschi 🙉2018-05-171-0/+10
* Merge branch 'jprovazn-remote-upload-destroy' into 'master'Kamil Trzciński2018-05-161-1/+1
|\
| * Changed order of includeJan Provaznik2018-05-161-1/+1
| * Delete remote uploadsJan Provaznik2018-05-161-1/+1
* | Rename User#ci_authorized_runners -> ci_owned_runnersDylan Griffith2018-05-161-2/+2
* | Allow group runners to be viewed/edited in APIDylan Griffith2018-05-161-2/+14
|/
* Does not log failed sign-in attempts when database is in read-only modeDouglas Barbosa Alexandre2018-05-141-0/+3
* Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-111-0/+5
|\
| * Block access to API & git when terms are enforcedBob Van Landuyt2018-05-101-0/+5
* | Add 2FA filter to group members pageDmitriy Zaporozhets2018-05-101-3/+7
|/