Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'show-status-from-branch' into 'master' | Rémy Coutable | 2016-11-04 | 19 | -43/+139 |
|\ | |||||
| * | Fetch locals to avoid undefined method/local errorshow-status-from-branch | Lin Jen-Shin | 2016-11-04 | 3 | -0/+3 |
| * | Remove author according to the document | Lin Jen-Shin | 2016-11-04 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'upstream/master' into show-status-from-branch | Lin Jen-Shin | 2016-11-04 | 109 | -486/+878 |
| |\ | |||||
| * | | Update for CHANGELOG | Lin Jen-Shin | 2016-11-04 | 2 | -1/+4 |
| * | | Merge remote-tracking branch 'upstream/master' into show-status-from-branch | Lin Jen-Shin | 2016-11-04 | 145 | -862/+3070 |
| |\ \ | |||||
| * | | | There's no such method | Lin Jen-Shin | 2016-11-04 | 1 | -4/+0 |
| * | | | Initialize @statuses in status rather than constructor | Lin Jen-Shin | 2016-11-03 | 1 | -1/+2 |
| * | | | Merge status_for and status, feedback: | Lin Jen-Shin | 2016-11-03 | 5 | -43/+41 |
| * | | | Fix CHANGELOG | Lin Jen-Shin | 2016-11-03 | 1 | -22/+1 |
| * | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branch | Lin Jen-Shin | 2016-11-02 | 497 | -1737/+4374 |
| |\ \ \ | |||||
| * | | | | Always use multiline in view | Lin Jen-Shin | 2016-10-28 | 1 | -1/+2 |
| * | | | | Add tests for Commit#status and Commit#status_for, feedback: | Lin Jen-Shin | 2016-10-28 | 1 | -1/+44 |
| * | | | | It's not used as a public API right now, feedback: | Lin Jen-Shin | 2016-10-28 | 1 | -5/+4 |
| * | | | | Use multi-line conditions in view, feedback: | Lin Jen-Shin | 2016-10-28 | 1 | -1/+2 |
| * | | | | Also pass ref here | Lin Jen-Shin | 2016-10-27 | 1 | -1/+1 |
| * | | | | Also update for default project page, feedback: | Lin Jen-Shin | 2016-10-27 | 3 | -7/+8 |
| * | | | | Still show status from pipelines, see: | Lin Jen-Shin | 2016-10-27 | 3 | -17/+27 |
| * | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branch | Lin Jen-Shin | 2016-10-26 | 85 | -380/+1634 |
| |\ \ \ \ | |||||
| * | | | | | Be more specific, feedback: | Lin Jen-Shin | 2016-10-25 | 1 | -1/+1 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branch | Lin Jen-Shin | 2016-10-25 | 127 | -680/+1472 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add CHANGELOG entry | Lin Jen-Shin | 2016-10-24 | 1 | -0/+1 |
| * | | | | | | Add a test for showing correct pipeline | Lin Jen-Shin | 2016-10-24 | 1 | -5/+18 |
| * | | | | | | Pass `@ref` along so we know which pipeline to show | Lin Jen-Shin | 2016-10-24 | 13 | -18/+44 |
* | | | | | | | Merge branch 'update-task-list' into 'master' | Rémy Coutable | 2016-11-04 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update deckar01-task_list gem to 1.0.6 | Manuel Rüger | 2016-10-31 | 2 | -3/+3 |
* | | | | | | | | Merge branch 'feature/view-related-serializers' into 'master' | Douwe Maan | 2016-11-04 | 16 | -0/+343 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Simplify implementation of entity serializers | Grzegorz Bizon | 2016-11-04 | 8 | -31/+14 |
| * | | | | | | | | Add tests for deployment and environment entititesfeature/view-related-serializers | Grzegorz Bizon | 2016-11-04 | 2 | -0/+38 |
| * | | | | | | | | Add tests for serialization entities, add user entity | Grzegorz Bizon | 2016-11-04 | 6 | -2/+76 |
| * | | | | | | | | Refine build entity tests a little | Grzegorz Bizon | 2016-11-04 | 1 | -2/+4 |
| * | | | | | | | | Expose commit author if author exists | Grzegorz Bizon | 2016-11-04 | 2 | -5/+8 |
| * | | | | | | | | Fix specs related to deployments and environments | Grzegorz Bizon | 2016-11-03 | 3 | -5/+7 |
| * | | | | | | | | Exclude project information from environment entity | Grzegorz Bizon | 2016-11-03 | 1 | -1/+0 |
| * | | | | | | | | Add basic tests for build entity used by serialzier | Grzegorz Bizon | 2016-11-03 | 1 | -0/+24 |
| * | | | | | | | | Remove project entity that was part of the PoC | Grzegorz Bizon | 2016-11-03 | 2 | -11/+1 |
| * | | | | | | | | Extend tests for environments serializer | Grzegorz Bizon | 2016-11-03 | 2 | -7/+16 |
| * | | | | | | | | Add manual actions for deployment serialization | Grzegorz Bizon | 2016-11-03 | 2 | -1/+6 |
| * | | | | | | | | Remove duplication from build serializer entity | Grzegorz Bizon | 2016-11-03 | 1 | -8/+12 |
| * | | | | | | | | Implement entities needed for environments folders | Grzegorz Bizon | 2016-11-03 | 8 | -27/+93 |
| * | | | | | | | | Use entity request object in environment entity | Grzegorz Bizon | 2016-11-02 | 4 | -18/+22 |
| * | | | | | | | | Add PoC for resource serializers | Grzegorz Bizon | 2016-11-02 | 8 | -0/+140 |
* | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Rémy Coutable | 2016-11-04 | 3 | -8/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/labels-api' | Rémy Coutable | 2016-11-04 | 3 | -8/+17 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Return conflict error in label API when title is taken by group labellabels-api | Douwe Maan | 2016-10-20 | 3 | -8/+17 |
* | | | | | | | | | | | Merge branch 'rs-merge_request_params' into 'master' | Robert Speicher | 2016-11-04 | 1 | -6/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController | Robert Speicher | 2016-11-04 | 1 | -6/+21 |
* | | | | | | | | | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' | Douwe Maan | 2016-11-04 | 20 | -12/+309 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add documentation for the "Only allow merge requests to be merged if all disc... | Rémy Coutable | 2016-11-04 | 4 | -2/+20 |
| * | | | | | | | | | | Complete and improve specs | Rémy Coutable | 2016-11-04 | 4 | -56/+105 |