summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher2016-05-192-15/+22
|\
| * Minor runner-related code refactoringsGrzegorz Bizon2016-05-191-9/+10
| * Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-191-10/+16
| * Improve displaying validation messages for runnerGrzegorz Bizon2016-05-191-1/+0
| * Add custom validator to runner modelGrzegorz Bizon2016-05-191-1/+2
* | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-191-0/+59
|\ \ | |/ |/|
| * Create pipeline objects with parameterswith-pipeline-viewKamil Trzcinski2016-05-181-2/+2
| * Use pipelines.errors when communicating the errorKamil Trzcinski2016-05-181-8/+6
| * Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-169-16/+108
| |\
| * | Improve the pipelines designKamil Trzcinski2016-05-161-1/+1
| * | Remove testing delegateKamil Trzcinski2016-05-141-2/+2
| * | Fix specsKamil Trzcinski2016-05-141-3/+0
| * | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-1314-11/+83
| |\ \
| * | | Fix CI testsKamil Trzcinski2016-05-121-3/+5
| * | | Improve pipelines designKamil Trzcinski2016-05-101-48/+17
| * | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-0914-73/+113
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-04-2622-93/+155
| |\ \ \ \
| * | | | | Improve pipeline viewKamil Trzcinski2016-04-131-0/+5
| * | | | | Merge branch 'ci-commit-as-pipeline' into with-pipeline-viewKamil Trzcinski2016-04-138-48/+67
| |\ \ \ \ \
| * | | | | | Pipeline viewKamil Trzcinski2016-04-131-35/+21
| * | | | | | Make Pipeline view workKamil Trzcinski2016-04-131-1/+1
| * | | | | | WIPKamil Trzcinski2016-04-131-0/+102
* | | | | | | Merge branch 'project-variables-ui' into 'master' Jacob Schatz2016-05-191-3/+27
|\ \ \ \ \ \ \
| * | | | | | | Project variables UIPhil Hughes2016-05-161-3/+27
* | | | | | | | Merge branch 'docker-registry-view' into 'master' Kamil Trzciński2016-05-181-0/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Verify if registry is enabled in registryKamil Trzcinski2016-05-181-0/+5
| * | | | | | | | Improve code designKamil Trzcinski2016-05-181-2/+4
| * | | | | | | | Provide full test coverage to lib/container_registry API implementationKamil Trzcinski2016-05-171-1/+1
| * | | | | | | | Merge remote-tracking branch 'origin/master' into docker-registry-viewKamil Trzcinski2016-05-167-15/+19
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-151-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Change abilities from container_registry to container_imageKamil Trzcinski2016-05-141-2/+2
| * | | | | | | | | Add TODOKamil Trzcinski2016-05-141-0/+3
| * | | | | | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-141-5/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-141-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-1314-11/+83
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-131-19/+20
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix CI testsKamil Trzcinski2016-05-121-1/+0
| * | | | | | | | | | | | | Added Docker Registry View testsKamil Trzcinski2016-05-091-1/+1
| * | | | | | | | | | | | | Rename image to container_registryKamil Trzcinski2016-05-091-3/+3
| * | | | | | | | | | | | | Rename ImageRegistry to ContainerRegistryKamil Trzcinski2016-05-091-6/+3
| * | | | | | | | | | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-0914-61/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | WIPKamil Trzcinski2016-05-082-28/+31
| * | | | | | | | | | | | | | Implement Container Registry API clientKamil Trzcinski2016-05-041-7/+9
| * | | | | | | | | | | | | | Added docker registry viewKamil Trzcinski2016-05-041-0/+26
* | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix/import-data-issue' into 'master' Rémy Coutable2016-05-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | removed transaction stufffix/import-data-issueJames Lopez2016-05-131-3/+1
| | * | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-data...James Lopez2016-05-125-5/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | more changes based on MR feedbackJames Lopez2016-05-121-1/+1
| | * | | | | | | | | | | | | | | Merge branches 'fix/import-data-issue' and 'master' of gitlab.com:gitlab-org/...James Lopez2016-05-113-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status