summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | | | | Merge branch 'use-language-colours-for-graph' into 'master' Sean McGivern2016-10-133-3/+48
|\ \ \ \ \ \ \
| * | | | | | | Fix indentation and change inner matcherGeorg G2016-10-131-5/+5
| * | | | | | | Use test double and matchersGeorg G2016-10-131-6/+7
| * | | | | | | Add spec for Projects::GraphsController#languagesGeorg G2016-10-121-0/+43
| * | | | | | | Use Linguist::Language[] instead of creating a hashGeorg G2016-10-102-5/+2
| * | | | | | | Use defined colour for a language when availableGeorg G2016-10-071-3/+7
* | | | | | | | Merge branch 'rs-loosen-request_store' into 'master' Dmitriy Zaporozhets2016-10-132-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Loosen requirement on request_store versionRobert Speicher2016-10-132-2/+2
* | | | | | | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-1355-303/+528
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated JS to work with issue index & showfeature/issues-boardPhil Hughes2016-10-124-4/+5
| * | | | | | | | | Moved data attribute values into helper methodPhil Hughes2016-10-123-10/+14
| * | | | | | | | | Fixed JS testsPhil Hughes2016-10-114-7/+7
| * | | | | | | | | Updated to pass the board ID with the boards root to save conflicts with EEPhil Hughes2016-10-114-8/+11
| * | | | | | | | | Fix board relates specsDouglas Barbosa Alexandre2016-10-115-16/+13
| * | | | | | | | | Add Project::BoardLimitExcedeed error classDouglas Barbosa Alexandre2016-10-112-2/+4
| * | | | | | | | | Update endpoint path for the frontendPhil Hughes2016-10-112-1/+20
| * | | | | | | | | Fix typo on Boards::Issues::ListService specDouglas Barbosa Alexandre2016-10-111-1/+1
| * | | | | | | | | Remove Boards::BaseServiceDouglas Barbosa Alexandre2016-10-1111-14/+10
| * | | | | | | | | Update Issue Board API to handle with has_many associationDouglas Barbosa Alexandre2016-10-111-14/+17
| * | | | | | | | | Update board specs to use board factory instead of project_with_boardDouglas Barbosa Alexandre2016-10-116-15/+15
| * | | | | | | | | Refactoring service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-114-19/+26
| * | | | | | | | | Add Project#boards to import/export configuration fileDouglas Barbosa Alexandre2016-10-111-1/+1
| * | | | | | | | | Fix links to issue boardsDouglas Barbosa Alexandre2016-10-113-3/+3