summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor template selector in issuable formrefactor-issuable-form-template_selectorRémy Coutable2016-11-044-44/+68
* 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
| * | | | Complete and improve specsRémy Coutable2016-11-044-56/+105
| * | | | Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-0416-8/+238
* | | | | Merge branch 'zj-grapify-project-hooks' into 'master' Rémy Coutable2016-11-041-84/+69
|\ \ \ \ \
| * | | | | Move shared params to a helperzj-grapify-project-hooksZ.J. van de Weg2016-11-041-39/+19
| * | | | | GrapeDSL for project hooksZ.J. van de Weg2016-11-041-69/+74
* | | | | | Merge branch '22588-todos-filter-shows-all-users' into 'master' Sean McGivern2016-11-047-10/+74
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix: Todos Filter Shows All Users22588-todos-filter-shows-all-usersValery Sizov2016-11-047-10/+74
* | | | | | Merge branch '23961-can-t-share-project-with-groups' into 'master' Robert Speicher2016-11-042-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Only skip group when it's actually a group in the "Share with group" select23961-can-t-share-project-with-groupsRémy Coutable2016-11-042-1/+5
| |/ / / /
* | | | | Merge branch 'rs-update-rdoc' into 'master' Robert Speicher2016-11-044-25/+3
|\ \ \ \ \
| * | | | | Update rdoc to `~> 4.2`rs-update-rdocRobert Speicher2016-11-032-3/+3
| * | | | | Remove unused `gitlab:generate_docs` Rake taskrs-remove-sdocRobert Speicher2016-11-034-22/+0
* | | | | | Merge branch 'backport-ee-js-groups-api' into 'master' Robert Speicher2016-11-047-16/+33
|\ \ \ \ \ \
| * | | | | | Backport Group API code that was added in EE onlybackport-ee-js-groups-apiRémy Coutable2016-10-317-16/+33
* | | | | | | Merge branch '24056-guest-sees-some-project-details-and-gets-404' into 'master' Sean McGivern2016-11-043-1/+20
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix: Guest sees some repository details and gets 404Valery Sizov2016-11-043-1/+20
* | | | | | | Merge branch '24059-round-robin-repository-storage' into 'master' Douwe Maan2016-11-0416-25/+147
|\ \ \ \ \ \ \
| * | | | | | | Add changelog entryNick Thomas2016-11-041-0/+4
| * | | | | | | Document multiple repository storage pathsNick Thomas2016-11-043-1/+6
| * | | | | | | Allow multiple repository storage shards to be enabled, and automatically rou...Nick Thomas2016-11-0412-24/+137
* | | | | | | | Merge branch 'clarify-nginx-installation' into 'master' Achilleas Pipinellis2016-11-041-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | add reminder to check paths in nginx configTim Hogg2016-10-121-1/+5
* | | | | | | | | Merge branch 'fix-docs-links' into 'master' Achilleas Pipinellis2016-11-046-33/+34
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Change a bunch of doc links to either relative or https://docs.gitlab.com.fix-docs-linksConnor Shea2016-11-036-33/+34
* | | | | | | | | Merge branch '22947-fix_issues_atom_feed_url' into 'master' Rémy Coutable2016-11-0411-12/+104
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Issues atom feed url reflect filters on dashboard22947-fix_issues_atom_feed_urlLucas Deschamps2016-11-0311-12/+104
| | |_|_|_|/ / / / | |/| | | | | | |
View Lorry Controller Status