summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix transient error in pikadayToStringfix-transient-datefix-specClement Ho2017-12-051-1/+1
|
* Merge branch 'feature/migrate-revert-to-gitaly' into 'master'Robert Speicher2017-12-056-45/+102
|\ | | | | | | | | | | | | Migrate Gitlab::Git::Repository#revert to Gitaly Closes gitaly#780 See merge request gitlab-org/gitlab-ce!15717
| * Migrate Gitlab::Git::Repository#revert to Gitalyfeature/migrate-revert-to-gitalyAhmad Sherif2017-12-056-45/+102
| | | | | | | | Closes gitaly#780
* | Merge branch 'docs-update-permissions' into 'master'Achilleas Pipinellis2017-12-051-7/+10
|\ \ | | | | | | | | | | | | | | | | | | Docs: Update permissions Closes #40143 See merge request gitlab-org/gitlab-ce!15730
| * | Add missing permissions, update list (checked to un-checked order)docs-update-permissionsMarcia Ramos2017-12-041-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | - Assign issues and MRs - Label issues and MRs - Reorder a couple of items in the table to go from unchecked to checked - Add/remove spaces so that the dividers stay in the same column in the file
* | | Merge branch 'gitaly-764-commit-filter-shas-with-signature' into 'master'Robert Speicher2017-12-053-5/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Commit.shas_with_signature Closes gitaly#764 See merge request gitlab-org/gitlab-ce!15621
| * | | Migrate Gitlab::Git::Commit.shas_with_signaturesgitaly-764-commit-filter-shas-with-signatureKim "BKC" Carlbäcker2017-12-053-5/+60
| | | | | | | | | | | | | | | | - Added tests for Git::Commit.shas_with_signatures
* | | | Merge branch 'bw-replication-slots-supported' into 'master'Stan Hu2017-12-052-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | add Gitlab::Database.replication_slots_supported? See merge request gitlab-org/gitlab-ce!15744
| * | | | add Gitlab::Database.replication_slots_supported?Brett Walker2017-12-052-0/+26
|/ / / /
* | | | Merge branch 'patch-29' into 'master'Sean McGivern2017-12-051-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Updating trouble shooting links See merge request gitlab-org/gitlab-ce!15685
| * | | | Updating trouble shooting linksLyle Kozloff2017-12-011-1/+3
| | | | |
* | | | | Merge branch 'perform-sql-matching-of-tags' into 'master'Yorick Peterse2017-12-056-16/+120
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform SQL matching of Build&Runner tags to greatly speed-up job picking Closes #24975 See merge request gitlab-org/gitlab-ce!15674
| * | | | | Perform SQL matching of Build&Runner tags to greatly speed-up job pickingKamil Trzcinski2017-12-056-16/+120
| | | | | |
* | | | | | Merge branch '40508-snippets-zen-mode' into 'master'Phil Hughes2017-12-054-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Init zenmode in snippets pages Closes #40508 See merge request gitlab-org/gitlab-ce!15742
| * | | | | | Init zenmode in snippets pages40508-snippets-zen-modeFilipa Lacerda2017-12-054-1/+15
| | | | | | |
* | | | | | | Merge branch 'docs/no-qa-internal-job' into 'master'Rémy Coutable2017-12-051-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not run qa:internal for docs only changes See merge request gitlab-org/gitlab-ce!15748
| * | | | | | | Do not run qa:internal for docs only changesAchilleas Pipinellis2017-12-051-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'add-slack-app-case-to-docs' into 'master'Achilleas Pipinellis2017-12-051-0/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Add slack app case to docs See merge request gitlab-org/gitlab-ce!15729
| * | | | | | Update slash_commands.mdadd-slack-app-case-to-docsVictor Wu2017-12-041-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'feature/custom-text-for-new-projects' into 'master'Rémy Coutable2017-12-0519-40/+109
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom brand text on new project pages Closes #15265 See merge request gitlab-org/gitlab-ce!15541
| * | | | | | Add custom brand text on new project pagesMarkus Koller2017-12-0419-40/+109
| | | | | | |
* | | | | | | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-0537-303/+838
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Multiple artifacts See merge request gitlab-org/gitlab-ce!14367
| * | | | | | Move config_source earlierKamil Trzcinski2017-12-051-1/+1
| | | | | | |
| * | | | | | Merge index during table creationKamil Trzcinski2017-12-053-17/+2
| | | | | | |
| * | | | | | Remove index on file_typeKamil Trzcinski2017-12-042-4/+2
| | | | | | |
| * | | | | | Fix RubocopKamil Trzcinski2017-12-031-1/+1
| | | | | | |
| * | | | | | Fix failuresKamil Trzcinski2017-12-032-6/+2
| | | | | | |
| * | | | | | Code styleKamil Trzcinski2017-12-031-1/+2
| | | | | | |
| * | | | | | Remove update artifacts test (it should not be needed)Kamil Trzcinski2017-12-031-9/+0
| | | | | | |
| * | | | | | Store expire_at in ci_job_artifactsKamil Trzcinski2017-12-037-10/+81
| | | | | | |
| * | | | | | Fix factory for artifactsKamil Trzcinski2017-12-031-11/+9
| | | | | | |
| * | | | | | Add unique index on job_id and file_typeZeger-Jan van de Weg2017-12-032-1/+18
| | | | | | |
| * | | | | | Use `job_artifacts_archive|metadata`Kamil Trzcinski2017-12-035-15/+15
| | | | | | |
| * | | | | | Revert "Rename `job_archive|metadata` to `artifacts_archive|metadata`"Kamil Trzcinski2017-12-035-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 714082e65304ae2ec5c5400c59a68ab63e724aa9.
| * | | | | | Rename `job_archive|metadata` to `artifacts_archive|metadata`Kamil Trzcinski2017-12-035-14/+17
| | | | | | |
| * | | | | | Remove hook set by carrierwave tooZeger-Jan van de Weg2017-12-032-7/+6
| | | | | | |
| * | | | | | Remove Ci::Build#artifacts_file?Zeger-Jan van de Weg2017-12-033-9/+5
| | | | | | |
| * | | | | | Add coverage on legacy artifacts for Ci::BuildZeger-Jan van de Weg2017-12-032-77/+190
| | | | | | |
| * | | | | | Test new artifacts for pages deployZeger-Jan van de Weg2017-12-032-17/+93
| | | | | | |
| * | | | | | Fix rubocopKamil Trzcinski2017-12-032-6/+6
| | | | | | |
| * | | | | | Sync ArtifactUploader specs with EEKamil Trzcinski2017-12-032-24/+26
| | | | | | |
| * | | | | | Fix specs failures, and use factory with `:ci_job_artifact, :archive`Kamil Trzcinski2017-12-039-26/+94
| | | | | | |
| * | | | | | Rename artifacts_* to legacy_artifacts_*Kamil Trzcinski2017-12-0316-84/+85
| | | | | | |
| * | | | | | Last test fixes multiple artifactsZeger-Jan van de Weg2017-12-032-2/+1
| | | | | | |
| * | | | | | Fix legacy migration testZeger-Jan van de Weg2017-12-035-14/+38
| | | | | | |
| * | | | | | JobArtifactsUploader does not inherrit from ArtifactsUploaderZeger-Jan van de Weg2017-12-031-6/+20
| | | | | | |
| * | | | | | Fix most test failuresZeger-Jan van de Weg2017-12-0311-23/+22
| | | | | | |
| * | | | | | Use tmp/test/artifacts for filesKamil Trzcinski2017-12-031-0/+2
| | | | | | |
| * | | | | | Fix creation of job_artifact_uploaderKamil Trzcinski2017-12-034-12/+10
| | | | | | |
| * | | | | | Rename Artifact to JobArtifact, split metadata outZeger-Jan van de Weg2017-12-0324-203/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two things at ones, as there was no clean way to seperate the commit and give me feedback from the tests. But the model Artifact is now JobArtifact, and the table does not have a type anymore, but the metadata is now its own model: Ci::JobArtifactMetadata.