summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Bump devise to 4.6Utkarsh Gupta2019-05-211-9/+0
* Added user time settings fields to profileEzekiel Kigbo2019-05-071-0/+3
* Add improvements to the global search processFrancisco Javier López2019-05-071-2/+6
* Upgrade Rails to 5.1.6.1Jasper Maes2019-04-231-1/+1
* Externalize strings in app/modelsMartin Wortschack2019-04-121-6/+6
* Remove User#internal_attributes methodPeter Leitzen2019-04-121-7/+3
* Add part of needed codeGosia Ksionek2019-04-051-5/+35
* Add limit of 128 characters to users name57493-add-limit-to-user-nameBrandon Labuschagne2019-04-051-1/+1
* Merge branch 'ce-8317-operations-dashboard-usage-ping' into 'master'Douglas Barbosa Alexandre2019-04-021-0/+1
|\
| * Add with_dashboard scope to Userce-8317-operations-dashboard-usage-pingLogan King2019-03-221-0/+1
* | Inherit from ApplicationRecord instead of ActiveRecord::BaseNick Thomas2019-03-281-1/+1
|/
* Add highest_role method to UserThiago Presa2019-03-221-0/+4
* Merge branch 'fix/email_validator' into 'master'Stan Hu2019-03-091-3/+3
|\
| * Align EmailValidator to validate_email gem implementation.Horatiu Eugen Vlad2019-03-051-3/+3
* | Adds the Rubocop ReturnNil copAndrew Newdigate2019-03-061-1/+1
* | Make Admin::UsersController work with Ruby 2.6Stan Hu2019-02-191-1/+1
* | Merge branch 'import-go-to-project-cta-nibble-backend' into 'master'Lin Jen-Shin2019-02-151-0/+4
|\ \
| * | Improve the GitHub and Gitea import feature table interfaceLuke Bennett2019-02-131-0/+4
* | | Add a scope to preload emails on a userBob Van Landuyt2019-02-081-0/+1
|/ /
* | Add setting for first day of the weekFabian Schneider2019-02-061-0/+3
|/
* Add last activity to user administrationBrandon Labuschagne2019-02-051-0/+4
* Group Guests are no longer able to see merge requestsTiago Botelho2019-01-311-2/+6
* Merge branch 'ce-1979-2-1' into 'master'Sean McGivern2019-01-281-1/+1
|\
| * Add query method for id queryMark Chao2019-01-151-1/+1
* | Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-copRémy Coutable2019-01-241-1/+1
|/
* Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master'Mike Greiling2018-12-211-0/+4
|\
| * Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-191-0/+4
* | Rename GroupHierarchy into ObjectHierarchyJarka Košanová2018-12-191-3/+3
|/
* Add name, author and sha to releasesAlessio Caiazza2018-12-131-0/+1
* User#find_by_any_email to respect confirmed flag on secondary emailsImre Farkas2018-11-261-1/+1
* Match users better by their private commit emailNick Thomas2018-11-191-16/+33
* User can keep their commit email private43521-keep-personal-emails-privateTiago Botelho2018-11-071-2/+28
* Merge branch 'use_tokenauthenticatable_method_for_token_lookup' into 'master'Sean McGivern2018-11-051-6/+0
|\
| * Remove PersonalAccessTokensFinder#find_by methoduse_tokenauthenticatable_method_for_token_lookupImre Farkas2018-11-051-6/+0
* | Use a method for the has_many :keys in Projectuser-model-merge-conflictsYorick Peterse2018-11-011-1/+1
* | Move LDAP sync time constant to a methodYorick Peterse2018-11-011-1/+6
|/
* 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
|/
View Lorry Controller Status