summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-293-7/+10
|\ | | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885
| * Hide nested group UI/API support for MySQLYorick Peterse2017-05-171-1/+1
| | | | | | | | | | | | This hides/disables some UI elements and API parameters related to nested groups when MySQL is used, since nested groups are not supported for MySQL.
| * Use CTEs for nested groups and authorizationsYorick Peterse2017-05-172-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces the usage of Common Table Expressions (CTEs) to efficiently retrieve nested group hierarchies, without having to rely on the "routes" table (which is an _incredibly_ inefficient way of getting the data). This requires a patch to ActiveRecord (found in the added initializer) to work properly as ActiveRecord doesn't support WITH statements properly out of the box. Unfortunately MySQL provides no efficient way of getting nested groups. For example, the old routes setup could easily take 5-10 seconds depending on the amount of "routes" in a database. Providing vastly different logic for both MySQL and PostgreSQL will negatively impact the development process. Because of this the various nested groups related methods return empty relations when used in combination with MySQL. For project authorizations the logic is split up into two classes: * Gitlab::ProjectAuthorizations::WithNestedGroups * Gitlab::ProjectAuthorizations::WithoutNestedGroups Both classes get the fresh project authorizations (= as they should be in the "project_authorizations" table), including nested groups if PostgreSQL is used. The logic of these two classes is quite different apart from their public interface. This complicates development a bit, but unfortunately there is no way around this. This commit also introduces Gitlab::GroupHierarchy. This class can be used to get the ancestors and descendants of a base relation, or both by using a UNION. This in turn is used by methods such as: * Namespace#ancestors * Namespace#descendants * User#all_expanded_groups Again this class relies on CTEs and thus only works on PostgreSQL. The Namespace methods will return an empty relation when MySQL is used, while User#all_expanded_groups will return only the groups a user is a direct member of. Performance wise the impact is quite large. For example, on GitLab.com Namespace#descendants used to take around 580 ms to retrieve data for a particular user. Using CTEs we are able to reduce this down to roughly 1 millisecond, returning the exact same data. == On The Fly Refreshing Refreshing of authorizations on the fly (= when users.authorized_projects_populated was not set) is removed with this commit. This simplifies the code, and ensures any queries used for authorizations are not mutated because they are executed in a Rails scope (e.g. Project.visible_to_user). This commit includes a migration to schedule refreshing authorizations for all users, ensuring all of them have their authorizations in place. Said migration schedules users in batches of 5000, with 5 minutes between every batch to smear the load around a bit. == Spec Changes This commit also introduces some changes to various specs. For example, some specs for ProjectTeam assumed that creating a personal project would _not_ lead to the owner having access, which is incorrect. Because we also no longer refresh authorizations on the fly for new users some code had to be added to the "empty_project" factory. This chunk of code ensures that the owner's permissions are refreshed after creating the project, something that is normally done in Projects::CreateService.
* | Add per page to user autocomplete32977-user-autocomplete-per_page-does-not-workClement Ho2017-05-261-0/+14
| |
* | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-18/+24
|\ \ | | | | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
| * | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-18/+24
| | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
* | | use full caps RSS instead of rssAlexis Reigel2017-05-241-3/+3
| | |
* | | atom links with rss token instead of private tokenAlexis Reigel2017-05-241-0/+36
|/ /
* | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-241-1/+1
|\ \ | | | | | | | | | | | | Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
| * | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-232-24/+18
| | |
| * | Fix specsDouwe Maan2017-05-232-19/+25
| | |
* | | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-231-4/+3
|\ \ \ | | | | | | | | | | | | | | | | Add transient head_pipeline_of to pipeline factories See merge request !11566
| * | | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-221-4/+3
| | | |
* | | | Merge branch 'add-unicode-trace-feature-test' into 'master'Kamil Trzciński2017-05-231-42/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add feature test with unicode trace See merge request !10736
| * | | | Add feature test with unicode traceadd-unicode-trace-feature-testShinya Maeda2017-05-231-42/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 43e5bba774e9e383dd55c665e82f6fcfc4ebfc4f Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:28:44 2017 +0900 Add fix commit 09610eebdf22ad048812bb86022504b2ad917e19 Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:03:49 2017 +0900 Add trace test
* | | | | Merge branch 'zj-sort-env-folders' into 'master'Kamil Trzciński2017-05-231-7/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Sort environments folders when opening them Closes #30814 See merge request !11436
| * | | | Improve test wordingZ.J. van de Weg2017-05-231-7/+7
| | | | |
| * | | | Make sorting difference clearerZeger-Jan van de Weg2017-05-191-4/+4
| | | | |
| * | | | Sort environments folders when opening themZ.J. van de Weg2017-05-171-0/+5
| | |_|/ | |/| | | | | | | | | | Fixes gitlab-org/gitlab-ce#30814
* | | | Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-231-0/+44
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214
| * | | minor adjustments to the specsJose Ivan Vargas2017-05-221-10/+9
| | | |
| * | | Renamed some messages and refactored the project_edit class to a functionJose Ivan Vargas2017-05-221-1/+1
| | | |
| * | | Prevent project transfer if a new group is not selectedJose Ivan Vargas2017-05-221-0/+45
| | | |
* | | | Merge branch 'handle-transient-mr-query-count-spec' into 'master'Douwe Maan2017-05-221-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Handle transient MR query count spec See merge request !11571
| * | | Handle transient MR query count spechandle-transient-mr-query-count-specOswaldo Ferreira2017-05-191-1/+1
| | | |
* | | | Merge branch 'zj-pipeline-json-performance' into 'master'Kamil Trzciński2017-05-211-5/+33
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Improve pipeline size for query limit test Closes #31906 See merge request !11323
| * | | Improve pipeline size for query limit testzj-pipeline-json-performanceZ.J. van de Weg2017-05-171-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The pipeline was quite meagre in both stages and the number of groups. This has been improved. Performance is not yet optimal, but to limit this from sliding further this slippery slope, a hard limit has been set.
* | | | Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan2017-05-191-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bugfix: don't redirect to JSON endpoints after sign in See merge request !11561
| * | | | Bugfix: don't redirect to JSON endpoints after sign inRuben Davila2017-05-191-0/+26
| | |_|/ | |/| |
* | | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-191-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518
| * | | | Make sure fixture creation does not affect query count test32536-mr-widget-performance-improvementsOswaldo Ferreira2017-05-191-1/+4
| | | | |
| * | | | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-181-0/+9
| | |_|/ | |/| |
* | | | Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-195-307/+607
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix redirects modifying the host Closes #32506 See merge request !11498
| * | | Refactor to more robust implementationfix-issue-32506Michael Kozono2017-05-193-8/+238
| | | | | | | | | | | | | | | | | | | | | | | | In order to avoid string manipulation or modify route params (to make them unambiguous for `url_for`), we are accepting a behavior change: When being redirected to the canonical path for a group, if you requested a group show path starting with `/groups/…` then you’ll now be redirected to the group at root `/…`.
| * | | Fix ensure_canonical_path for top level routesMichael Kozono2017-05-183-312/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don’t replace a substring of the path if it is part of the top level route. E.g. When redirecting from `/groups/ups` to `/groups/foo`, be careful not to do `/grofoo/ups`. Projects are unaffected by this issue, but I am grouping the `#ensure_canonical_path` tests similar to the group and user tests.
| * | | Add test that fails without the fixMichael Kozono2017-05-181-0/+13
| |/ /
* | | Fixes the 500 for custom apearance header logo and logoAlexis Reigel2017-05-191-0/+40
|/ /
* | CodestyleGabriel Mazetto2017-05-131-1/+1
| |
* | Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-121-0/+28
| |
* | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-2/+8
|\ \ | | | | | | | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-121-21/+50
|\ \ \ | |_|/ |/| | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * | Respond with 404 when metrics are not enabled or deployment_metrics is not ↵Pawel Chojnacki2017-05-121-21/+50
| |/ | | | | | | implemented
* | Fix redirect message for groups and usersMichael Kozono2017-05-113-8/+20
|/
* Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵Robert Speicher2017-05-101-1/+1
|\ | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
| * Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-101-1/+1
| | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-101-0/+35
| | | | | | | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096
* | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-101-0/+28
| | | | | | | | | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094
* | Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-101-3/+3
|/ | | | | | Fix snippets visibility for show action - external users can not see internal snippets See merge request !2087
* Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-091-2/+6
|\ | | | | | | | | | | | | Preloads head pipeline for each merge request Closes #27168 See merge request !10064