summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adds backoff algo from EE to CEbackoff-algo-backport-eeFilipa Lacerda2017-02-241-0/+52
|
* Merge branch '12726-preserve-issues-after-deleting-users' into 'master' Douwe Maan2017-02-2418-18/+320
|\ | | | | | | | | | | | | Deleting a user shouldn't delete associated issues. Closes #12726 See merge request !7393
| * Fix specs for the ghost user feature.12726-preserve-issues-after-deleting-usersTimothy Andrew2017-02-242-3/+5
| |
| * Don't allow deleting a ghost user.Timothy Andrew2017-02-248-5/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a `destroy_user` ability. This didn't exist before, and was implicit in other abilities (only admins could access the admin area, so only they could destroy all users; a user can only access their own account page, and so can destroy only themselves). - Grant this ability to admins, and when the current user is trying to destroy themselves. Disallow destroying ghost users in all cases. - Modify the `Users::DestroyService` to check this ability. Also check it in views to decide whether or not to show the "Delete User" button. - Add a short summary of the Ghost User to the bio.
| * Implement final review comments from @DouweM and @rymaiTimothy Andrew2017-02-246-61/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Have `Uniquify` take a block instead of a Proc/function. This is more idiomatic than passing around a function in Ruby. - Block a user before moving their issues to the ghost user. This avoids a data race where an issue is created after the issues are migrated to the ghost user, and before the destroy takes place. - No need to migrate issues (to the ghost user) in a transaction, because we're using `update_all` - Other minor changes
| * Remove the default value for the `users.ghost` database column.Timothy Andrew2017-02-242-7/+3
| | | | | | | | | | The default (false) is not strictly required, and this lets us avoid a potentially expensive migration
| * Implement review comments from @rymai and @yorickpeterseTimothy Andrew2017-02-244-81/+61
| | | | | | | | | | | | | | 1. Refactoring and specs in the `Uniquify` class. 2. Don't use the `AdvisoryLocking` class. Similar functionality is provided (backed by Redis) in the `ExclusiveLease` class.
| * Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-246-6/+44
| | | | | | | | | | | | Rather than using a separate `ghost` state. This lets us have the benefits of both ghost and blocked users (ghost: true, state: blocked) without having to rewrite a number of queries to include cases for `state: ghost`.
| * Implement review comments from @DouweM and @nick.thomas.Timothy Andrew2017-02-243-2/+85
| | | | | | | | | | | | | | | | 1. Use an advisory lock to guarantee the absence of concurrency in `User.ghost`, to prevent data races from creating more than one ghost, or preventing the creation of ghost users by causing validation errors. 2. Use `update_all` instead of updating issues one-by-one.
| * Extract code from `Namespace#clean_path` for ghost user generation.Timothy Andrew2017-02-244-24/+42
| | | | | | | | | | | | | | | | | | | | 1. Create a `Uniquify` class, which generalizes the process of generating unique strings, by accepting a function that defines what "uniqueness" means in a given context. 2. WIP: Make sure tests for `Namespace` pass, add more if necessary. 3. WIP: Add tests for `Uniquify`
| * Deleting a user shouldn't delete associated issues.Timothy Andrew2017-02-245-4/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "Associated" issues are issues the user has created + issues that the user is assigned to. - Issues that a user owns are transferred to a "Ghost User" (just a regular user with `state = 'ghost'` that is created when `User.ghost` is called). - Issues that a user is assigned to are moved to the "Unassigned" state. - Fix a spec failure in `profile_spec` — a spec was asserting that when a user is deleted, `User.count` decreases by 1. After this change, deleting a user creates (potentially) a ghost user, causing `User.count` not to change. The spec has been updated to look for the relevant user in the assertion.
| * Don't send notifications to ghost users.Timothy Andrew2017-02-241-0/+1
| | | | | | | | | | We already skip sending notifications to blocked users. Simply add ghost users to this list.
| * Add CE CHANGELOG for #12726.Timothy Andrew2017-02-241-0/+4
| |
* | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-2469-350/+344
|\ \ | | | | | | | | | | | | Use Namespace#full_path instead of #path where appropriate See merge request !9495
| * | Fix specDouwe Maan2017-02-242-4/+3
| | |
| * | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-2368-349/+344
| | |
* | | Merge branch 'api-simplify-variables-validation' into 'master' Rémy Coutable2017-02-241-8/+3
|\ \ \ | | | | | | | | | | | | | | | | Simplify variables validation in triggers API See merge request !9506
| * | | Simplyfy variables validation in triggers APIapi-simplify-variables-validationRobert Schilling2017-02-241-8/+3
| | | |
* | | | Merge branch 'issue-28619' into 'master' Rémy Coutable2017-02-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use correct GitLab Prometheus exporter name in docs Closes #28619 See merge request !9503
| * | | | Use correct GitLab Prometheus exporter name in docsLukas Raska2017-02-241-1/+1
| |/ / /
* | | | Merge branch 'patch-1' into 'master' Rémy Coutable2017-02-241-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added application password instructions for Gmail/G suite accounts See merge request !9486
| * | | | Added application password instructions for Gmail/G suite accounts Raphaël Doursenaud2017-02-231-1/+3
| | | | | | | | | | | | | | | with 2-step verification.
* | | | | Merge branch 'docs/fix-broken-ci-links' into 'master' Achilleas Pipinellis2017-02-241-4/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix broken links in CI admin area docs See merge request !9507
| * | | | | Fix broken links in CI admin area docsdocs/fix-broken-ci-linksAchilleas Pipinellis2017-02-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-02-241-10/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify Pages custom domain details Closes #28577 See merge request !9457
| * | | | | | clarify custom domain detailsBen Bodenmiller2017-02-221-10/+13
| | | | | | |
* | | | | | | Merge branch 'api-remove-owned-groups' into 'master' Sean McGivern2017-02-248-40/+87
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api remove owned groups Closes #27937 See merge request !9505
| * \ \ \ \ \ \ Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groupsSean McGivern2017-02-2431-36/+268
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * | | | | | | Update documentationRobert Schilling2017-02-243-14/+6
| | | | | | | |
| * | | | | | | Backport groups API to V3Robert Schilling2017-02-243-0/+74
| | | | | | | |
| * | | | | | | API: Use parameter to get owned groups instead of dedicated endpointRobert Schilling2017-02-242-24/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issue-28653-2' into 'master' Douwe Maan2017-02-241-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use persistent name identifier instead of transient in SAML2 documentation Closes #28653 See merge request !9504
| * | | | | | Use persistent name identifier instead of transient in SAML2 documentationLukas Raska2017-02-241-5/+5
| |/ / / / /
* | | | | | Merge branch '3874-correctly-return-json-on-delete-responses' into 'master' Sean McGivern2017-02-249-5/+51
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return 202 with JSON body on async removals on V4 API Closes #3874 See merge request !9449
| * | | | | Return 202 with JSON body on async removals on V4 API3874-correctly-return-json-on-delete-responsesOswaldo2017-02-239-5/+51
| | | | | |
* | | | | | Merge branch '27762-add-default-artifacts-expiration' into 'master' Kamil Trzciński2017-02-2418-16/+178
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Artifact Expiration Defaults Closes #27762 See merge request !9219
| * | | | | | Introduce DurationValidator, feedback:27762-add-default-artifacts-expirationLin Jen-Shin2017-02-242-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_24032923
| * | | | | | Test against default to '0', it should not setLin Jen-Shin2017-02-241-8/+22
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-24809-3927/+8396
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27762-add-default-artifacts-expiration * upstream/master: (247 commits) Switched CONTRIBUTING.md style guide recommendation for method chaining Fix new offenses Stylistic tweaks Fix OAuth/SAML user blocking behavior Revert "Enable Style/DotPosition" Revert "Prefer leading style for Style/DotPosition" Revert "Enable Style/BarePercentLiterals" Manually correct autocorrect Move up delegate calls Exclude migrations from Style/MutableConstant ActiveSupport delegation is preferred over Forwardable Update haml_lint to work with newest rubocop Add explanations to cops Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Order cops alphabetically Don’t exclude some file in lib from rubocop Fix new offenses Enable Rails/Delegate Enable Style/WordArray ...
| * | | | | | Remove syntax help link and update screenshotLin Jen-Shin2017-02-222-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23943262
| * | | | | | Fix tests due to error key changedLin Jen-Shin2017-02-212-2/+2
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-2152-234/+681
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27762-add-default-artifacts-expiration * upstream/master: (26 commits) Allow searching issues for strings containing colons Fix Spinach failure [ci skip] UX Guide: Add personas Reuse User#find_by_any_email on UserFormatter#find_by_email Use leading periods on UserFormatter#find_by_external_uid Add CHANGELOG entry Add a simple cache for Gitlab::GithubImport::Client#user GitHub Importer - Find users based on their email address Don't use potentially slow ForkService in spec Added support for Authentiq Back-Channel Logout Added documentation for permalinks to most recent build artifacts Unify issues search behavior by always filtering when ALL labels matches Update GitLab Pages to v0.3.1 Document Timecop usage for time-sensitive tests Add process for requesting approval for licenses Rename karma job to rake karma Update positioning of nav scroll arrows Fix issue where files on a fork could not be edited Move tanuki to left of title; increase max-width of title Refactor project stats & last_commit CSS; left align main nav items ...
| * | | | | | | Update doc according to the new syntaxLin Jen-Shin2017-02-211-1/+1
| | | | | | | |
| * | | | | | | Add screenshot for default artifacts expiration,Lin Jen-Shin2017-02-212-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and update screenshot for maximum artifacts size.
| * | | | | | | Update error message and check with presence: trueLin Jen-Shin2017-02-211-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23762243 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23762268
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-21542-4164/+6509
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27762-add-default-artifacts-expiration * upstream/master: (234 commits) Improve performance of User Agent Detail Fix some grammar in the API docs Remove shared example for pagination API: Use POST to (un)block a user API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Use grape validation for dates Change wording for LDAP doc that was moved to a new location API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable` Download snippets with LF line-endings by default utilize pre-minified Vue in production since no CJS distribution is available Prevent project team from being truncated too early during project destruction loading icon sometimes toggled alongside MR pipeline contents fix failed spec because haml_lint fix incorrect sidekiq concurrency count in admin background page exclude rpc_pipefs from system disc info Fix wrong line ending [ci-skip] fix overlooked window binding in spec files remove imports loader replace implicit this == window with explicit binding Todo done clicking is kind of unusable. ...
| * | | | | | | | 0 for unlimited, disallow blank, feedback:Lin Jen-Shin2017-02-168-35/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23520780
| * | | | | | | | The exception was no longer usedLin Jen-Shin2017-02-161-1/+1
| | | | | | | | |
| * | | | | | | | Wordings change, feedback:Lin Jen-Shin2017-02-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23437712
| * | | | | | | | Use squish to also compact the stringLin Jen-Shin2017-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23436980
View Lorry Controller Status