summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Collapse)AuthorAgeFilesLines
* Fix user membership destroy relationFrancisco Javier López2018-01-021-3/+3
|
* Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-191-0/+1
|
* Make sure user email is read only when synced with LDAPDouwe Maan2017-12-151-1/+1
|
* Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-111-4/+11
|\ | | | | | | | | Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821
| * Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| |
| * Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-081-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | (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 withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
|/ | | | 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"Mike Greiling2017-12-071-0/+29
|
* Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-051-0/+2
|
* Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-041-1/+5
|\ | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475
| * Comments from code review applied. Also switched forked_from_project and ↵Francisco Lopez2017-12-011-1/+5
| | | | | | | | ForkedProjectLinks to ForkNetworkMember
* | Added default order to UserFinderFrancisco Javier López2017-12-041-1/+5
|/
* Use fuzzy search with minimum length of 3 characters where appropriatedm-search-patternDouwe Maan2017-11-271-15/+9
|
* Use Gitlab::SQL::Pattern where appropriateDouwe Maan2017-11-241-1/+1
|
* Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-231-1/+1
|\ | | | | | | | | | | | | Fix link text from group context Closes gitlab-ee#4100 See merge request gitlab-org/gitlab-ce!15565
| * Fix link text from group contextJarka Kadlecova2017-11-231-1/+1
| |
* | Allow password authentication to be disabled entirelyMarkus Koller2017-11-231-4/+20
|/
* Skip confirmation user apiDaniel Juarez2017-11-211-0/+4
|
* Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-201-0/+2
|\ | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
| * Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+2
| | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* | Changing OAuth lookup to be case insensitiveFrancisco Javier López2017-11-171-2/+1
| |
* | Cache the number of user SSH keyscache-user-keys-countYorick Peterse2017-11-161-1/+8
|/ | | | | | | | | By caching the number of personal SSH keys we reduce the number of queries necessary on pages such as ProjectsController#show (which can end up querying this data multiple times). The cache is refreshed/flushed whenever an SSH key is added, removed, or when a user is removed.
* Include child projects a user can manage in namespace dropdownsBob Van Landuyt2017-11-141-1/+10
| | | | These dropdown options are used for creating and transfering projects.
* Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this MR there were two GitHub related importers: * Github::Import: the main importer used for GitHub projects * Gitlab::GithubImport: importer that's somewhat confusingly used for importing Gitea projects (apparently they have a compatible API) This MR renames the Gitea importer to Gitlab::LegacyGithubImport and introduces a new GitHub importer in the Gitlab::GithubImport namespace. This new GitHub importer uses Sidekiq for importing multiple resources in parallel, though it also has the ability to import data sequentially should this be necessary. The new code is spread across the following directories: * lib/gitlab/github_import: this directory contains most of the importer code such as the classes used for importing resources. * app/workers/gitlab/github_import: this directory contains the Sidekiq workers, most of which simply use the code from the directory above. * app/workers/concerns/gitlab/github_import: this directory provides a few modules that are included in every GitHub importer worker. == Stages The import work is divided into separate stages, with each stage importing a specific set of data. Stages will schedule the work that needs to be performed, followed by scheduling a job for the "AdvanceStageWorker" worker. This worker will periodically check if all work is completed and schedule the next stage if this is the case. If work is not yet completed this worker will reschedule itself. Using this approach we don't have to block threads by calling `sleep()`, as doing so for large projects could block the thread from doing any work for many hours. == Retrying Work Workers will reschedule themselves whenever necessary. For example, hitting the GitHub API's rate limit will result in jobs rescheduling themselves. These jobs are not processed until the rate limit has been reset. == User Lookups Part of the importing process involves looking up user details in the GitHub API so we can map them to GitLab users. The old importer used an in-memory cache, but this obviously doesn't work when the work is spread across different threads. The new importer uses a Redis cache and makes sure we only perform API/database calls if absolutely necessary. Frequently used keys are refreshed, and lookup misses are also cached; removing the need for performing API/database calls if we know we don't have the data we're looking for. == Performance & Models The new importer in various places uses raw INSERT statements (as generated by `Gitlab::Database.bulk_insert`) instead of using Rails models. This allows us to bypass any validations and callbacks, drastically reducing the number of SQL queries and Gitaly RPC calls necessary to import projects. To ensure the code produces valid data the corresponding tests check if the produced rows are valid according to the model validation rules.
* Refactor User.find_by_any_emailYorick Peterse2017-11-071-9/+9
| | | | | | By using SQL::Union we can return a proper ActiveRecord::Relation, making it possible to select the columns we're interested in (instead of all of them).
* Merge branch 'dm-block-group-and-project-creation-when-external-by-default' ↵Sean McGivern2017-11-061-3/+4
|\ | | | | | | | | | | | | | | | | into 'master' Make sure group and project creation is blocked for new users that are external by default Closes #39664 See merge request gitlab-org/gitlab-ce!15212
| * Make sure group and project creation is blocked for new users that are ↵Douwe Maan2017-11-061-3/+4
| | | | | | | | external by default
* | Reallow project paths ending in periodsdm-reallow-project-path-ending-in-periodDouwe Maan2017-11-061-1/+1
|/
* Add system hooks user_rename and group_renameWinnie Hellmann2017-11-031-0/+5
|
* Remove user authentication_token columnDouwe Maan2017-11-021-0/+1
|
* Remove User#private_tokenDouwe Maan2017-11-021-4/+1
|
* Fix specAnnabel Dunstone Gray2017-10-161-1/+0
|
* Add readme only option as project viewAnnabel Dunstone Gray2017-10-161-7/+3
|
* Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-071-0/+8
|\ | | | | | | | | | | | | Create idea of read-only database Closes #37534 See merge request gitlab-org/gitlab-ce!14688
| * Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534.
* | Find forks within users/namespaces using fork membershipsBob Van Landuyt2017-10-071-9/+1
| |
* | Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-0/+4
|/
* Merge branch 'master' into ↵Douwe Maan2017-10-051-6/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | digitalmoksha/gitlab-ce-feature/verify_secondary_emails # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb
| * Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-021-0/+6
| |\ | | | | | | | | | | | | Improved file logging for authentication events See merge request gitlab-org/gitlab-ce!9196
| | * Remove lock reason and add guard clauseBrian Neel2017-09-291-1/+1
| | |
| | * Merge conflict resolutionBrian Neel2017-09-271-6/+6
| | |
| | * # This is a combination of 1 commit.Brian Neel2017-09-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # This is the 1st commit message: Add logging for all web authentication events # This is the commit message #2: Re-add underscore to after_inactive_sign_up_path_for # This is the commit message #3: Standardize on username= # This is the commit message #4: after_filter -> after_action, _resource -> resource # This is the commit message #5: Add two-factor login failures and account lockouts # This is the commit message #6: Move logging from two-factor concern to user model # This is the commit message #7: Add spaces around default parameter assignments # This is the commit message #8: Move logs out of user model # This is the commit message #9: Replace filtered_params with user_params # This is the commit message #10: Standardize case # This is the commit message #1: Fixes for username and AppLogger.info
| * | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-021-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Attempt to link saml users to ldap by email Closes #33493 See merge request gitlab-org/gitlab-ce!14216
| | * | Refactors SAML identity creation in gl_user.Tiago Botelho2017-10-021-1/+5
| | |/
| * | Support custom attributes on usersMarkus Koller2017-09-281-0/+2
| | |
| * | refactor emails servicerefactor-servicesJames Lopez2017-09-281-2/+2
| | |
| * | refactor users update serviceJames Lopez2017-09-281-3/+3
| | |
| * | refactor services to match EE signatureJames Lopez2017-09-281-5/+5
| |/
* | spacing and small optimisationsAlexandra2017-10-011-7/+7
| |
* | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-241-1/+1
| | | | | | | | and rubocop fixes