summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Avoid calling underlying methods on non-existing reposnon-existing-repo-optimizationAlejandro Rodríguez2017-10-201-6/+28
* 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
|\ \ \ \ \ \
| * | | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-1/+1
| * | | | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
| * | | | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-121-1/+1
* | | | | | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-161-0/+24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, inste...fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-111-0/+24
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master'Rémy Coutable2017-10-132-7/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factoryJacopo2017-10-132-7/+3
| |/ / / /
* | | | | Merge Merge Requests via GitalyJacob Vosmaer2017-10-131-10/+20
| |_|/ / |/| | |
* | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-131-1/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-131-2/+2
| * | | Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-111-1/+21
| |/ /
* | | Cache issuable template namesSean McGivern2017-10-121-1/+3
|/ /
* | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-101-1/+1
|\ \
| * | Fix for Lint Error + Upload TestTim Zallmann2017-10-091-1/+1
| |/
* | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'Douwe Maan2017-10-093-60/+64
|\ \
| * | Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-dataRémy Coutable2017-10-093-108/+52
| * | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-093-30/+101
| * | Include the changes in issuable webhook payloadsRémy Coutable2017-10-091-23/+12
* | | Don't show an "Unsubscribe" link in snippet comment notificationsRémy Coutable2017-10-091-2/+120
|/ /
* | Merge branch '37552-replace-js-true-with-js' into 'master'Rémy Coutable2017-10-094-21/+21
|\ \
| * | Replaces `tag: true` into `:tag` in the specsJacopo2017-10-074-21/+21
View Lorry Controller Status