summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* More GitLab spellings. No dedicated CI in omnibus [ci skip]update-docsRobert Schilling2015-11-194-9/+7
|
* Merge branch 'update-gitlab-shell-doc' into 'master' Robert Speicher2015-11-192-2/+2
|\ | | | | | | | | | | | | Update gitlab-shell documentation to 2.6.7 See merge request !1836
| * Update gitlab-shell documentation [ci skip]Robert Schilling2015-11-192-2/+2
| |
* | Merge branch 'client-max-body-size' into 'master' Robert Speicher2015-11-192-6/+2
|\ \ | | | | | | | | | | | | | | | | | | Do not limit workhorse POST/PUT size in NGINX Limiting, if any, should happen in gitlab-workhorse. See merge request !1831
| * | Do not limit workhorse POST/PUT size in NGINXJacob Vosmaer2015-11-192-6/+2
| | | | | | | | | | | | Limiting, if any, should happen in gitlab-workhorse.
* | | Merge branch 'lfs-client-doc' into 'master' Job van der Voort2015-11-191-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add link to git-lfs client [ci skip] See merge request !1832
| * | Add link to git-lfs client [ci skip]Robert Schilling2015-11-191-1/+1
|/ /
* | Merge branch 'builds_page_scroll_buttons' into 'master' Dmitriy Zaporozhets2015-11-191-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bottom position of scroll buttons in build log page Look at the up/down buttons as well as the **Enable Autoscroll**. The **Enable Autoscroll** could also be alligned with the right grey box. ## Before ![autoscroll_before](/uploads/f410dc353ca66c338d8a29c7c294758a/autoscroll_before.png) ## After ![autoscroll_after](/uploads/015fdf53618a0d6f468d666de1bbab6a/autoscroll_after.png) \cc @dzaporozhets @creamzy See merge request !1792
| * | Fix bottom position of scroll buttons in build log pageAchilleas Pipinellis2015-11-101-2/+2
| | |
* | | Merge branch 'update_nginx_deploy' into 'master' Dmitriy Zaporozhets2015-11-192-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy page should be shown for all pages not just root Related to change already merged to Omnibus - gitlab-org/omnibus-gitlab!540 This change makes it so the deploy page is shown on all GitLab pages if the page exists. Users will no longer receive the 502 when deploys are happening. See merge request !1828
| * | | Deploy page should be shown for all pages not just rootDrew Blessing2015-11-182-2/+2
| | |/ | |/|
* | | Merge branch 'atom-feed-latest-update' into 'master' Yorick Peterse2015-11-1931-215/+700
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of user profiles, finding groups, and finding projects This MR improves the following: * Rendering of profile pages and Atom feeds * Finding groups (using GroupsFinder & friends) * Finding projects (using ProjectsFinder & friends) Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems. See merge request !1790
| * | | Changelog entries for atom/profile improvementsYorick Peterse2015-11-191-0/+2
| | | |
| * | | Use "GitLab.com" instead of "gitlab.com"atom-feed-latest-updateYorick Peterse2015-11-181-1/+1
| | | |
| * | | Added an index on namespaces.publicYorick Peterse2015-11-182-1/+7
| | | |
| * | | Return internal projects in PersonalProjectsFinderYorick Peterse2015-11-181-1/+5
| | | | | | | | | | | | | | | | | | | | When getting the projects of a user we should get the public _and_ internal projects, not just the public ones.
| * | | Fix UNION syntax for MySQLYorick Peterse2015-11-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently MySQL doesn't support this syntax: (...) UNION (...) instead it only supports: ... UNION ...
| * | | Align hash literals to keep Rubocop happyYorick Peterse2015-11-182-4/+4
| | | |
| * | | Don't pluck project IDs in User#owned_projectsYorick Peterse2015-11-181-4/+2
| | | | | | | | | | | | | | | | This won't work efficiently if you happen to have a lot of projects.
| * | | Apply CI scope changes to the User modelYorick Peterse2015-11-181-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | These changes are based on those from commit 03f5ff750b107b30a6d306aafb6699a9c9ecff0d, except they use a UNION instead of plucking IDs into memory.
| * | | Refactor UsersController to not kill the databaseYorick Peterse2015-11-182-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this controller would in multiple places load tons (read: around 65000) project and/or group IDs into memory. These changes in combination with the previous commits significantly cut down loading times of user profile pages and the Atom feeds of users.
| * | | Refactor User#authorized_groups/projectsYorick Peterse2015-11-182-51/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods no longer include public groups/projects (that don't belong to the actual user) as this is handled by the various finder classes now. This also removes the need for passing extra arguments. Note that memoizing was removed _explicitly_. For whatever reason doing so messes up the users controller to a point where it claims a certain user does _not_ have access to certain groups/projects when it does have access. Existing code shouldn't be affected as these methods are only called in ways that they'd run queries anyway (e.g. a combination of "any?" and "each" which would run 2 queries regardless of memoizing).
| * | | Added Project.visible_to_userYorick Peterse2015-11-182-0/+23
| | | | | | | | | | | | | | | | | | | | This method can be used to filter projects to those visible to a given user.
| * | | Group methods for filtering public/visible groupsYorick Peterse2015-11-182-0/+35
| | | | | | | | | | | | | | | | | | | | These methods will be used to get a list of groups, optionally restricted to only those visible to a given user.
| * | | Added Event.limit_recentYorick Peterse2015-11-182-0/+21
| | | | | | | | | | | | | | | | | | | | This will be used to move some querying logic from the users controller to the Event model (where it belongs).
| * | | Refactor ProjectsFinder to not pluck IDsYorick Peterse2015-11-186-102/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class now uses a UNION (when needed) instead of plucking tens of thousands of project IDs into memory. The tests have also been re-written to ensure all different use cases are tested properly (assuming I didn't forget any cases). The finder has also been broken up into 3 different finder classes: * ContributedProjectsFinder: class for getting the projects a user contributed to. * PersonalProjectsFinder: class for getting the personal projects of a user. * ProjectsFinder: class for getting generic projects visible to a given user. Previously a lot of the logic of these finders was handled directly in the users controller.
| * | | Refactoed GroupsFinder into two separate classesYorick Peterse2015-11-184-41/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the previous setup the GroupsFinder class had two distinct tasks: 1. Finding the projects user A could see 2. Finding the projects of user A that user B could see Task two was actually handled outside of the GroupsFinder (in the UsersController) by restricting the returned list of groups to those the viewed user was a member of. Moving all this logic into a single finder proved to be far too complex and confusing, hence there are now two finders: * GroupsFinder: for finding groups a user can see * JoinedGroupsFinder: for finding groups that user A is a member of, restricted to either public groups or groups user B can also see.
| * | | Renamed GroupsFinder spec file so the name matchesYorick Peterse2015-11-181-0/+0
| | | |
| * | | Refactor getting user groups/projects/contributionsYorick Peterse2015-11-182-20/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new setup no longer loads any IDs into memory using "pluck", instead using SQL UNIONs to merge the various datasets together. This results in greatly improved query performance as well as a reduction of memory usage. The old setup was in particular problematic when requesting the authorized projects _including_ public/internal projects as this would result in roughly 65000 project IDs being loaded into memory. These IDs would in turn be passed to other queries.
| * | | Prefix table names for User UNIONsYorick Peterse2015-11-181-2/+3
| | | |
| * | | Use SQL::Union for User#authorized_groupsYorick Peterse2015-11-181-4/+7
| | | | | | | | | | | | | | | | This removes the need for plucking any IDs into Ruby.
| * | | Make it easier to re-apply default sort ordersYorick Peterse2015-11-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | By moving the default sort order into a separate scope (and calling this from the default scope) we can more easily re-apply a default order without having to specify the exact column/ordering all over the place.
| * | | Use SQL::Union for User#authorized_projectsYorick Peterse2015-11-181-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | This allows retrieving of the list of authorized projects using a single query, without having to load any IDs into Ruby. This in turn also means we can remove the method User#authorized_projects_id.
| * | | Added Gitlab::SQL::Union classYorick Peterse2015-11-182-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This class can be used to join multiple AcitveRecord::Relation objects together using a SQL UNION statement. ActiveRecord < 5.0 sadly doesn't support UNION and existing Gems out there don't handle prepared statements (e.g. they never incremented the variable bindings).
| * | | Faster way of obtaining latest event update timeYorick Peterse2015-11-186-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using MAX(events.updated_at) we can simply sort the events in descending order by the "id" column and grab the first row. In other words, instead of this: SELECT max(events.updated_at) AS max_id FROM events LEFT OUTER JOIN projects ON projects.id = events.project_id LEFT OUTER JOIN namespaces ON namespaces.id = projects.namespace_id WHERE events.author_id IS NOT NULL AND events.project_id IN (13083); we can use this: SELECT events.updated_at AS max_id FROM events LEFT OUTER JOIN projects ON projects.id = events.project_id LEFT OUTER JOIN namespaces ON namespaces.id = projects.namespace_id WHERE events.author_id IS NOT NULL AND events.project_id IN (13083) ORDER BY events.id DESC LIMIT 1; This has the benefit that on PostgreSQL a backwards index scan can be used, which due to the "LIMIT 1" will at most process only a single row. This in turn greatly speeds up the process of grabbing the latest update time. This can be confirmed by looking at the query plans. The first query produces the following plan: Aggregate (cost=43779.84..43779.85 rows=1 width=12) (actual time=2142.462..2142.462 rows=1 loops=1) -> Index Scan using index_events_on_project_id on events (cost=0.43..43704.69 rows=30060 width=12) (actual time=0.033..2138.086 rows=32769 loops=1) Index Cond: (project_id = 13083) Filter: (author_id IS NOT NULL) Planning time: 1.248 ms Execution time: 2142.548 ms The second query in turn produces the following plan: Limit (cost=0.43..41.65 rows=1 width=16) (actual time=1.394..1.394 rows=1 loops=1) -> Index Scan Backward using events_pkey on events (cost=0.43..1238907.96 rows=30060 width=16) (actual time=1.394..1.394 rows=1 loops=1) Filter: ((author_id IS NOT NULL) AND (project_id = 13083)) Rows Removed by Filter: 2104 Planning time: 0.166 ms Execution time: 1.408 ms According to the above plans the 2nd query is around 1500 times faster. However, re-running the first query produces timings of around 80 ms, making the 2nd query "only" around 55 times faster.
* | | | Merge branch 'check_if_it_should_be_archived_in_backup' into 'master' Dmitriy Zaporozhets2015-11-192-9/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check which folders and archives should be packed before passing to tar command. If user uses backup task with SKIP and skips one of the archives listed(uploads, builds, artifacts) backup create will give an error: `Cannot stat: No such file or directory`. This MR fixes that by checking for skipped items. Additionally, compact everything to avoid `TypeError: no implicit conversion of nil into String` errors. See merge request !1824
| * | | | USe reject.check_if_it_should_be_archived_in_backupMarin Jankovski2015-11-181-1/+1
| | | | |
| * | | | Specs that failed before the fix.Marin Jankovski2015-11-181-1/+2
| | | | |
| * | | | Check which folders and archives should be packed before passing to tar command.Marin Jankovski2015-11-181-8/+6
| | | | |
* | | | | Fix CHANGELOGKamil Trzcinski2015-11-191-1/+3
| |_|/ / |/| | |
* | | | Merge branch 'fix-diff-stats-ui' into 'master' v8.5.1.RD2v8.5.1.RD1Dmitriy Zaporozhets2015-11-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix huge line height for diff files list Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1826
| * | | | Fix huge line height for diff files listDmitriy Zaporozhets2015-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'ce-mirror-backport' into 'master' Douwe Maan2015-11-1826-145/+176
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport relevant changes from gitlab-org/gitlab-ee!51 To do: - [x] Update gitlab-shell See merge request !1822
| * | | | Use gitlab-shell 2.6.7ce-mirror-backportDouwe Maan2015-11-181-1/+1
| | | | |
| * | | | Load raw repository lazily to recover from failed readDouwe Maan2015-11-181-7/+11
| | | | |
| * | | | Fix specsDouwe Maan2015-11-183-14/+5
| | | | |
| * | | | Remove unused variable in repository importDouwe Maan2015-11-181-1/+1
| | | | |
| * | | | Fix styling of import error.Douwe Maan2015-11-182-6/+7
| | | | |
| * | | | Add tooltips to home panel buttons.Douwe Maan2015-11-186-28/+25
| | | | |
| * | | | Clean up Repository cache code.Douwe Maan2015-11-181-8/+14
| | | | |