summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Try to fix re-runcs-really-fix-spinachKamil Trzcinski2016-10-141-0/+2
* Fix retriesKamil Trzcinski2016-10-141-1/+1
* Re-run specs if failedKamil Trzcinski2016-10-143-1/+5
* Remove spinach retry.Connor Shea2016-10-144-6/+2
* Merge branch 'patch-6' into 'master' Achilleas Pipinellis2016-10-141-1/+1
|\
| * fix grafana_configuration.md move linkBen Bodenmiller2016-10-131-1/+1
* | Merge branch 'zj-show-deployed-time-ago' into 'master' Kamil Trzciński2016-10-1417-65/+282
|\ \
| * | Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-143-12/+33
| * | Added safety check for formatted valuesLuke Bennett2016-10-141-2/+2
| * | Minor style improvementZ.J. van de Weg2016-10-144-16/+28
| * | Fixed conflict and corrected teaspoon testLuke Bennett2016-10-141-2/+3
| * | Rename method in testZ.J. van de Weg2016-10-143-21/+31
| * | Moved ci_status environments logic to new action ci_envrionments_status and s...Luke Bennett2016-10-146-62/+96
| * | Refactor ci_status on MergeRequestControllerZ.J. van de Weg2016-10-145-45/+35
| * | Fix indenting error in HAMLZ.J. van de Weg2016-10-142-3/+3
| * | Show what time ago a MR was deployedZ.J. van de Weg2016-10-1414-53/+202
* | | Merge branch 'fix/reassign-secret-token-on-generate' into 'master' Douwe Maan2016-10-141-2/+2
|\ \ \
| * | | Reassign secret token when regenerating onefix/reassign-secret-token-on-generateGrzegorz Bizon2016-10-131-2/+2
* | | | Merge branch 'grapify-todos-api' into 'master' Rémy Coutable2016-10-141-26/+19
|\ \ \ \
| * | | | Grapify todos APIgrapify-todos-apiRobert Schilling2016-10-141-26/+19
* | | | | Merge branch '15463-extract-update-merge-requests' into 'master' Yorick Peterse2016-10-149-43/+68
|\ \ \ \ \
| * | | | | Extract project#update_merge_requests and SystemHooks to its own worker from ...15463-extract-update-merge-requestsPaco Guzman2016-10-139-43/+68
* | | | | | Merge branch '23332-fix-missing-glossary-link' into 'master' Achilleas Pipinellis2016-10-141-4/+4
|\ \ \ \ \ \
| * | | | | | Fixed missing linksSean Packham2016-10-141-1/+1
| * | | | | | Fixed missing linksSean Packham2016-10-141-4/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'grapify-system-hooks' into 'master' Rémy Coutable2016-10-141-31/+29
|\ \ \ \ \ \
| * | | | | | Grapify system hooks APIgrapify-system-hooksRobert Schilling2016-10-131-31/+29
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'docs/clarify-new-ci-permissions-some-more' into 'master' Achilleas Pipinellis2016-10-141-18/+37
|\ \ \ \ \ \
| * | | | | | Add link to update docs for source installationsAchilleas Pipinellis2016-10-141-1/+2
| * | | | | | Add more info on the new CI permissions modeldocs/clarify-new-ci-permissions-some-moreAchilleas Pipinellis2016-10-131-18/+36
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'docs/refactor-merge-request-revisions' into 'master' Achilleas Pipinellis2016-10-144-10/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Refactor merge requests revisionsAchilleas Pipinellis2016-10-144-10/+20
* | | | | | Merge branch 'docs/add-review-apps-example' into 'master' Achilleas Pipinellis2016-10-142-0/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Link to review apps example from docsAchilleas Pipinellis2016-10-142-0/+3
| |/ / / /
* | | | | Merge branch 'trigger-docs-yaml' into 'master' Achilleas Pipinellis2016-10-131-0/+3
|\ \ \ \ \
| * | | | | Do not run before_script, artifacts, cache in trigger_docs jobtrigger-docs-yamlAchilleas Pipinellis2016-10-131-0/+3
| |/ / / /
* | | | | Merge branch 'remove-unique-keyframes' into 'master' Annabel Dunstone Gray2016-10-133-42/+44
|\ \ \ \ \
| * | | | | Replace unique keyframes mixin with specific keyframe animation namesClement Ho2016-10-133-42/+44
* | | | | | Merge branch 'ce-to-ee-merge-check-rake-task' into 'master' Robert Speicher2016-10-133-0/+118
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Improve the branch existence and merge checksce-to-ee-merge-check-rake-taskRémy Coutable2016-10-133-15/+24
| * | | | | Draft a quick CE->EE merge check rake taskRémy Coutable2016-10-133-0/+109
* | | | | | Merge branch '22655-deployments-don-t-always-have-keep-around-refs' into 'mas...Rémy Coutable2016-10-132-1/+17
|\ \ \ \ \ \
| * | | | | | Handle case where deployment ref no longer exists22655-deployments-don-t-always-have-keep-around-refsSean McGivern2016-10-132-1/+17
* | | | | | | Merge branch 'api-order-mounts' into 'master' Rémy Coutable2016-10-131-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Sort API mountsapi-order-mountsRobert Schilling2016-10-131-4/+4
* | | | | | | | Merge branch '22591-Convert-UTF-8-Emoji-to-Gitlab-emoji' into 'master' Rémy Coutable2016-10-134-8/+141
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-134-20/+43
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-12109-1901/+3553
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-1120-751/+939
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Convert unicode emojis to images.henrik2016-10-118-12/+181