summaryrefslogtreecommitdiff
path: root/app/models/concerns
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-172-0/+128
|\
| * Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-172-0/+128
| |\
| | * 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-109-26/+63
| | |\
| | * | Move the `ancestors_upto` to `Project` and `Namespace`Bob Van Landuyt2017-10-101-10/+11
| | * | Load counts everywhere we render a group treeBob Van Landuyt2017-10-051-0/+65
| | * | 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
| | * | 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
| | * | Only preload ancestors for search results in the specified parentBob Van Landuyt2017-10-041-1/+2
| | * | Minimize the number of queries by preloading counts and ancestorsBob Van Landuyt2017-10-041-9/+12
| | * | Rename hierarchies to descendants where applicableBob Van Landuyt2017-10-041-20/+20
| | * | Keep the `parent` method in `Project`Bob Van Landuyt2017-10-041-8/+0
| | * | Rename `GroupHierarchy` to `GroupDescendant`Bob Van Landuyt2017-10-041-12/+12
| | * | Handle all cases for merging a hierarchyBob Van Landuyt2017-10-041-12/+32
| | * | 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-041-0/+27
* | | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-171-0/+2
|/ / /
* | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-131-2/+7
| |/ |/|
* | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-101-1/+1
|\ \
| * | Based on MR simplified the logicTim Zallmann2017-10-091-2/+2
| * | Updates based on MR commentsTim Zallmann2017-10-051-5/+3
| * | Fixed Linting errors + testsTim Zallmann2017-10-041-4/+2
| * | Created group_icon and group_icon_urlTim Zallmann2017-10-041-1/+1
| * | Making private project avatars use local paths + Some Group IconsTim Zallmann2017-10-041-5/+9
| |/
* | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-17/+10
* | Include the changes in issuable webhook payloadsRémy Coutable2017-10-091-1/+7
* | Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-073-5/+15
|\ \
| * | Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-063-5/+15
* | | Commenting on image diffsFelipe Artur2017-10-071-0/+4
|/ /
* | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-061-0/+4
|\ \
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-252-18/+21
| |\ \ | | |/
| * | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-141-0/+4
* | | Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master'Grzegorz Bizon2017-10-061-0/+1
|\ \ \
| * | | Add a additional scope related to alive CI/CD statusesGrzegorz Bizon2017-10-051-0/+1
| | |/ | |/|
* | | Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-051-0/+4
|\ \ \
| * | | Redirect to pages daemonZeger-Jan van de Weg2017-10-031-0/+4
| |/ /
* | | No need to rescue Rugged::ConfigError in RepositoryMirroringRémy Coutable2017-10-051-3/+0
* | | Minor improvements after latest reviewRémy Coutable2017-10-051-8/+4
* | | Keep only the changes that are known to work wellRémy Coutable2017-10-051-14/+17
* | | Fetch and map refs/pull to refs/merge-requests in the GH importJames Lopez2017-10-051-2/+21
|/ /
* | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-232-18/+21
|/
* Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-071-4/+0
|\
| * Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-071-4/+0
View Lorry Controller Status