summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Truncated user list in award emoji tooltipsJack Davison2016-08-175-3/+49
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-api-endpoints-ci' into 'master' Robert Speicher2016-08-1810-0/+424
|\ \ \ \ \
| * | | | | Do not expose projects on deploymentsZ.J. van de Weg2016-08-182-170/+3
| * | | | | Incorporate feedbackZ.J. van de Weg2016-08-183-10/+9
| * | | | | Docs for API endpointsZ.J. van de Weg2016-08-183-0/+431
| * | | | | Expose project for environmentsZ.J. van de Weg2016-08-182-0/+2
| * | | | | Add deployment endpointsZ.J. van de Weg2016-08-185-1/+114
| * | | | | Add Play endpoints on BuildsZ.J. van de Weg2016-08-183-0/+46
|/ / / / /
* | | | | Merge branch 'boards-spec-improvements' into 'master' Douwe Maan2016-08-182-4/+30
|\ \ \ \ \
| * | | | | Attempted improvement to stop boards spec failingboards-spec-improvementsPhil Hughes2016-08-182-4/+30
* | | | | | Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-1812-24/+128
|\ \ \ \ \ \
| * | | | | | Address review comments from @smcgivern.17334-u2f-device-identifiersTimothy Andrew2016-08-182-10/+10
| * | | | | | Update CHANGELOG.Timothy Andrew2016-08-181-0/+1
| * | | | | | Add feature specs to cover naming and deleting U2F devices.Timothy Andrew2016-08-182-9/+32
| * | | | | | Allow naming U2F devices.Timothy Andrew2016-08-189-13/+93
* | | | | | | Merge branch '20454-edit-button-mr' into 'master' Douwe Maan2016-08-184-12/+31
|\ \ \ \ \ \ \
| * | | | | | | edit_blob_link can receive the blob to avoid access to the repository20454-edit-button-mrPaco Guzman2016-08-184-12/+31
* | | | | | | | Merge branch 'zj-pipelines-api-endpoints' into 'master' Douwe Maan2016-08-188-18/+425
|\ \ \ \ \ \ \ \
| * | | | | | | | Add docs on API for pipelines, plus minor fixeszj-pipelines-api-endpointsZ.J. van de Weg2016-08-184-4/+221
| * | | | | | | | Add endpoints for pipelinesZ.J. van de Weg2016-08-186-18/+208
| |/ / / / / / /
* | | | | | | | Merge branch 'add-merge-conflict-changelog-item' into 'master' Douwe Maan2016-08-181-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add merge conflict resolution to CHANGELOGadd-merge-conflict-changelog-itemSean McGivern2016-08-181-0/+1
* | | | | | | | | Merge branch 'outlook-email-spacing' into 'master' Douwe Maan2016-08-184-3/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix email line-height in Outlookoutlook-email-spacingSean McGivern2016-08-174-3/+12
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-issue-filter-spec' into 'master' Rubén Dávila Santos2016-08-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix broken feature spec.fix-issue-filter-specRuben Davila2016-08-171-1/+1
* | | | | | | | | | Merge branch 'evn-reword-cla' into 'master' Sid Sijbrandij2016-08-181-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove undefined word Corporation from CCLAevn-reword-claernstvn2016-08-161-2/+2
* | | | | | | | | | | Merge branch 'fix/simplify-todo-destroy-queries' into 'master' Yorick Peterse2016-08-184-16/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename TodoService#mark_todos_as_done_by_id{,s}Ahmad Sherif2016-08-183-5/+5
| * | | | | | | | | | | Implement TodoService#mark_todos_as_done_by_idAhmad Sherif2016-08-183-14/+26
| * | | | | | | | | | | Simplify SQL queries of marking a todo as doneAhmad Sherif2016-08-182-4/+3
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'changelog-update' into 'master' Rubén Dávila Santos2016-08-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update changelogAnnabel Dunstone2016-08-171-0/+1
* | | | | | | | | | | Merge branch 'fix/update-gitlab-git' into 'master' Yorick Peterse2016-08-183-3/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update gitlab_git gem to 10.4.7Ahmad Sherif2016-08-183-3/+4
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-3' into 'master' Drew Blessing2016-08-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | The keyword `when` can also take `manual` as a value.Maxime Buquet2016-08-181-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'tab-persistance' into 'master' Rubén Dávila Santos2016-08-185-15/+15
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Refactor to mark Changes tab as active on new MR page.Ruben Davila2016-08-184-14/+5
| * | | | | | | | | Fix failing testtab-persistanceAlfredo Sumaran2016-08-171-4/+7
| * | | | | | | | | Fix tabs navigation and do not update URL via pushstateAlfredo Sumaran2016-08-173-9/+15
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'doc-refactor-description-templates' into 'master' Achilleas Pipinellis2016-08-186-14/+44
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add new image to show the 'Reset template' buttonAchilleas Pipinellis2016-08-182-5/+6
| * | | | | | | | Refactor description templates documentationAchilleas Pipinellis2016-08-185-14/+43
|/ / / / / / / /
* | | | | | | | Merge branch '18141-pipeline-graph' into 'master' Jacob Schatz2016-08-1711-17/+272
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove index from pipeline toggles18141-pipeline-graphAnnabel Dunstone2016-08-172-10/+12
| * | | | | | | Merge master into branchAnnabel Dunstone2016-08-1760-89/+13748
| |\ \ \ \ \ \ \
| * | | | | | | | Move deployable conditional to variable; fix pipelines_specAnnabel Dunstone2016-08-172-3/+8
| * | | | | | | | Update CSS selector and play iconAnnabel Dunstone2016-08-173-4/+4