summaryrefslogtreecommitdiff
path: root/app/models/concerns
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-201-0/+1
|\
| * Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+1
* | Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-151-1/+5
|/
* Add externalized stringsGeorge Andrinopoulos2017-11-111-1/+1
* Move total time spend calculation to milestoneishGeorge Andrinopoulos2017-11-111-0/+8
* Always return full avatar URL for private/internal groups/projects when asset...Douwe Maan2017-11-091-7/+18
* Refactor issuables index actionsJarka Kadlecova2017-11-071-0/+2
* Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-061-2/+2
|\
| * updated the ignore_column concern to support multiple columnsmicael.bergeron2017-11-061-2/+2
* | Use Gitlab::Git operations for repository mirroringce-gitlab-git-backportAlejandro Rodríguez2017-11-031-32/+0
|/
* CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-022-4/+2
* Load participants asyncEric Eastwood2017-10-311-0/+2
* 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
| |\ \ | | |/
View Lorry Controller Status