summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-182-1/+3
|\ | | | | | | | | Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922
| * Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-176-5/+157
| |\
| * | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-172-1/+3
| | | | | | | | | | | | | | | Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209
* | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-181-7/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900
| * | Fix specAnnabel Dunstone Gray2017-10-161-1/+0
| | |
| * | Add readme only option as project viewAnnabel Dunstone Gray2017-10-161-7/+3
| |/
* | Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-171-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix errors when deleting a forked project Closes #39196 See merge request gitlab-org/gitlab-ce!14916
| * | Fix errors when deleting a forked projectBob Van Landuyt2017-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem would occur when the `ForkedProjectLink` was deleted, but the `ForkNetworkMember` was not. The delete would be rolled back and retried. But the error would not be saved because `Project#forked?` would still be true, because the `ForkNetworkMember` exists. But the `Project#forked_project_link` would be `nil`. So the validation for the visibility level would fail.
* | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-171-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1 Closes #34728 See merge request gitlab-org/gitlab-ce!14718
| * | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-161-0/+2
| | |
* | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-171-0/+7
|\ \ \ | | | | | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
| * | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-171-0/+7
| | |/ | |/|
* | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-4/+147
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * | Update preloaded count queries for MySQLBob Van Landuyt2017-10-121-3/+3
| | |
| * | Use Arel to build preloaded countsBob Van Landuyt2017-10-121-48/+45
| | |
| * | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-121-3/+3
| | |
| * | Handle archived projects in the `GroupDescendantsFinder`Bob Van Landuyt2017-10-111-11/+21
| | |
| * | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1041-116/+524
| |\ \
| * | | Don't preload all memberships for a userBob Van Landuyt2017-10-101-9/+0
| | | |
| * | | Move the `ancestors_upto` to `Project` and `Namespace`Bob Van Landuyt2017-10-103-10/+25
| | | |
| * | | Use `alias_attribute` & `alias_method` to define parent-methodsBob Van Landuyt2017-10-051-8/+2
| | | |
| * | | Optimize finding a membership for a user to avoid extra queriesBob Van Landuyt2017-10-051-0/+9
| | | |
| * | | Load counts everywhere we render a group treeBob Van Landuyt2017-10-052-0/+66
| | | |
| * | | Force parents to be preloaded for building a hierarchyBob Van Landuyt2017-10-051-5/+11
| | | |
| * | | Move merging of Hashes out of the `GroupDescendant` concernBob Van Landuyt2017-10-041-53/+4
| | | | | | | | | | | | | | | | Since it can technically merge any hash with objects that respond to `==`
| * | | Return an empty array when no matches are foundBob Van Landuyt2017-10-041-1/+1
| | | |
| * | | Always preload all elements in a hierarchy to avoid extra queries.Bob Van Landuyt2017-10-041-3/+12
| | | |
| * | | Clean up public/private api of `GroupDescendant`Bob Van Landuyt2017-10-041-24/+22
| | | | | | | | | | | | | | | | So only methods that are used elsewhere are public.
| * | | Only preload ancestors for search results in the specified parentBob Van Landuyt2017-10-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering we want all to preload all the ancestors upto the specified parent group. - root - subgroup - nested-group - project So when searching 'project', on the 'subgroup' page we want to preload 'nested-group' but not 'subgroup' or 'root'
| * | | Minimize the number of queries by preloading counts and ancestorsBob Van Landuyt2017-10-042-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By preloading the count of members, projects and subgroups of a group, we don't need to query them later. We also preload the entire hierarchy for a search result and include the counts so we don't need to query for them again
| * | | Rename hierarchies to descendants where applicableBob Van Landuyt2017-10-041-20/+20
| | | |
| * | | Keep the `parent` method in `Project`Bob Van Landuyt2017-10-042-8/+4
| | | |
| * | | Rename `GroupHierarchy` to `GroupDescendant`Bob Van Landuyt2017-10-043-18/+14
| | | |
| * | | Handle all cases for merging a hierarchyBob Van Landuyt2017-10-041-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The possible cases are: - [Array, Array] - [Array, Hash] - [Array, GroupHierarchy] - [Hash,Hash] - [Hash, GroupHierarchy] - [GroupHierarchy, GroupHierarchy]
| * | | Handle case where 2 matches in the same tree are foundBob Van Landuyt2017-10-041-1/+6
| | | |
| * | | Merge group hierarchies when parents are sharedBob Van Landuyt2017-10-041-2/+45
| | | |
| * | | Add a concern to build hierarchies of groupsBob Van Landuyt2017-10-043-0/+29
| | | |
* | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-161-11/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
| * | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
| * | | | Clean hierarchy of calls between models and Gitalb::Git for blob searchAlejandro Rodríguez2017-10-121-3/+1
| | | | |
* | | | | Popen with a timeoutAndrew Newdigate2017-10-161-1/+1
| | | | |
* | | | | Merge branch ↵Kamil Trzciński2017-10-161-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master' Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count` Closes #38960 See merge request gitlab-org/gitlab-ce!14807
| * | | | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, ↵fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-111-0/+3
| | |_|/ | |/| | | | | | | | | | instead of `Gcp::Cluster.count`
* | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-131-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | added date parameter for time tracking See merge request gitlab-org/gitlab-ce!14866
| * | | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-131-2/+7
| | |/ / | |/| |
* | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-131-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Make "merge ongoing" check more consistent Closes #39032 See merge request gitlab-org/gitlab-ce!14825
| * | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-131-1/+1
| | | |
| * | | Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-111-1/+1
| |/ /
* | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-122-3/+18
|\ \ \ | | | | | | | | | | | | | | | | Cache issuable template names See merge request gitlab-org/gitlab-ce!14823
| * | | Cache issuable template namesSean McGivern2017-10-121-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were looking these up on each request to an issue page, because the form is pre-filled, as is the template dropdown. That was unnecessary: we could just treat these as 'special' repository files (like the rendered README) and cache them in Redis until they change on a push.
View Lorry Controller Status