summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ee-backport-issue_40654' into 'master'Sean McGivern2017-12-061-0/+7
|\
| * [CE-Backport] Fix board filter when milestone is predefinedee-backport-issue_40654Felipe Artur2017-12-051-0/+7
* | Merge branch 'list-multiple-clusters' into 'master'Grzegorz Bizon2017-12-062-1/+4
|\ \
| * \ Merge remote-tracking branch 'origin/master' into list-multiple-clustersMatija Čupić2017-12-0511-23/+127
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into list-multiple-clustersKamil Trzcinski2017-12-051-2/+3
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-051-1/+0
| |\ \ \ \
| | * | | | Remove cluster from Project modelMatija Čupić2017-12-041-1/+0
| | * | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-12-0425-229/+249
| | |\ \ \ \
| * | \ \ \ \ Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clus...Kamil Trzcinski2017-12-056-12/+36
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-031-0/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Add created? to Cluster modelMatija Čupić2017-12-011-0/+4
| * | | | | | | Fix prevent modificationKamil Trzcinski2017-12-031-0/+14
| * | | | | | | Fix controllers and linksKamil Trzcinski2017-12-031-3/+6
| * | | | | | | Extend controllers to support a new data structure for manual Kubernetes clus...Kamil Trzcinski2017-12-031-0/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '37354-pipelines-update' into 'master'Kamil Trzciński2017-12-061-2/+10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use actual head pipeline on merge request serializerFelipe Artur2017-12-051-3/+3
| * | | | | | Check if head_pipeline is correct before mergingFelipe Artur2017-12-051-4/+8
| * | | | | | Improve MergeRequest#head_pipelineFelipe Artur2017-12-051-5/+1
| * | | | | | Ensure pippeline corresponds with the sha of an MRJarka Kadlecova2017-12-051-0/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Perform SQL matching of Build&Runner tags to greatly speed-up job pickingKamil Trzcinski2017-12-052-3/+22
* | | | | | Merge branch 'feature/custom-text-for-new-projects' into 'master'Rémy Coutable2017-12-051-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add custom brand text on new project pagesMarkus Koller2017-12-041-2/+1
* | | | | | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-054-17/+98
|\ \ \ \ \ \
| * | | | | | Fix failuresKamil Trzcinski2017-12-031-5/+1
| * | | | | | Code styleKamil Trzcinski2017-12-031-1/+2
| * | | | | | Store expire_at in ci_job_artifactsKamil Trzcinski2017-12-032-3/+15
| * | | | | | Use `job_artifacts_archive|metadata`Kamil Trzcinski2017-12-032-10/+10
| * | | | | | Revert "Rename `job_archive|metadata` to `artifacts_archive|metadata`"Kamil Trzcinski2017-12-033-13/+10
| * | | | | | Rename `job_archive|metadata` to `artifacts_archive|metadata`Kamil Trzcinski2017-12-033-10/+13
| * | | | | | Remove hook set by carrierwave tooZeger-Jan van de Weg2017-12-031-1/+0
| * | | | | | Remove Ci::Build#artifacts_file?Zeger-Jan van de Weg2017-12-031-4/+0
| * | | | | | Rename artifacts_* to legacy_artifacts_*Kamil Trzcinski2017-12-032-7/+11
| * | | | | | Fix most test failuresZeger-Jan van de Weg2017-12-033-8/+6
| * | | | | | Fix creation of job_artifact_uploaderKamil Trzcinski2017-12-031-2/+2
| * | | | | | Rename Artifact to JobArtifact, split metadata outZeger-Jan van de Weg2017-12-035-45/+64
| * | | | | | Create Ci::ArtifactsZeger-Jan van de Weg2017-12-033-22/+66
| * | | | | | WIPZeger-Jan van de Weg2017-12-031-0/+12
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'dm-application-worker' into 'master'Sean McGivern2017-12-055-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-055-1/+6
| | |/ / / | |/| | |
* | | | | Merge branch '32878-merge-request-from-email' into 'master'Sean McGivern2017-12-051-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Create merge request from emailJan Provaznik2017-12-051-2/+3
| |/ / /
* | | | Second iteration of Move Kubernetes from service to Cluster pageFilipa Lacerda2017-12-052-1/+19
* | | | Merge branch 'bvl-limit-fork-queries-on-project-show' into 'master'Sean McGivern2017-12-051-1/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Cache the forks in a namespace in the RequestStoreBob Van Landuyt2017-12-041-1/+11
* | | | Merge branch 'zj-diverging-commit-count-no-rugged' into 'master'Robert Speicher2017-12-041-1/+1
|\ \ \ \
| * | | | Use commit finder instead of rev parseZeger-Jan van de Weg2017-12-011-1/+1
* | | | | Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-043-2/+18
|\ \ \ \ \
| * | | | | Comments from code review applied. Also switched forked_from_project and Fork...Francisco Lopez2017-12-013-2/+18
| | |_|/ / | |/| | |
* | | | | Merge branch '40711-fix-forking-hashed-projects' into 'master'Douwe Maan2017-12-041-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix the fork project functionality for projects with hashed storageNick Thomas2017-12-041-2/+1
| |/ / /