summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Consistent diff and blob size limit namesDouwe Maan2017-05-2916-56/+42
|
* Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'Douwe Maan2017-05-293-44/+68
|\ | | | | | | | | | | | | Resolve "Wiki is not searchable with Guest permissions" Closes #30917 See merge request !11613
| * Create a separate helper to check if we show particular tab on a search page30917-wiki-is-not-searchable-with-guest-permissionsValery Sizov2017-05-293-21/+32
| |
| * Explicitly test that guest is able to search through the wikiValery Sizov2017-05-292-1/+7
| |
| * Fix: Wiki is not searchable with Guest permissionsValery Sizov2017-05-222-36/+43
| |
* | Merge branch 'sh-fix-submodules-trailing-spaces' into 'master'Robert Speicher2017-05-291-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Strip trailing whitespaces in submodule URLs Closes #33018 See merge request !11753
| * | Strip trailing whitespaces in submodule URLssh-fix-submodules-trailing-spacesStan Hu2017-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Users attempting to access repositories that had `.gitmodules` entries with trailing whitespaces would encounter an Error 500. This was due to a change in bf876ec7 that quietly removed the whitespace stripping. Closes #33018
* | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-299-157/+51
|\ \ \ | | | | | | | | | | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885
| * | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-174-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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-177-154/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 performance deltas between app deployments on Merge Request widgetKushal Pandya2017-05-292-11/+43
| | | |
* | | | Merge branch '32977-user-autocomplete-per_page-does-not-work' into 'master'Douwe Maan2017-05-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "User autocomplete per_page does not work" Closes #32977 See merge request !11742
| * | | | Add per page to user autocomplete32977-user-autocomplete-per_page-does-not-workClement Ho2017-05-261-1/+1
| | | | |
* | | | | Merge branch 'fix/cohorts-tab-nav' into 'master'Sean McGivern2017-05-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add missing cohorts to tab nav See merge request !11766
| * | | | | Add missing cohorts to tab navJames Lopez2017-05-291-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-up-notes-technical-debt' into 'master'Fatih Acet2017-05-291-108/+115
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Fix up some notes.js tech debt See merge request !11283
| * | | | Fix up some notes tech debtfix-up-notes-technical-debtEric Eastwood2017-05-261-108/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix up tech debt comments from @jschatz1 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757436 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757905 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757952 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28758013
* | | | | Fix: Milestone - Participants list is showing duplicate assigneesfix_duplicated_assignees_on_milestone_pageValery Sizov2017-05-291-1/+1
| | | | |
* | | | | Replace "build" with "job"Fabio Busatto2017-05-261-3/+3
| | | | | | | | | | | | | | | Close #32994
* | | | | Merge branch 'apply-same-responsive-notes-to-parallel-diff' into 'master'Annabel Dunstone Gray2017-05-264-33/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Apply responsive note styles to parallel diffs See merge request !11701
| * | | | | Apply responsive note styles to parallel diffsapply-same-responsive-notes-to-parallel-diffEric Eastwood2017-05-264-33/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inspired while working on https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
* | | | | | Enable DuplicateProperty scss-lintAnnabel Dunstone Gray2017-05-269-8/+2
| | | | | |
* | | | | | Merge branch ↵Fatih Acet2017-05-264-3/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558
| * | | | | Fallback to false when remove_source_branch is null.Bryce Johnson2017-05-251-1/+1
| | | | | |
| * | | | | Merge branch ↵Bryce Johnson2017-05-251-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' of gitlab.com:gitlab-org/gitlab-ce into 32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project
| | * | | | | Expose remove_source_branch boolean/nullOswaldo Ferreira2017-05-241-0/+1
| | | | | | |
| * | | | | | Update shouldRemoveSourceBranch against API entity changes.Bryce Johnson2017-05-251-3/+1
| |/ / / / /
| * | | | | Shush eslint.Bryce Johnson2017-05-221-1/+1
| | | | | |
| * | | | | Upgrade Remove Source Branch checkbox UX.Bryce Johnson2017-05-223-3/+19
| | | | | |
* | | | | | More consistent padding of notes, system notes, and note formDouwe Maan2017-05-268-54/+75
| |_|/ / / |/| | | |
* | | | | Creates CI Header component to use in pipelines and job details pagesFilipa Lacerda2017-05-263-0/+198
| | | | |
* | | | | Merge branch 'enable-final-newline' into 'master'Clement Ho2017-05-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable final newline See merge request !11723
| * | | | | Enable final newline ruleenable-final-newlineAnnabel Dunstone Gray2017-05-261-1/+1
| | | | | |
* | | | | | Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher2017-05-2620-74/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistently display last push event widget See merge request !11585
| * | | | | | Make section connect with window border without extra paddingDouwe Maan2017-05-259-29/+35
| | | | | | |
| * | | | | | Kill copy button with 🔥Douwe Maan2017-05-251-4/+2
| | | | | | |
| * | | | | | Consistently display last push event widgetDouwe Maan2017-05-2518-56/+41
| | | | | | |
* | | | | | | Merge branch 'fix_counter_cache_invalidation' into 'master'Douwe Maan2017-05-266-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix counter cache invalidation Closes #32854 and #32870 See merge request !11736
| * | | | | | | Fix counters cache invalidation for Issues and Merge RequestsValery Sizov2017-05-265-0/+5
| | | | | | | |
| * | | | | | | Set "expire_in" for counters cacheValery Sizov2017-05-261-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issuable-form-create-label-sub-groups' into 'master'Filipa Lacerda2017-05-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed create new label form in issue form not working for sub-group projects Closes #32906 See merge request !11703
| * | | | | | | Fixed create new label form in issue form not working for sub-group projectsissuable-form-create-label-sub-groupsPhil Hughes2017-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32906
* | | | | | | | Merge branch '31448-jira-urls' into 'master'Grzegorz Bizon2017-05-261-12/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API URL to JIRA settings Closes #31448 See merge request !11707
| * | | | | | | | Add API URL to JIRA settings31448-jira-urlsJarka Kadlecova2017-05-261-12/+25
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into ↵Clement Ho2017-05-261-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error thrown with missing note fragment in DOM Closes #32888 See merge request !11700
| * | | | | | | Fix error thrown with missing note fragment in DOM32888-fix-error-after-missing-note-hash-fragment-in-domEric Eastwood2017-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32888 Reproduction: 1. Visit /namespace/project/merge_requests/x/diffs#note_1234 1. When `#note_1234` isn't in the diff, an error is thrown
* | | | | | | | Set emoji-menu z-index to 200Luke "Jared" Bennett2017-05-261-1/+1
| | | | | | | |
* | | | | | | | Resolve "Resolved discussions icon is misaligned"Luke "Jared" Bennett2017-05-261-1/+9
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-2527-229/+177
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Clean up diff rendering See merge request !11390
| * | | | | | Address feedbackDouwe Maan2017-05-251-4/+2
| | | | | | |