summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Collect all users by single query when using Member#add_usersdz-improve-add-users-methodDmitriy Zaporozhets2017-04-281-0/+5
* Merge branch 'remove-invalid-services' into 'master' Douwe Maan2017-04-271-0/+1
|\
| * remove invalid servicesTiago Botelho2017-04-261-0/+1
* | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-271-1/+2
|\ \
| * | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-1/+2
| |/
* | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' Sean McGivern2017-04-271-0/+9
|\ \
| * | Lazily sets UUID in ApplicationSetting for new installationsDouglas Barbosa Alexandre2017-04-261-0/+9
* | | Avoid including the MarkupHelperToon Claes2017-04-271-2/+1
* | | Refactor MarkupHelperDouwe Maan2017-04-271-1/+1
* | | Cache the rendered README, but post-process on showToon Claes2017-04-271-5/+10
* | | Add username to activity atom feed (!10802)winniehell2017-04-261-1/+1
|/ /
* | Merge branch 'backport-md-cache-fix' into 'master' Dmitriy Zaporozhets2017-04-261-1/+3
|\ \
| * | Swap a before_save call with a before_create/before_update pair to avoid a co...Nick Thomas2017-04-251-1/+3
* | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-261-0/+2
| |/ |/|
* | Show correct size when MR diff overflowsSean McGivern2017-04-252-9/+10
|/
* Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-242-1/+9
|\
| * Ensure replying to an individual note by email creates a note with its own di...dm-fix-individual-notes-reply-attributesDouwe Maan2017-04-242-1/+9
* | Merge branch 'sh-optimize-duplicate-routable-full-path' into 'master' Sean McGivern2017-04-241-2/+13
|\ \
| * | Cache Routable#full_path in RequestStore to reduce duplicate route loadssh-optimize-duplicate-routable-full-pathStan Hu2017-04-241-2/+13
| |/
* | Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-241-6/+10
|\ \
| * | Use a better performing query to find all MRs for pipelineToon Claes2017-04-241-7/+5
| * | Properly expire cache for **all** MRs of a pipelineToon Claes2017-04-241-2/+8
| |/
* | Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-241-0/+4
|\ \ | |/ |/|
| * Fix missing pipeline duration for blocked pipelinesGrzegorz Bizon2017-04-211-0/+4
* | Merge branch '30672-versioned-markdown-cache' into 'master' Douwe Maan2017-04-211-58/+68
|\ \
| * | Start versioning cached markdown fieldsNick Thomas2017-04-211-33/+68
| * | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-211-25/+0
* | | Merge branch 'dz-cleanup-add-users' into 'master' Douwe Maan2017-04-215-29/+21
|\ \ \ | |_|/ |/| |
| * | Refactor add_users method for project and groupdz-cleanup-add-usersDmitriy Zaporozhets2017-04-215-29/+21
| |/
* | Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215Lin Jen-Shin2017-04-216-12/+12
|\ \ | |/
| * Merge branch 'dz-refactor-create-members' into 'master' Douwe Maan2017-04-201-1/+1
| |\
| | * Refactor controller code that creates project/group membersDmitriy Zaporozhets2017-04-171-1/+1
| * | Merge branch 'uassign_on_member_removing' into 'master' Sean McGivern2017-04-201-8/+5
| |\ \
| | * | Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removingValery Sizov2017-04-201-3/+3
| | * | Remove assigned_(issues|merge_requests) methods from the issuableValery Sizov2017-04-181-5/+2
| | |/
| * | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-191-0/+2
| |\ \
| | * | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-181-0/+2
| * | | Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-192-2/+2
| |\ \ \
| | * | | Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-192-2/+2
| * | | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-191-1/+2
| |\ \ \ \
| | * | | | Fix method visibilitySean McGivern2017-04-141-2/+0
| | * | | | Remove unused user activities codeSean McGivern2017-04-141-4/+0
| | * | | | Port 'Add user activities API' to CESean McGivern2017-04-141-3/+1
| | * | | | Remove user activities table and use redis instead of PG for recording activi...James Lopez2017-04-142-21/+8
| | * | | | Add user activity service and spec. Also added relevant - NOT offline - migra...James Lopez2017-04-142-0/+21
| | * | | | Port 'Add EE usage ping' to CESean McGivern2017-04-141-1/+2
| | | |_|/ | | |/| |
* | | | | Fix Error 500 when referencing issue with project in pending deletesh-fix-issue-31215Stan Hu2017-04-201-1/+1
|/ / / /
* | | | Fix active user countJames Lopez2017-04-191-1/+1
| |/ / |/| |
* | | disables test settings on chat notification services when repository is empty31009-disable-test-settings-on-services-when-repository-is-emptyTiago Botelho2017-04-181-1/+1
* | | Use DeleteUserWorker for removing users via spam logssh-use-delete-worker-spam-logsStan Hu2017-04-171-2/+2