summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Upgrade redis-rails from 4.0.0 to 5.0.1.cs-upgrade-redis-actionpackConnor Shea2016-11-042-17/+17
* Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-0419-43/+139
|\
| * Fetch locals to avoid undefined method/local errorshow-status-from-branchLin Jen-Shin2016-11-043-0/+3
| * Remove author according to the documentLin Jen-Shin2016-11-041-1/+1
| * Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-04109-486/+878
| |\
| * | Update for CHANGELOGLin Jen-Shin2016-11-042-1/+4
| * | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-04145-862/+3070
| |\ \
| * | | There's no such methodLin Jen-Shin2016-11-041-4/+0
| * | | Initialize @statuses in status rather than constructorLin Jen-Shin2016-11-031-1/+2
| * | | Merge status_for and status, feedback:Lin Jen-Shin2016-11-035-43/+41
| * | | Fix CHANGELOGLin Jen-Shin2016-11-031-22/+1
| * | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-02497-1737/+4374
| |\ \ \
| * | | | Always use multiline in viewLin Jen-Shin2016-10-281-1/+2
| * | | | Add tests for Commit#status and Commit#status_for, feedback:Lin Jen-Shin2016-10-281-1/+44
| * | | | It's not used as a public API right now, feedback:Lin Jen-Shin2016-10-281-5/+4
| * | | | Use multi-line conditions in view, feedback:Lin Jen-Shin2016-10-281-1/+2
| * | | | Also pass ref hereLin Jen-Shin2016-10-271-1/+1
| * | | | Also update for default project page, feedback:Lin Jen-Shin2016-10-273-7/+8
| * | | | Still show status from pipelines, see:Lin Jen-Shin2016-10-273-17/+27
| * | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-2685-380/+1634
| |\ \ \ \
| * | | | | Be more specific, feedback:Lin Jen-Shin2016-10-251-1/+1
| * | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-25127-680/+1472
| |\ \ \ \ \
| * | | | | | Add CHANGELOG entryLin Jen-Shin2016-10-241-0/+1
| * | | | | | Add a test for showing correct pipelineLin Jen-Shin2016-10-241-5/+18
| * | | | | | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-2413-18/+44
* | | | | | | Merge branch 'update-task-list' into 'master' Rémy Coutable2016-11-042-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update deckar01-task_list gem to 1.0.6Manuel Rüger2016-10-312-3/+3
* | | | | | | | Merge branch 'feature/view-related-serializers' into 'master' Douwe Maan2016-11-0416-0/+343
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify implementation of entity serializersGrzegorz Bizon2016-11-048-31/+14
| * | | | | | | | Add tests for deployment and environment entititesfeature/view-related-serializersGrzegorz Bizon2016-11-042-0/+38
| * | | | | | | | Add tests for serialization entities, add user entityGrzegorz Bizon2016-11-046-2/+76
| * | | | | | | | Refine build entity tests a littleGrzegorz Bizon2016-11-041-2/+4
| * | | | | | | | Expose commit author if author existsGrzegorz Bizon2016-11-042-5/+8
| * | | | | | | | Fix specs related to deployments and environmentsGrzegorz Bizon2016-11-033-5/+7
| * | | | | | | | Exclude project information from environment entityGrzegorz Bizon2016-11-031-1/+0
| * | | | | | | | Add basic tests for build entity used by serialzierGrzegorz Bizon2016-11-031-0/+24
| * | | | | | | | Remove project entity that was part of the PoCGrzegorz Bizon2016-11-032-11/+1
| * | | | | | | | Extend tests for environments serializerGrzegorz Bizon2016-11-032-7/+16
| * | | | | | | | Add manual actions for deployment serializationGrzegorz Bizon2016-11-032-1/+6
| * | | | | | | | Remove duplication from build serializer entityGrzegorz Bizon2016-11-031-8/+12
| * | | | | | | | Implement entities needed for environments foldersGrzegorz Bizon2016-11-038-27/+93
| * | | | | | | | Use entity request object in environment entityGrzegorz Bizon2016-11-024-18/+22
| * | | | | | | | Add PoC for resource serializersGrzegorz Bizon2016-11-028-0/+140
* | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-11-043-8/+17
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/labels-api'Rémy Coutable2016-11-043-8/+17
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Return conflict error in label API when title is taken by group labellabels-apiDouwe Maan2016-10-203-8/+17
* | | | | | | | | | | Merge branch 'rs-merge_request_params' into 'master' Robert Speicher2016-11-041-6/+21
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Apply `*_params_ce + *_params_ee` pattern to MergeRequestsControllerRobert Speicher2016-11-041-6/+21
* | | | | | | | | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-0420-12/+309
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Add documentation for the "Only allow merge requests to be merged if all disc...Rémy Coutable2016-11-044-2/+20