summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ce-backport-3615' into 'master'Sean McGivern2017-12-0722-166/+273
|\ | | | | | | | | 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-3615Jarka Kadlecova2017-12-0622-166/+273
| |
* | Merge branch 'ce-backport-3938' into 'master'Sean McGivern2017-12-0717-285/+456
|\ \ | | | | | | | | | | | | Support uploads for groups See merge request gitlab-org/gitlab-ce!15781
| * | Support uploads for groupsJarka Kadlecova2017-12-0717-285/+456
|/ /
* | Merge branch 'metrics/gb/add-tmp-stage-creation-metrics' into 'master'Kamil Trzciński2017-12-071-0/+16
|\ \ | | | | | | | | | | | | Add invalid builds counter metric to stage seeds class See merge request gitlab-org/gitlab-ce!15764
| * | Update pipeline create chain Prometheus metricmetrics/gb/add-tmp-stage-creation-metricsGrzegorz Bizon2017-12-071-4/+3
| | |
| * | Move invalid builds counter out of the transactionGrzegorz Bizon2017-12-062-13/+17
| | |
| * | Add invalid builds counter metric to stage seeds classGrzegorz Bizon2017-12-061-0/+13
| | |
* | | Merge branch 'gitaly-prevent-dup' into 'master'Sean McGivern2017-12-072-6/+10
|\ \ \ | | | | | | | | | | | | | | | | Prevent dups when using StringIO for binary reads See merge request gitlab-org/gitlab-ce!15771
| * | | Prevent dups when using StringIO for binary readsgitaly-prevent-dupJacob Vosmaer2017-12-062-6/+10
| | | |
* | | | Merge branch 'outdated-browser-position-fix' into 'master'Filipa Lacerda2017-12-075-21/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed outdated browser banner positioning Closes #40824 See merge request gitlab-org/gitlab-ce!15762
| * | | | Fixed outdated browser banner positioningoutdated-browser-position-fixPhil Hughes2017-12-065-21/+13
| | | | | | | | | | | | | | | | | | | | Closes #40824
* | | | | Merge branch '40573-rename-gke-as-kubernetes-engine' into 'master'Kamil Trzciński2017-12-0734-210/+215
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename GKE as Kubernetes Engine Closes #40537 See merge request gitlab-org/gitlab-ce!15608
| * | | | | Rename GKE as Kubernetes EngineTakuya Noguchi2017-12-0634-210/+215
| | | | | |
* | | | | | Merge branch '27742-display-member-role-per-project' into 'master'Phil Hughes2017-12-0722-94/+347
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display member role per project" Closes #27742 and #40340 See merge request gitlab-org/gitlab-ce!15387
| * | | | | | Resolve "Display member role per project"Mike Greiling2017-12-0722-94/+347
|/ / / / / /
* | | | | | Merge branch 'fj-40752-forks-api-not-using-services' into 'master'Douwe Maan2017-12-076-173/+271
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API isn't using the appropriate services for managing forks Closes #40752 See merge request gitlab-org/gitlab-ce!15709
| * | | | | | The API isn't using the appropriate services for managing forksFrancisco Javier López2017-12-076-173/+271
|/ / / / / /
* | | | | | Merge branch 'rs-bump-shell' into 'master'Douwe Maan2017-12-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump GITLAB_SHELL_VERSION Closes gitlab-com/infrastructure#2725 See merge request gitlab-org/gitlab-ce!15768
| * | | | | | Bump GITLAB_SHELL_VERSIONrs-bump-shellRobert Speicher2017-12-061-1/+1
| | | | | | |
* | | | | | | Merge branch 'docs-pages-admin-update' into 'master'Achilleas Pipinellis2017-12-071-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs pages admin update Closes #40849 See merge request gitlab-org/gitlab-ce!15769
| * | | | | | | add note on deploying Pages to a private networkdocs-pages-admin-updateMarcia Ramos2017-12-061-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'mk-add-old-attachments-to-uploads-table' into 'master'Stan Hu2017-12-0714-4/+1323
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add old files to uploads table See merge request gitlab-org/gitlab-ce!15270
| * | | | | | | Fix specs for MySQLMichael Kozono2017-12-062-0/+5
| | | | | | | |
| * | | | | | | Fix specs after rebaseMichael Kozono2017-12-064-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 pathsMichael Kozono2017-12-052-4/+45
| | | | | | | |
| * | | | | | | Guarantee all IDs are includedMichael Kozono2017-12-051-5/+5
| | | | | | | |
| * | | | | | | Make sure empty uploads doesn’t break anythingMichael Kozono2017-12-041-1/+9
| | | | | | | |
| * | | | | | | Follow symlinksMichael Kozono2017-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, the Omnibus uploads directory is generally a symlink.
| * | | | | | | Handle race conditionMichael Kozono2017-12-011-1/+2
| | | | | | | |
| * | | | | | | Add tests for disable_quote optionMichael Kozono2017-12-011-0/+16
| | | | | | | |
| * | | | | | | Address Rubocop offensesMichael Kozono2017-12-012-39/+82
| | | | | | | |
| * | | | | | | Fix test for MySQLMichael Kozono2017-12-011-4/+6
| | | | | | | |
| * | | | | | | Ensure consistent column orderMichael Kozono2017-12-011-1/+1
| | | | | | | |
| * | | | | | | Don’t quote `NOW()` for created_at columnMichael Kozono2017-12-012-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To fix for MySQL.
| * | | | | | | RefactorMichael Kozono2017-12-011-6/+6
| | | | | | | |
| * | | | | | | Don’t recreate deleted uploadsMichael Kozono2017-12-013-12/+51
| | | | | | | |
| * | | | | | | Get rid of timestamps on untracked files tableMichael Kozono2017-12-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `updated_at` is now unnecessary and `created_at` is less useful due to removing the tracked field.
| * | | | | | | Bulk insert uploadsMichael Kozono2017-12-011-49/+14
| | | | | | | |
| * | | | | | | Filter existing uploads with one queryMichael Kozono2017-12-012-92/+68
| | | | | | | |
| * | | | | | | RefactorMichael Kozono2017-12-012-16/+13
| | | | | | | |
| * | | | | | | Get rid of tracked fieldMichael Kozono2017-12-013-29/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes a debugging slightly easier, but is not necessary, and is a waste of resources.
| * | | | | | | RefactorMichael Kozono2017-12-011-10/+3
| | | | | | | |
| * | | | | | | Fix datetime inserts on MySQLMichael Kozono2017-12-011-3/+1
| | | | | | | |
| * | | | | | | Fix Rubocop offenseMichael Kozono2017-12-011-0/+1
| | | | | | | |
| * | | | | | | Use bulk insertsMichael Kozono2017-12-013-71/+184
| | | | | | | |
| * | | | | | | Use ionice absolute pathMichael Kozono2017-12-011-2/+3
| | | | | | | |
| * | | | | | | Attempt to fix spec in CIMichael Kozono2017-12-011-1/+1
| | | | | | | |
| * | | | | | | Log the find command usedMichael Kozono2017-12-011-0/+2
| | | | | | | |
| * | | | | | | Move temp table creation into the prepare jobMichael Kozono2017-12-016-77/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
View Lorry Controller Status