summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-252-7/+1
* Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-0/+57
* Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+5
* Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-191-0/+6
|\
| * Fix cron job keyexpiration-date-on-membershipsDouwe Maan2016-08-191-3/+3
| * Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-192-0/+10
| |\
| * \ Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-181-1/+2
| |\ \
| * \ \ Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-181-0/+2
| |\ \ \
| * | | | Allow project group links to be expiredSean McGivern2016-08-181-0/+3
| * | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1814-100/+219
| |\ \ \ \
| * | | | | Add worker which removes expired members.Adam Niedzielski2016-08-041-0/+3
* | | | | | Merge branch 'ace-ventura' into 'master' Jacob Schatz2016-08-191-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Only load Ace on Snippets and file edit pages.Connor Shea2016-08-181-0/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-192-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-181-0/+2
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-172-0/+19
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-161-2/+15
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1212-91/+169
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-034-7/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-07-285-25/+37
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Correctly resolves/unresolves discussionsPhil Hughes2016-07-261-1/+1
| * | | | | | | convert CS to JSPhil Hughes2016-07-261-1/+1
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejsPhil Hughes2016-07-263-2/+16
| |\ \ \ \ \ \ \
| * | | | | | | | Add endpoints to resolve diff notes and discussionsDouwe Maan2016-07-251-4/+8
| * | | | | | | | Resolve all endpointPhil Hughes2016-07-241-0/+4
| * | | | | | | | Posts to rails to update note eventuallyPhil Hughes2016-07-241-0/+1
| * | | | | | | | Diff line comments resolvePhil Hughes2016-07-241-0/+1
* | | | | | | | | Small refactor and syntax fixes.2fa-api-checkPatricio Cano2016-08-181-1/+1
* | | | | | | | | Removed unnecessary service for user retrieval and improved API error message.Patricio Cano2016-08-181-1/+2
* | | | | | | | | Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner P...Patricio Cano2016-08-181-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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
| |\ \ \ \ \ \ \
View Lorry Controller Status