summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-149-19/+125
* Merge branch 'ci/api-builds' into 'master' Douwe Maan2016-01-149-0/+724
|\
| * Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-buildsTomasz Maczukin2016-01-143-5/+3
| * Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1473-240/+1394
| |\
| * | Remove hard-coded id from builds factoryTomasz Maczukin2016-01-141-2/+1
| * | Modify builds API documentation style [ci skip]Tomasz Maczukin2016-01-131-16/+66
| * | Update CHANGELOG [ci skip]Tomasz Maczukin2016-01-131-0/+1
| * | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1392-520/+1155
| |\ \
| * | | Add seperated 'describe' block for build trace specsTomasz Maczukin2016-01-131-7/+13
| * | | Change :ci_build_canceled factory to :canceled traitTomasz Maczukin2016-01-132-5/+5
| * | | Add some fixes after reviewTomasz Maczukin2016-01-134-51/+21
| * | | Add some fixesTomasz Maczukin2016-01-122-2/+1
| * | | Fix doc/api/builds.mdTomasz Maczukin2016-01-121-41/+19
| * | | Fix :ci_build_with_trace factoryTomasz Maczukin2016-01-111-1/+3
| * | | Add TODO notice to build trace feature in CI APITomasz Maczukin2016-01-111-0/+4
| * | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-11298-1015/+3221
| |\ \ \
| * | | | Update ./doc/api/builds.mdTomasz Maczukin2016-01-112-70/+234
| * | | | Change commit builds URL in builds APITomasz Maczukin2016-01-112-5/+5
| * | | | Add some modifications to builds API and specsTomasz Maczukin2016-01-082-5/+5
| * | | | Change test access level from MASTER to DEVELOPERTomasz Maczukin2016-01-081-1/+1
| * | | | Modify entities for builds APITomasz Maczukin2016-01-083-25/+29
| * | | | Modify builds scope filtering in builds APITomasz Maczukin2016-01-084-16/+39
| * | | | Update ./doc/api/Tomasz Maczukin2016-01-053-1/+209
| * | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-05115-1720/+1067
| |\ \ \ \
| * | | | | Remove incorrect 'default' values from method descriptionTomasz Maczukin2015-12-311-2/+2
| * | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2015-12-30123-275/+3221
| |\ \ \ \ \
| * | | | | | Add cancel/retry features to builds APITomasz Maczukin2015-12-302-1/+65
| * | | | | | Add specs for build details/traces features in builds APITomasz Maczukin2015-12-302-2/+44
| * | | | | | Add specs for build listings in APITomasz Maczukin2015-12-292-3/+58
| * | | | | | Remove changes in 'paginate' helperTomasz Maczukin2015-12-281-4/+2
| * | | | | | Add cancel/retry endpoints to build APITomasz Maczukin2015-12-281-0/+40
| * | | | | | Add 'not_found' notifications in build/trace detailsTomasz Maczukin2015-12-281-2/+6
| * | | | | | Add endpoint for getting builds for a specific commitTomasz Maczukin2015-12-281-12/+26
| * | | | | | Modify build pagination to use 'paginate' helperTomasz Maczukin2015-12-282-6/+5
| * | | | | | Add some fixes to builds APITomasz Maczukin2015-12-282-20/+27
| * | | | | | Fix example request urlTomasz Maczukin2015-12-241-1/+1
| * | | | | | Add builds API (listing, showing trace)Tomasz Maczukin2015-12-243-0/+95
* | | | | | | Merge branch 'add-pagination-headers-to-api' into 'master' Dmitriy Zaporozhets2016-01-145-12/+49
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into add-pag...Rémy Coutable2016-01-14148-729/+2131
| |\ \ \ \ \ \ \
| * | | | | | | | Revert changes to how the notes are paginated in the APIRémy Coutable2016-01-141-3/+9
| * | | | | | | | Add pagination headers to already paginated API resourcesadd-pagination-headers-to-apiRémy Coutable2016-01-146-21/+52
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-1434-135/+633
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-1423-49/+452
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix parse_gollum_tags matcherDouglas Barbosa Alexandre2016-01-141-2/+2
| | * | | | | | | | | Update documentation on Banzai::Filter::GollumTagsFilterDouglas Barbosa Alexandre2016-01-141-2/+38
| | * | | | | | | | | Add tests for the wiki pipelineDouglas Barbosa Alexandre2016-01-144-5/+89
| | * | | | | | | | | Refactoring Banzai::Filter::GollumTagsFilterDouglas Barbosa Alexandre2016-01-142-23/+28
| | * | | | | | | | | Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatterDouglas Barbosa Alexandre2016-01-142-3/+3
| | * | | | | | | | | Remove GollumTagsPipelineDouglas Barbosa Alexandre2016-01-142-15/+4
| | * | | | | | | | | Refactoring Gitlab::GithubImport::ImporterDouglas Barbosa Alexandre2016-01-141-7/+13