summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove Add Cluster button in clusters/indexmultiple-clusters-single-listMatija Čupić2017-12-061-2/+0
* Merge branch 'list-multiple-clusters' into multiple-clusters-single-listMatija Čupić2017-12-06114-262/+408
|\
| * Remove Add Cluster button from clusters/indexMatija Čupić2017-12-051-2/+0
| * Merge remote-tracking branch 'origin/master' into list-multiple-clustersMatija Čupić2017-12-05113-262/+392
| |\
| | * Merge branch 'perform-sql-matching-of-tags' into 'master'Yorick Peterse2017-12-053-3/+32
| | |\
| | | * Perform SQL matching of Build&Runner tags to greatly speed-up job pickingKamil Trzcinski2017-12-053-3/+32
| | * | Merge branch '40508-snippets-zen-mode' into 'master'Phil Hughes2017-12-052-1/+5
| | |\ \ | | | |/ | | |/|
| | | * Init zenmode in snippets pages40508-snippets-zen-modeFilipa Lacerda2017-12-052-1/+5
| | * | Merge branch 'feature/custom-text-for-new-projects' into 'master'Rémy Coutable2017-12-057-31/+39
| | |\ \
| | | * | Add custom brand text on new project pagesMarkus Koller2017-12-047-31/+39
| | * | | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-058-57/+178
| | |\ \ \
| | | * | | 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
| | | * | | Test new artifacts for pages deployZeger-Jan van de Weg2017-12-031-1/+1
| | | * | | Fix specs failures, and use factory with `:ci_job_artifact, :archive`Kamil Trzcinski2017-12-032-3/+19
| | | * | | Rename artifacts_* to legacy_artifacts_*Kamil Trzcinski2017-12-035-59/+49
| | | * | | Fix legacy migration testZeger-Jan van de Weg2017-12-031-3/+1
| | | * | | JobArtifactsUploader does not inherrit from ArtifactsUploaderZeger-Jan van de Weg2017-12-031-6/+20
| | | * | | Fix most test failuresZeger-Jan van de Weg2017-12-034-16/+10
| | | * | | Fix creation of job_artifact_uploaderKamil Trzcinski2017-12-032-8/+2
| | | * | | Rename Artifact to JobArtifact, split metadata outZeger-Jan van de Weg2017-12-037-50/+101
| | | * | | Create Ci::ArtifactsZeger-Jan van de Weg2017-12-034-22/+70
| | | * | | WIPZeger-Jan van de Weg2017-12-031-0/+12
| | * | | | Merge branch 'dm-application-worker' into 'master'Sean McGivern2017-12-0594-170/+138
| | |\ \ \ \
| | | * | | | Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-0512-41/+28
| | | * | | | Add ApplicationWorker and make every worker include itDouwe Maan2017-12-0587-129/+110
| | | | |_|/ | | | |/| |
* | | | | | Merge branch 'list-multiple-clusters' into multiple-clusters-single-listMatija Čupić2017-12-054-8/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move can_toggle_cluster? from helper to presenterMatija Čupić2017-12-054-8/+7
* | | | | | Merge branch 'multiple-clusters-single-list' of https://gitlab.com/gitlab-org...Kamil Trzcinski2017-12-051-3/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'list-multiple-clusters' into multiple-clusters-single-listMatija Čupić2017-12-043-3/+2
| |\ \ \ \ \ \
| * | | | | | | Fix SCSS style check issuesMatija Čupić2017-12-041-2/+2
| * | | | | | | Change copy on list headerChris Peressini2017-12-041-1/+1
| * | | | | | | Fix CSS adding a specific ruleFilipa Lacerda2017-12-042-1/+5
| * | | | | | | Make Add Cluster container .nav-controlsMatija Čupić2017-12-041-1/+1
| * | | | | | | Remove tab navigation from clusters/indexMatija Čupić2017-12-042-26/+8
| * | | | | | | Remove cluster scope from ClustersController#indexMatija Čupić2017-12-041-6/+2
* | | | | | | | Merge remote-tracking branch 'origin/list-multiple-clusters' into multiple-cl...Kamil Trzcinski2017-12-05256-1734/+3995
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Use ClustersFinder for setting countsMatija Čupić2017-12-051-4/+3
| * | | | | | | Replace Exception with ArgumentErrorMatija Čupić2017-12-051-1/+1
| * | | | | | | Remove redundant return in Clusters::CreateServiceMatija Čupić2017-12-051-1/+1
| * | | | | | | Merge remote-tracking branch 'origin/master' into list-multiple-clustersKamil Trzcinski2017-12-0514-51/+67
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch '32878-merge-request-from-email' into 'master'Sean McGivern2017-12-0514-51/+67
| | |\ \ \ \ \ \
| | | * | | | | | Create merge request from emailJan Provaznik2017-12-0514-51/+67
| * | | | | | | | Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-055-5/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
View Lorry Controller Status