Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-multiple-artifacts' into 'master' | Grzegorz Bizon | 2017-12-05 | 37 | -303/+838 |
|\ | |||||
| * | 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 |
| * | 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 |
| * | Create Ci::Artifacts | Zeger-Jan van de Weg | 2017-12-03 | 11 | -69/+164 |
| * | Create ci_artifacts table | Zeger-Jan van de Weg | 2017-12-03 | 2 | -3/+35 |
| * | WIP | Zeger-Jan van de Weg | 2017-12-03 | 3 | -0/+25 |
* | | Merge branch 'dm-application-worker' into 'master' | Sean McGivern | 2017-12-05 | 117 | -304/+371 |
|\ \ | |||||
| * | | Consistently schedule Sidekiq jobsdm-application-worker | Douwe Maan | 2017-12-05 | 23 | -100/+107 |
| * | | Update docs | Douwe Maan | 2017-12-05 | 1 | -16/+14 |
| * | | Add ApplicationWorker and make every worker include it | Douwe Maan | 2017-12-05 | 100 | -189/+251 |
* | | | Merge branch '32878-merge-request-from-email' into 'master' | Sean McGivern | 2017-12-05 | 29 | -70/+347 |
|\ \ \ | |||||
| * | | | Create merge request from email | Jan Provaznik | 2017-12-05 | 29 | -70/+347 |
* | | | | Merge branch 'gitaly-conflict-file' into 'master' | Sean McGivern | 2017-12-05 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-file | Alejandro Rodríguez | 2017-12-04 | 1 | -1/+1 |
| * | | | | Add missing attr_accessor to Gitlab::Git::Conflict::File | Alejandro Rodríguez | 2017-12-04 | 1 | -1/+1 |
* | | | | | Merge branch '35616-move-k8-to-cluster-page' into 'master' | Grzegorz Bizon | 2017-12-05 | 38 | -632/+1160 |
|\ \ \ \ \ | |||||
| * | | | | | Second iteration of Move Kubernetes from service to Cluster page | Filipa Lacerda | 2017-12-05 | 38 | -632/+1160 |
|/ / / / / | |||||
* | | | | | Merge branch 'bvl-limit-fork-queries-on-project-show' into 'master' | Sean McGivern | 2017-12-05 | 5 | -7/+60 |
|\ \ \ \ \ | |||||
| * | | | | | Count occurrences of a specific query in the query recorder.bvl-limit-fork-queries-on-project-show | Bob Van Landuyt | 2017-12-04 | 2 | -11/+18 |
| * | | | | | Cache the forks in a namespace in the RequestStore | Bob Van Landuyt | 2017-12-04 | 4 | -2/+48 |
* | | | | | | Merge branch 'backport-epic-nav' into 'master' | Sean McGivern | 2017-12-05 | 2 | -4/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Backport Extract epic nav into separate partial for easier CE => EE | Clement Ho | 2017-12-05 | 2 | -4/+7 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'ce-gitaly-worktree-refactor' into 'master' | Sean McGivern | 2017-12-05 | 1 | -8/+140 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Backport Squash/Rebase refactor from EEce-gitaly-worktree-refactor | Alejandro Rodríguez | 2017-12-04 | 1 | -8/+140 |
| | |/ / / / | |/| | | | |