Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix transient error in pikadayToStringfix-transient-datefix-spec | Clement Ho | 2017-12-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'feature/migrate-revert-to-gitaly' into 'master' | Robert Speicher | 2017-12-05 | 6 | -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-gitaly | Ahmad Sherif | 2017-12-05 | 6 | -45/+102 |
| | | | | | | | | Closes gitaly#780 | ||||
* | | Merge branch 'docs-update-permissions' into 'master' | Achilleas Pipinellis | 2017-12-05 | 1 | -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-permissions | Marcia Ramos | 2017-12-04 | 1 | -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 Speicher | 2017-12-05 | 3 | -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-signature | Kim "BKC" Carlbäcker | 2017-12-05 | 3 | -5/+60 |
| | | | | | | | | | | | | | | | | - Added tests for Git::Commit.shas_with_signatures | ||||
* | | | | Merge branch 'bw-replication-slots-supported' into 'master' | Stan Hu | 2017-12-05 | 2 | -0/+26 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | add Gitlab::Database.replication_slots_supported? See merge request gitlab-org/gitlab-ce!15744 | ||||
| * | | | | add Gitlab::Database.replication_slots_supported? | Brett Walker | 2017-12-05 | 2 | -0/+26 |
|/ / / / | |||||
* | | | | Merge branch 'patch-29' into 'master' | Sean McGivern | 2017-12-05 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Updating trouble shooting links See merge request gitlab-org/gitlab-ce!15685 | ||||
| * | | | | Updating trouble shooting links | Lyle Kozloff | 2017-12-01 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge branch 'perform-sql-matching-of-tags' into 'master' | Yorick Peterse | 2017-12-05 | 6 | -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 picking | Kamil Trzcinski | 2017-12-05 | 6 | -16/+120 |
| | | | | | | |||||
* | | | | | | Merge branch '40508-snippets-zen-mode' into 'master' | Phil Hughes | 2017-12-05 | 4 | -1/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Init zenmode in snippets pages Closes #40508 See merge request gitlab-org/gitlab-ce!15742 | ||||
| * | | | | | | Init zenmode in snippets pages40508-snippets-zen-mode | Filipa Lacerda | 2017-12-05 | 4 | -1/+15 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'docs/no-qa-internal-job' into 'master' | Rémy Coutable | 2017-12-05 | 1 | -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 changes | Achilleas Pipinellis | 2017-12-05 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'add-slack-app-case-to-docs' into 'master' | Achilleas Pipinellis | 2017-12-05 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Add slack app case to docs See merge request gitlab-org/gitlab-ce!15729 | ||||
| * | | | | | | Update slash_commands.mdadd-slack-app-case-to-docs | Victor Wu | 2017-12-04 | 1 | -0/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'feature/custom-text-for-new-projects' into 'master' | Rémy Coutable | 2017-12-05 | 19 | -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 pages | Markus Koller | 2017-12-04 | 19 | -40/+109 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'zj-multiple-artifacts' into 'master' | Grzegorz Bizon | 2017-12-05 | 37 | -303/+838 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | Multiple artifacts See merge request gitlab-org/gitlab-ce!14367 | ||||
| * | | | | | | Move config_source earlier | Kamil Trzcinski | 2017-12-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge index during table creation | Kamil Trzcinski | 2017-12-05 | 3 | -17/+2 |
| | | | | | | | |||||
| * | | | | | | Remove index on file_type | Kamil Trzcinski | 2017-12-04 | 2 | -4/+2 |
| | | | | | | | |||||
| * | | | | | | Fix Rubocop | Kamil Trzcinski | 2017-12-03 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix failures | Kamil Trzcinski | 2017-12-03 | 2 | -6/+2 |
| | | | | | | | |||||
| * | | | | | | Code style | Kamil Trzcinski | 2017-12-03 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Remove update artifacts test (it should not be needed) | Kamil Trzcinski | 2017-12-03 | 1 | -9/+0 |
| | | | | | | | |||||
| * | | | | | | Store expire_at in ci_job_artifacts | Kamil Trzcinski | 2017-12-03 | 7 | -10/+81 |
| | | | | | | | |||||
| * | | | | | | Fix factory for artifacts | Kamil Trzcinski | 2017-12-03 | 1 | -11/+9 |
| | | | | | | | |||||
| * | | | | | | Add unique index on job_id and file_type | Zeger-Jan van de Weg | 2017-12-03 | 2 | -1/+18 |
| | | | | | | | |||||
| * | | | | | | Use `job_artifacts_archive|metadata` | Kamil Trzcinski | 2017-12-03 | 5 | -15/+15 |
| | | | | | | | |||||
| * | | | | | | Revert "Rename `job_archive|metadata` to `artifacts_archive|metadata`" | Kamil Trzcinski | 2017-12-03 | 5 | -17/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 714082e65304ae2ec5c5400c59a68ab63e724aa9. | ||||
| * | | | | | | Rename `job_archive|metadata` to `artifacts_archive|metadata` | Kamil Trzcinski | 2017-12-03 | 5 | -14/+17 |
| | | | | | | | |||||
| * | | | | | | Remove hook set by carrierwave too | Zeger-Jan van de Weg | 2017-12-03 | 2 | -7/+6 |
| | | | | | | | |||||
| * | | | | | | Remove Ci::Build#artifacts_file? | Zeger-Jan van de Weg | 2017-12-03 | 3 | -9/+5 |
| | | | | | | | |||||
| * | | | | | | Add coverage on legacy artifacts for Ci::Build | Zeger-Jan van de Weg | 2017-12-03 | 2 | -77/+190 |
| | | | | | | | |||||
| * | | | | | | Test new artifacts for pages deploy | Zeger-Jan van de Weg | 2017-12-03 | 2 | -17/+93 |
| | | | | | | | |||||
| * | | | | | | Fix rubocop | Kamil Trzcinski | 2017-12-03 | 2 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | Sync ArtifactUploader specs with EE | Kamil Trzcinski | 2017-12-03 | 2 | -24/+26 |
| | | | | | | | |||||
| * | | | | | | Fix specs failures, and use factory with `:ci_job_artifact, :archive` | Kamil Trzcinski | 2017-12-03 | 9 | -26/+94 |
| | | | | | | | |||||
| * | | | | | | Rename artifacts_* to legacy_artifacts_* | Kamil Trzcinski | 2017-12-03 | 16 | -84/+85 |
| | | | | | | | |||||
| * | | | | | | Last test fixes multiple artifacts | Zeger-Jan van de Weg | 2017-12-03 | 2 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Fix legacy migration test | Zeger-Jan van de Weg | 2017-12-03 | 5 | -14/+38 |
| | | | | | | | |||||
| * | | | | | | JobArtifactsUploader does not inherrit from ArtifactsUploader | Zeger-Jan van de Weg | 2017-12-03 | 1 | -6/+20 |
| | | | | | | | |||||
| * | | | | | | Fix most test failures | Zeger-Jan van de Weg | 2017-12-03 | 11 | -23/+22 |
| | | | | | | | |||||
| * | | | | | | Use tmp/test/artifacts for files | Kamil Trzcinski | 2017-12-03 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Fix creation of job_artifact_uploader | Kamil Trzcinski | 2017-12-03 | 4 | -12/+10 |
| | | | | | | | |||||
| * | | | | | | Rename Artifact to JobArtifact, split metadata out | Zeger-Jan van de Weg | 2017-12-03 | 24 | -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. |