summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-181-0/+2
|\
| * Allow naming U2F devices.Timothy Andrew2016-08-181-0/+2
* | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-172-0/+16
|\ \
| * | Hooked the frontend services up with the backendPhil Hughes2016-08-171-10/+0
| * | Added simulate drag JS for testsPhil Hughes2016-08-171-0/+1
| * | Added vue-resource to get & save dataPhil Hughes2016-08-171-0/+10
| * | Hooked up JS to allow issues to be moved between columnsPhil Hughes2016-08-171-0/+1
| * | Move action to render board lists to `Projects::Boards::ListsController`Douglas Barbosa Alexandre2016-08-171-1/+1
| * | Move board related controllers to the `Boards` namespaceDouglas Barbosa Alexandre2016-08-171-6/+8
| * | Add an endpoint to generate the default lists for a boardDouglas Barbosa Alexandre2016-08-171-0/+4
| * | Move endpoint to list issues under lists resourcesDouglas Barbosa Alexandre2016-08-171-2/+5
| * | Add endpoint to allow users to move issues between listsDouglas Barbosa Alexandre2016-08-171-1/+1
| * | Add endpoint to list issues for a specific board listDouglas Barbosa Alexandre2016-08-171-0/+1
| * | Add endpoint to allow users to remove listsDouglas Barbosa Alexandre2016-08-171-1/+1
| * | Add endpoint to allow users to move listsDouglas Barbosa Alexandre2016-08-171-1/+1
| * | Add endpoint to allow users to create a new board listDouglas Barbosa Alexandre2016-08-171-1/+3
| * | Initial issues board pageDouglas Barbosa Alexandre2016-08-171-0/+2
| |/
* | Merge branch 'mc-ui'Douwe Maan2016-08-171-0/+2
|\ \
| * \ Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-171-1/+11
| |\ \ | | |/
| * | Merge branch 'master' into mc-uiDouwe Maan2016-08-151-1/+4
| |\ \
| * | | Remove undo endpointSean McGivern2016-08-121-1/+0
| * | | REMOVE THIS COMMIT: allow undoing last resolutionSean McGivern2016-08-121-0/+1
| * | | Allow resolving conflicts in MR controllerSean McGivern2016-08-121-0/+1
| * | | Added routes for conflicts in merge requests page.Fatih Acet2016-08-121-0/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Annabel Dunstone2016-08-161-0/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-161-0/+5
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-1616-125/+233
|\ \ \ \ | |/ / /
| * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-151-1/+6
| |\ \ \ | | |_|/ | |/| |
| | * | Allow `Issue` to be submitted as spamPatricio Cano2016-08-151-0/+1
| | * | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-1/+5
| | |/
| * | Add coverage report badge metadata classGrzegorz Bizon2016-08-151-1/+4
| |/
| * Instrument Project.visible_to_userYorick Peterse2016-08-121-0/+3
| * Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-111-2/+2
| |\
| | * Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-111-2/+2
| * | Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-113-7/+23
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...Jacob Vosmaer2016-08-099-37/+78
| | |\
| | * | Handle custom Git LFS content typeJacob Vosmaer2016-07-221-0/+7
| | * | Remove obsolete codeJacob Vosmaer2016-07-221-3/+0
| | * | Add LFS controllersJacob Vosmaer2016-07-221-4/+16
| * | | Merge branch 'decouple-secret-keys' into 'master' Douwe Maan2016-08-101-33/+70
| |\ \ \
| | * | | Ignore Rails/Exit cop in initializerSean McGivern2016-08-041-1/+1
| | * | | Clarify intentions of secret token initializerSean McGivern2016-08-031-35/+55
| | * | | Give priority to environment variablesSean McGivern2016-08-031-4/+20
| | * | | Store all secret keys in secrets.ymlSean McGivern2016-08-031-24/+16
| | * | | Store OTP secret key in secrets.ymlSean McGivern2016-08-031-36/+45
| * | | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-095-46/+62
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Added Redis Sentinel support documentationGabriel Mazetto2016-08-041-1/+1
| | * | | Synced mail_room.yml with the one in omnibusGabriel Mazetto2016-08-041-0/+4
| | * | | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-041-16/+16
| | * | | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-041-1/+1
View Lorry Controller Status