summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-301-0/+6
|\
| * Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-0/+6
* | Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan2017-10-301-0/+8
|\ \ | |/ |/|
| * remove extra whitespaceBrett Walker2017-10-271-2/+2
| * use a delegate for `username` to be more future friendlyBrett Walker2017-10-271-0/+8
* | Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-271-0/+18
* | Merge branch 'zj-commit-cache' into 'master'Sean McGivern2017-10-272-2/+22
|\ \
| * | Cache commits on the repository modelZeger-Jan van de Weg2017-10-272-2/+22
| |/
* | Merge branch 'ac-k8s-namespace-validator' into 'master'Rémy Coutable2017-10-271-25/+14
|\ \
| * | Add KubernetesService#default_namespace testsac-k8s-namespace-validatorAlessio Caiazza2017-10-261-5/+22
| * | Remove duped testsAlessio Caiazza2017-10-261-28/+0
* | | Merge branch 'non-existing-repo-optimization' into 'master'Douwe Maan2017-10-261-6/+28
|\ \ \
| * | | Avoid calling underlying methods on non-existing reposnon-existing-repo-optimizationAlejandro Rodríguez2017-10-201-6/+28
* | | | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-261-0/+14
|\ \ \ \
| * | | | Validate username/pw for Jiraservice, require them in the APIRobert Schilling2017-10-241-0/+14
| | |_|/ | |/| |
* | | | Added ssh fingerprint, gitlab ci and pages information in an instance configu...Francisco Lopez2017-10-251-0/+109
* | | | Merge branch 'sh-fix-environment-write-ref' into 'master'Grzegorz Bizon2017-10-241-0/+10
|\ \ \ \
| * | | | Fix the writing of invalid environment refssh-fix-environment-write-refStan Hu2017-10-231-0/+10
| | |/ / | |/| |
* | | | Allow configuring new circuitbreaker settings from the UI and APIBob Van Landuyt2017-10-231-1/+12
| |/ / |/| |
* | | Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-201-4/+3
* | | Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-201-0/+15
|\ \ \ | |/ / |/| |
| * | Prevent ApplicationSetting to cache nil valueKamil Trzcinski2017-10-191-0/+15
* | | Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'Sean McGivern2017-10-181-24/+34
|\ \ \
| * | | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-161-24/+34
* | | | Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-175-0/+273
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-171-0/+10
| |\ \ \
| | * | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-161-0/+10
| * | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-171-0/+13
| |\ \ \ \
| | * | | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-171-0/+13
| * | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-174-0/+250
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-121-2/+2
| | * | | | Fix spinach featuresBob Van Landuyt2017-10-111-1/+0
| | * | | | Handle archived projects in the `GroupDescendantsFinder`Bob Van Landuyt2017-10-111-6/+27
| | * | | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1033-240/+1298
| | |\ \ \ \
| | * | | | | Move the `ancestors_upto` to `Project` and `Namespace`Bob Van Landuyt2017-10-102-0/+29
| | * | | | | Use `alias_attribute` & `alias_method` to define parent-methodsBob Van Landuyt2017-10-051-0/+7
| | * | | | | Load counts everywhere we render a group treeBob Van Landuyt2017-10-051-0/+28
| | * | | | | Force parents to be preloaded for building a hierarchyBob Van Landuyt2017-10-051-15/+23
| | * | | | | Always preload all elements in a hierarchy to avoid extra queries.Bob Van Landuyt2017-10-041-2/+19
| | * | | | | Clean up public/private api of `GroupDescendant`Bob Van Landuyt2017-10-041-32/+0
| | * | | | | Rename hierarchies to descendants where applicableBob Van Landuyt2017-10-041-9/+9
| | * | | | | Rename `GroupHierarchy` to `GroupDescendant`Bob Van Landuyt2017-10-041-1/+28
| | * | | | | Handle all cases for merging a hierarchyBob Van Landuyt2017-10-041-0/+11
| | * | | | | Handle case where 2 matches in the same tree are foundBob Van Landuyt2017-10-041-0/+6
| | * | | | | Merge group hierarchies when parents are sharedBob Van Landuyt2017-10-041-0/+68
| | * | | | | Add a concern to build hierarchies of groupsBob Van Landuyt2017-10-041-0/+61
* | | | | | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-171-10/+4
|/ / / / / /
* | | | | | Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int...Grzegorz Bizon2017-10-161-4/+27
|\ \ \ \ \ \
| * | | | | | Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retriedSean McGivern2017-10-161-4/+27
* | | | | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-161-1/+1
|\ \ \ \ \ \ \
View Lorry Controller Status