summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Generalize detail page headers40543-generalize-detail-page-headersEric Eastwood2017-12-059-79/+66
* Merge branch 'add-slack-app-case-to-docs' into 'master'Achilleas Pipinellis2017-12-051-0/+3
|\
| * 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 pagesMarkus Koller2017-12-0419-40/+109
* | | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-0537-303/+838
|\ \ \
| * | | 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
| * | | 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
| * | | Create Ci::ArtifactsZeger-Jan van de Weg2017-12-0311-69/+164
| * | | Create ci_artifacts tableZeger-Jan van de Weg2017-12-032-3/+35
| * | | WIPZeger-Jan van de Weg2017-12-033-0/+25
* | | | Merge branch 'dm-application-worker' into 'master'Sean McGivern2017-12-05117-304/+371
|\ \ \ \
| * | | | Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-0523-100/+107
| * | | | Update docsDouwe Maan2017-12-051-16/+14
| * | | | Add ApplicationWorker and make every worker include itDouwe Maan2017-12-05100-189/+251
* | | | | Merge branch '32878-merge-request-from-email' into 'master'Sean McGivern2017-12-0529-70/+347
|\ \ \ \ \
| * | | | | Create merge request from emailJan Provaznik2017-12-0529-70/+347
* | | | | | Merge branch 'gitaly-conflict-file' into 'master'Sean McGivern2017-12-052-2/+2
|\ \ \ \ \ \
| * | | | | | Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-fileAlejandro Rodríguez2017-12-041-1/+1
| * | | | | | Add missing attr_accessor to Gitlab::Git::Conflict::FileAlejandro Rodríguez2017-12-041-1/+1
* | | | | | | Merge branch '35616-move-k8-to-cluster-page' into 'master'Grzegorz Bizon2017-12-0538-632/+1160
|\ \ \ \ \ \ \
| * | | | | | | Second iteration of Move Kubernetes from service to Cluster pageFilipa Lacerda2017-12-0538-632/+1160
|/ / / / / / /
* | | | | | | Merge branch 'bvl-limit-fork-queries-on-project-show' into 'master'Sean McGivern2017-12-055-7/+60
|\ \ \ \ \ \ \
| * | | | | | | Count occurrences of a specific query in the query recorder.bvl-limit-fork-queries-on-project-showBob Van Landuyt2017-12-042-11/+18