Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jej/per-user-protected-branches-api-ce' into 'master' | Sean McGivern | 2017-12-07 | 1 | -18/+18 |
|\ | | | | | | | | | CE backport of "ProtectedBranches API handles per user/group granularity" See merge request gitlab-org/gitlab-ce!15747 | ||||
| * | CE backport of ProtectedBranches API changes | James Edwards-Jones | 2017-12-07 | 1 | -18/+18 |
| | | | | | | | | | | In EE we now allow individual users/groups to be set on POST, which required some refactoring. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3516 | ||||
* | | Merge branch 'ce-backport-3615' into 'master' | Sean McGivern | 2017-12-07 | 6 | -30/+100 |
|\ \ | | | | | | | | | | | | | Refactor banzai to support referencing from group context See merge request gitlab-org/gitlab-ce!15766 | ||||
| * | | Refactor banzai to support referencing from group contextce-backport-3615 | Jarka Kadlecova | 2017-12-06 | 6 | -30/+100 |
| | | | |||||
* | | | Support uploads for groups | Jarka Kadlecova | 2017-12-07 | 7 | -255/+336 |
| | | | |||||
* | | | Merge branch '40573-rename-gke-as-kubernetes-engine' into 'master' | Kamil Trzciński | 2017-12-07 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Rename GKE as Kubernetes Engine Closes #40537 See merge request gitlab-org/gitlab-ce!15608 | ||||
| * | | | Rename GKE as Kubernetes Engine | Takuya Noguchi | 2017-12-06 | 2 | -4/+4 |
| | | | | |||||
* | | | | Resolve "Display member role per project" | Mike Greiling | 2017-12-07 | 1 | -0/+159 |
| | | | | |||||
* | | | | The API isn't using the appropriate services for managing forks | Francisco Javier López | 2017-12-07 | 1 | -155/+198 |
| | | | | |||||
* | | | | Merge branch 'mk-add-old-attachments-to-uploads-table' into 'master' | Stan Hu | 2017-12-07 | 6 | -1/+824 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add old files to uploads table See merge request gitlab-org/gitlab-ce!15270 | ||||
| * | | | | Fix specs for MySQL | Michael Kozono | 2017-12-06 | 2 | -0/+5 |
| | | | | | |||||
| * | | | | Fix specs after rebase | Michael Kozono | 2017-12-06 | 4 | -89/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Later migrations added fields to the EE DB which were used by factories which were used in these specs. And in CE on MySQL, a single appearance row is enforced. The migration and migration specs should not depend on the codebase staying the same. | ||||
| * | | | | Process normal paths in batch containing bad paths | Michael Kozono | 2017-12-05 | 1 | -0/+20 |
| | | | | | |||||
| * | | | | Guarantee all IDs are included | Michael Kozono | 2017-12-05 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Make sure empty uploads doesn’t break anything | Michael Kozono | 2017-12-04 | 1 | -1/+9 |
| | | | | | |||||
| * | | | | Add tests for disable_quote option | Michael Kozono | 2017-12-01 | 1 | -0/+16 |
| | | | | | |||||
| * | | | | Fix test for MySQL | Michael Kozono | 2017-12-01 | 1 | -4/+6 |
| | | | | | |||||
| * | | | | Don’t recreate deleted uploads | Michael Kozono | 2017-12-01 | 2 | -7/+16 |
| | | | | | |||||
| * | | | | Filter existing uploads with one query | Michael Kozono | 2017-12-01 | 1 | -54/+26 |
| | | | | | |||||
| * | | | | Refactor | Michael Kozono | 2017-12-01 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Get rid of tracked field | Michael Kozono | 2017-12-01 | 1 | -16/+4 |
| | | | | | | | | | | | | | | | | | | | | It makes a debugging slightly easier, but is not necessary, and is a waste of resources. | ||||
| * | | | | Use bulk inserts | Michael Kozono | 2017-12-01 | 2 | -51/+149 |
| | | | | | |||||
| * | | | | Attempt to fix spec in CI | Michael Kozono | 2017-12-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Move temp table creation into the prepare job | Michael Kozono | 2017-12-01 | 4 | -53/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Hopefully fixes spec failures in which the table doesn’t exist * Decouples the background migration from the post-deploy migration, e.g. we could easily run it again even though the table is dropped when finished. | ||||
| * | | | | Fix Rubocop offenses | Michael Kozono | 2017-12-01 | 3 | -6/+4 |
| | | | | | |||||
| * | | | | Drop temporary tracking table when finished | Michael Kozono | 2017-12-01 | 4 | -84/+113 |
| | | | | | |||||
| * | | | | Refactor specs | Michael Kozono | 2017-12-01 | 4 | -337/+183 |
| | | | | | |||||
| * | | | | Store paths relative to CarrierWave.root | Michael Kozono | 2017-12-01 | 3 | -53/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the path on source installs cannot be too long for our column. And fix the column length test since Route.path is limited to 255 chars, it doesn’t matter how many nested groups there are. | ||||
| * | | | | Clean up after test | Michael Kozono | 2017-12-01 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Remove unnecessary clearing | Michael Kozono | 2017-12-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Since duplicate inserts are now ignored. | ||||
| * | | | | Reword test | Michael Kozono | 2017-12-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Rename table to untracked_files_for_uploads | Michael Kozono | 2017-12-01 | 3 | -126/+126 |
| | | | | | |||||
| * | | | | Refactor, no change in behavior | Michael Kozono | 2017-12-01 | 3 | -19/+28 |
| | | | | | |||||
| * | | | | Make regexes more readable | Michael Kozono | 2017-12-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix Rubocop offenses | Michael Kozono | 2017-12-01 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Test batch processing | Michael Kozono | 2017-12-01 | 1 | -0/+42 |
| | | | | | |||||
| * | | | | Calculate checksums | Michael Kozono | 2017-12-01 | 2 | -108/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by copy-pasting in the whole `Upload` class. Also, fix `Namespace` `model_type` (it should not be `Group`). | ||||
| * | | | | Add untracked files to uploads | Michael Kozono | 2017-12-01 | 2 | -23/+619 |
| | | | | | |||||
| * | | | | Kick off follow up background migration jobs | Michael Kozono | 2017-12-01 | 1 | -16/+47 |
| | | | | | | | | | | | | | | | | | | | | To process the unhashed_upload_files table. | ||||
| * | | | | Find and store unhashed upload file paths | Michael Kozono | 2017-12-01 | 1 | -0/+80 |
| | | | | | |||||
| * | | | | Backport `which` from EE | Michael Kozono | 2017-12-01 | 1 | -1/+9 |
| | | | | | |||||
| * | | | | Add TrackUntrackedUploads post-deploy migration | Michael Kozono | 2017-12-01 | 1 | -0/+113 |
| | | | | | | | | | | | | | | | | | | | | To create the table, and schedule the background migration that begins the work. | ||||
* | | | | | Merge branch ↵ | Tim Zallmann | 2017-12-06 | 1 | -0/+106 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22680-unlabel-slash-command-limit-autocomplete-to-applied-labels' into 'master' Resolve "/unlabel quick action - limit autocomplete to applied labels" Closes #22680 and #27319 See merge request gitlab-org/gitlab-ce!11110 | ||||
| * | | | | Limit autocomplete menu to applied labels | Vitaliy @blackst0ne Klachkov | 2017-11-28 | 1 | -0/+106 |
| | | | | | |||||
* | | | | | Merge branch '35773-search-box-close-dropdown' into 'master' | Annabel Dunstone Gray | 2017-12-06 | 1 | -2/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close all open dropdowns when search input is clicked Closes #35773 See merge request gitlab-org/gitlab-ce!15737 | ||||
| * | | | | | Updates the dropdown to match the docs and remove old hack of stop event ↵35773-search-box-close-dropdown | Filipa Lacerda | 2017-12-06 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | propagation | ||||
* | | | | | | Merge branch 'admin-welcome-new-group-link' into 'master' | Filipa Lacerda | 2017-12-06 | 1 | -0/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes admin welcome states new group path Closes #40645 See merge request gitlab-org/gitlab-ce!15761 | ||||
| * | | | | | | Fixes admin welcome states new group pathadmin-welcome-new-group-link | Phil Hughes | 2017-12-06 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #40645 | ||||
* | | | | | | | Throttle the number of UPDATEs triggered by touch | Yorick Peterse | 2017-12-06 | 5 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This throttles the number of UPDATE queries that can be triggered by calling "touch" on a Note, Issue, or MergeRequest. For Note objects we also take care of updating the associated "noteable" relation in a smarter way than Rails does by default. | ||||
* | | | | | | | Merge branch ↵ | Sean McGivern | 2017-12-06 | 2 | -0/+33 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings' into 'master' Resolve "In Issue board url doesn't take in account hostname settings" Closes #39364 See merge request gitlab-org/gitlab-ce!15703 |