summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serviceShinya Maeda2017-10-077-41/+48
|\
| * Improve redirect uri state and fix all remaining testsKamil Trzcinski2017-10-067-41/+48
* | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0787-270/+2102
|\ \ | |/ |/|
| * Merge branch 'api-sentry-extra' into 'master'Douwe Maan2017-10-063-3/+31
| |\
| | * Send API parameters as extra data for sentry errorsapi-sentry-extraAlejandro Rodríguez2017-10-053-3/+31
| * | Merge branch 'valid-branch-name-dash-bug' into 'master'Sean McGivern2017-10-063-1/+11
| |\ \
| | * | Prevent branches or tags from starting with invalid characters (e.g. -, .)valid-branch-name-dash-bugJacob Schatz2017-10-053-1/+11
| * | | Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into 'ma...Douwe Maan2017-10-0628-20/+828
| |\ \ \
| | * | | Add more specs.36829-gpg-commit-not-verified-if-signed-with-a-subkeyRubén Dávila2017-10-056-14/+203
| | * | | Small refactor and fix for RuboCopRubén Dávila2017-10-052-8/+7
| | * | | Don't call update signature worker when there aren't subkeysRubén Dávila2017-10-051-1/+4
| | * | | Convert migrations to generate subkeys to a background migrationRubén Dávila2017-10-053-18/+32
| | * | | Invalidate GpgSignatures associated to GpgKeySubkeys when revoking the GpgKeyRubén Dávila2017-10-056-3/+66
| | * | | Address some feedback from last code reviewRubén Dávila2017-10-056-6/+15
| | * | | Remove no longer required methodsRubén Dávila2017-10-051-10/+0
| | * | | Convert migration to a post deployment migrationRubén Dávila2017-10-051-0/+0
| | * | | Add CHANGELOG entryRubén Dávila2017-10-051-0/+5
| | * | | Add migration to generate GpgKeySubkeys records and update signaturesRubén Dávila2017-10-051-0/+59
| | * | | Fix some broken specsRubén Dávila2017-10-052-3/+3
| | * | | Address feedback from last code reviewRubén Dávila2017-10-056-16/+16
| | * | | Consider GPG subkeys when trying to update invalid GPG signaturesRubén Dávila2017-10-051-1/+2
| | * | | Remove unused associationRubén Dávila2017-10-051-1/+0
| | * | | Add more specs to cover subkeys scenariosRubén Dávila2017-10-054-0/+252
| | * | | Add some basic specs and refactor model and validationsRubén Dávila2017-10-0510-11/+114
| | * | | Add missing DOWNTIME declarationRubén Dávila2017-10-051-0/+2
| | * | | Render GPG subkeys on index pageRubén Dávila2017-10-054-1/+19
| | * | | Associate GgpSignature with GpgKeySubkey if comes from a subkeyRubén Dávila2017-10-056-13/+56
| | * | | Add ability to include subkeys when finding by fingerprintRubén Dávila2017-10-052-1/+12
| | * | | Refactor the extraction and generation of GPG subkeysRubén Dávila2017-10-052-21/+5
| | * | | Use a separate model to handle GPG subkeysRubén Dávila2017-10-055-12/+22
| | * | | Delegate #key to parent when working with a GPG subkeyRubén Dávila2017-10-051-0/+5
| | * | | Process and create subkeys when a new GPG key is createdRubén Dávila2017-10-054-2/+51
| * | | | Merge branch 'rc/fix-flaky_example' into 'master'Grzegorz Bizon2017-10-0610-142/+507
| |\ \ \ \
| | * | | | Add new RSpecFlaky::FlakyExamplesCollection and RSpecFlaky::Config classesRémy Coutable2017-10-066-36/+250
| | * | | | Improve the flaky examples detection jobsRémy Coutable2017-10-042-11/+14
| | * | | | Ensure RSpecFlaky doesn't automatically update flaky examplesRémy Coutable2017-10-044-120/+268
| * | | | | Merge branch '38846-fix-ee_compat_check_for-forks' into 'master'Sean McGivern2017-10-062-4/+7
| |\ \ \ \ \
| | * | | | | Fix the ee_compat_check task for forksRémy Coutable2017-10-062-4/+7
| * | | | | | Merge branch 'workhorse-update' into 'master'Douwe Maan2017-10-061-1/+1
| |\ \ \ \ \ \
| | * | | | | | Update required Workhorse version to v3.2.0workhorse-updateAlejandro Rodríguez2017-10-051-1/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch '38845-skip-loading-english-frontend-translation-file' into 'mas...Phil Hughes2017-10-062-1/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Made the insertion of the English Translation File conditional + removed wind...38845-skip-loading-english-frontend-translation-fileTim Zallmann2017-10-062-1/+2
| * | | | | | Merge branch '38696-fix-project-snippets-breadcrumb-link' into 'master'Rémy Coutable2017-10-062-1/+6
| |\ \ \ \ \ \
| | * | | | | | Fix project snippets breadcrumb linkMark Fletcher2017-10-032-1/+6
| * | | | | | | Merge branch 'docs/update-ruby-to-2-3-5-in-installation--and-update-guides' i...Sean McGivern2017-10-062-3/+359
| |\ \ \ \ \ \ \
| | * | | | | | | Update Ruby to 2.3.5 in installation and update guidesRémy Coutable2017-10-062-3/+359
| * | | | | | | | Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master'Grzegorz Bizon2017-10-0619-6/+148
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Improve pipeline optimistic locking implementationbackstage/gb/move-some-pipelines-code-from-ee-to-eeGrzegorz Bizon2017-10-051-2/+3
| | * | | | | | | Remove a redundant empty line in js pipelines specsGrzegorz Bizon2017-10-051-1/+0
| | * | | | | | | Fix frotnend pipeline specs for pipeline error badgeGrzegorz Bizon2017-10-051-1/+2
View Lorry Controller Status