summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Path could also have slashes! Feedback:Lin Jen-Shin2016-08-241-2/+20
* Use only one before block, feedback:Lin Jen-Shin2016-08-241-2/+0
* Make sure the branch we're testing is on the 1st page!Lin Jen-Shin2016-08-191-2/+2
* Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1952-71/+4408
|\
| * Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-1912-9/+2088
| |\
| | * Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1814-40/+447
| | |\
| | * \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-189-2/+153
| | |\ \
| | * \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1740-21/+3111
| | |\ \ \
| | * | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-174-1/+101
| | * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-174-106/+334
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1677-361/+1831
| | |\ \ \ \ \
| | * | | | | | Add test for jumping between discussions and unhiding toggled discussions.Connor Shea2016-08-161-0/+18
| | * | | | | | Address review feedbackDouwe Maan2016-08-164-81/+109
| | * | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-12260-2942/+4578
| | |\ \ \ \ \ \
| | * | | | | | | Add specs for system note and email when all discussions are resolvedDouwe Maan2016-08-123-0/+111
| | * | | | | | | Add specs for NotesController and DiscussionsControllerDouwe Maan2016-08-122-2/+216
| | * | | | | | | Add specs for Discussion and MergeRequest modelsDouwe Maan2016-08-122-0/+707
| | * | | | | | | Add specs for new Note and DiffNote methods.Douwe Maan2016-08-122-0/+300
| | * | | | | | | Fixed issue with expand diff not initializing resolve buttonsPhil Hughes2016-08-041-1/+2
| | * | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-0378-612/+2199
| | |\ \ \ \ \ \ \
| | * | | | | | | | Updated issues with jump tp buttonPhil Hughes2016-08-011-2/+3
| | * | | | | | | | Tests for not logged in userPhil Hughes2016-07-291-7/+30
| | * | | | | | | | Added tests for hidden jump to buttonPhil Hughes2016-07-291-0/+14
| | * | | | | | | | Hides jump to next button if only one discussion visiblePhil Hughes2016-07-291-0/+12
| | * | | | | | | | Added JS spec tests for CommentsStorePhil Hughes2016-07-293-1/+150
| | * | | | | | | | Correctly cycles the unresolved discussionsPhil Hughes2016-07-291-0/+5
| | * | | | | | | | Fixed failing testsPhil Hughes2016-07-291-10/+2
| | * | | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-07-2841-288/+853
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Updates the text above discussions when resolving notes & discussionsPhil Hughes2016-07-271-2/+48
| | * | | | | | | | | Added tests for resolving comments featurePhil Hughes2016-07-271-0/+358
| * | | | | | | | | | Merge branch '2fa-check-git-http' into 'master' Robert Speicher2016-08-181-0/+39
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Refactor `find_for_git_client` method to not use assignment in conditionals a...Patricio Cano2016-08-171-10/+8
| | * | | | | | | | | | Deny Git over HTTP access to users that have 2FA enabled, unless they use a P...Patricio Cano2016-08-161-0/+41
| * | | | | | | | | | | Merge branch '21028-missing-default-sort-for-users-with-an-existing-cookie' i...Robert Speicher2016-08-181-0/+24
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Handle legacy sort order values21028-missing-default-sort-for-users-with-an-existing-cookieSean McGivern2016-08-181-0/+24
| * | | | | | | | | | | | Merge branch '2fa-api-check' into 'master' Robert Speicher2016-08-182-0/+44
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Small refactor and syntax fixes.2fa-api-checkPatricio Cano2016-08-182-0/+3
| | * | | | | | | | | | | | Removed unnecessary service for user retrieval and improved API error message.Patricio Cano2016-08-181-19/+0
| | * | | | | | | | | | | | Added documentation and CHANGELOG itemPatricio Cano2016-08-182-2/+2
| | * | | | | | | | | | | | Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner P...Patricio Cano2016-08-183-0/+60
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'rs-issue-21017' into 'master' Robert Speicher2016-08-182-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Update Hamlit to 2.6.1rs-issue-21017Robert Speicher2016-08-182-0/+45
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-1820-16/+1715
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Fix behavior around commands with optional arguments4273-slash-commandsDouwe Maan2016-08-182-29/+48
| | * | | | | | | | | | Remove unneeded aliasesDouwe Maan2016-08-186-83/+68
| | * | | | | | | | | | Fix specs and implement fixes based on failing specsDouwe Maan2016-08-172-51/+17
| | * | | | | | | | | | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1677-361/+1831
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | Fixed specs and fixes based on failing specsDouwe Maan2016-08-166-357/+279
| | * | | | | | | | | | Force notes poll after commands have been executedDouwe Maan2016-08-122-13/+13
| | * | | | | | | | | | Refactor slash command definitionDouwe Maan2016-08-121-15/+15
View Lorry Controller Status