summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/g...Dmitriy Zaporozhets2015-10-051-0/+4
|\
| * improved code style and layout option namingPeter Göbel2015-10-051-1/+1
| * added user preference to change layout widthPeter Göbel2015-10-051-0/+4
* | Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-051-0/+1
|/
* Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-031-0/+4
|\
| * Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-021-0/+4
| |\
| | * Add User#recently_sent_password_reset?Robert Speicher2015-10-011-0/+4
* | | Fix rubocop warnings in appGuilherme Garnier2015-10-031-7/+1
|/ /
* | Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reportedRémy Coutable2015-09-291-2/+1
* | Disable the "Report abuse" button if a user has already been reportedRémy Coutable2015-09-291-0/+2
|/
* Add user preference to view project activity and starred project activity as ...Stan Hu2015-09-261-1/+1
* Fix: features/ci/runners_spec.rbKamil Trzcinski2015-09-151-0/+9
* Re-annotate modelsStan Hu2015-09-061-56/+52
* Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-291-4/+0
|\
| * Make all profile publicmake_all_profile_publicValery Sizov2015-08-271-4/+0
* | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-1/+1
|/
* Only show recent push event if the branch still exists or a recent merge requ...Stan Hu2015-08-201-2/+13
* Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-041-1/+1
* Re-annotate modelsAtsushi Ishida2015-08-031-0/+1
* Add User.find_by_username!rs-issue-2012Robert Speicher2015-07-231-0/+4
* Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-131-0/+4
* Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-101-0/+10
* Merge branch 'rs-issue-1850' into 'master'Douwe Maan2015-06-241-8/+4
|\
| * Only look up Commit authors/committers by emailrs-issue-1850Robert Speicher2015-06-231-8/+4
* | Allow user to remove public email addressrs-dev-issue-2419Robert Speicher2015-06-231-1/+3
|/
* Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets2015-06-231-18/+16
|\
| * Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414Robert Speicher2015-06-221-14/+3
| * Make default value for otp_required_for_login false instead of nullRobert Speicher2015-06-201-4/+4
| * Allow Admin to filter users by 2FA statusRobert Speicher2015-06-191-4/+13
* | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-221-4/+20
|\ \ | |/ |/|
| * Spec and refactor User.find_for_commitRobert Speicher2015-06-171-4/+20
* | Add convenience methods to User for getting and setting 2FA statusRobert Speicher2015-06-191-0/+12
* | Move the User dashboard enum further up in the classRobert Speicher2015-06-191-4/+3
|/
* Fix duplicate 'Email has already been taken' message when creating a user, up...swellard2015-06-161-1/+1
* Fix duplicate 'Email has already been taken' message when creating a userswellard2015-06-161-1/+3
* Add `dashboard` attribute to User modelRobert Speicher2015-06-131-1/+6
* An `in_namespace` scope is already presentzenati2015-06-091-3/+5
* Merge branch 'make-namespaces-api-available-to-all-users' into 'master'Dmitriy Zaporozhets2015-06-041-0/+6
|\
| * Make namespace API available to all usersStan Hu2015-05-281-0/+6
* | Merge pull request #9318 from jvanbaarsen/allow-special-chars-bioDmitriy Zaporozhets2015-05-291-1/+1
|\ \
| * | Allow special characters in users bioJeroen van Baarsen2015-05-281-1/+1
| |/
* | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-281-0/+4
|/
* Add `reference_pattern` to Referable modelsRobert Speicher2015-05-261-0/+8
* Add `to_reference` for models that support referencesRobert Speicher2015-05-261-3/+13
* Merge branch 'fix-avatar-removal' into 'master'Hannes Rosenögger2015-05-121-2/+2
|\
| * Fix bug where avatar filenames were not actually deleted from the database du...Stan Hu2015-05-071-2/+2
* | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-121-2/+13
|\ \
| * | Remove extra `devise` call that got added by accidentRobert Speicher2015-05-101-3/+0
| * | Remove unnecessary User#login accessor overrideRobert Speicher2015-05-091-5/+0
| * | Generate 10 2FA backup codes instead of the default of 5Robert Speicher2015-05-091-1/+1
View Lorry Controller Status