Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'diff-line-comment-vuejs' into 'master' | Douwe Maan | 2016-08-19 | 12 | -9/+2088 |
|\ | |||||
| * | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-18 | 14 | -40/+447 |
| |\ | |||||
| * \ | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-18 | 9 | -2/+153 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 40 | -21/+3111 |
| |\ \ \ | |||||
| * | | | | Store discussion_id on Note for faster discussion lookup. | Douwe Maan | 2016-08-17 | 4 | -1/+101 |
| * | | | | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 4 | -106/+334 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-16 | 77 | -361/+1831 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add test for jumping between discussions and unhiding toggled discussions. | Connor Shea | 2016-08-16 | 1 | -0/+18 |
| * | | | | | | Address review feedback | Douwe Maan | 2016-08-16 | 4 | -81/+109 |
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-12 | 260 | -2942/+4578 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add specs for system note and email when all discussions are resolved | Douwe Maan | 2016-08-12 | 3 | -0/+111 |
| * | | | | | | | Add specs for NotesController and DiscussionsController | Douwe Maan | 2016-08-12 | 2 | -2/+216 |
| * | | | | | | | Add specs for Discussion and MergeRequest models | Douwe Maan | 2016-08-12 | 2 | -0/+707 |
| * | | | | | | | Add specs for new Note and DiffNote methods. | Douwe Maan | 2016-08-12 | 2 | -0/+300 |
| * | | | | | | | Fixed issue with expand diff not initializing resolve buttons | Phil Hughes | 2016-08-04 | 1 | -1/+2 |
| * | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-03 | 78 | -612/+2199 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Updated issues with jump tp button | Phil Hughes | 2016-08-01 | 1 | -2/+3 |
| * | | | | | | | | Tests for not logged in user | Phil Hughes | 2016-07-29 | 1 | -7/+30 |
| * | | | | | | | | Added tests for hidden jump to button | Phil Hughes | 2016-07-29 | 1 | -0/+14 |
| * | | | | | | | | Hides jump to next button if only one discussion visible | Phil Hughes | 2016-07-29 | 1 | -0/+12 |
| * | | | | | | | | Added JS spec tests for CommentsStore | Phil Hughes | 2016-07-29 | 3 | -1/+150 |
| * | | | | | | | | Correctly cycles the unresolved discussions | Phil Hughes | 2016-07-29 | 1 | -0/+5 |
| * | | | | | | | | Fixed failing tests | Phil Hughes | 2016-07-29 | 1 | -10/+2 |
| * | | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-07-28 | 41 | -288/+853 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updates the text above discussions when resolving notes & discussions | Phil Hughes | 2016-07-27 | 1 | -2/+48 |
| * | | | | | | | | | Added tests for resolving comments feature | Phil Hughes | 2016-07-27 | 1 | -0/+358 |
* | | | | | | | | | | Merge branch '2fa-check-git-http' into 'master' | Robert Speicher | 2016-08-18 | 1 | -0/+39 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Refactor `find_for_git_client` method to not use assignment in conditionals a... | Patricio Cano | 2016-08-17 | 1 | -10/+8 |
| * | | | | | | | | | | Deny Git over HTTP access to users that have 2FA enabled, unless they use a P... | Patricio Cano | 2016-08-16 | 1 | -0/+41 |
* | | | | | | | | | | | Merge branch '21028-missing-default-sort-for-users-with-an-existing-cookie' i... | Robert Speicher | 2016-08-18 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Handle legacy sort order values21028-missing-default-sort-for-users-with-an-existing-cookie | Sean McGivern | 2016-08-18 | 1 | -0/+24 |
* | | | | | | | | | | | | Merge branch '2fa-api-check' into 'master' | Robert Speicher | 2016-08-18 | 2 | -0/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Small refactor and syntax fixes.2fa-api-check | Patricio Cano | 2016-08-18 | 2 | -0/+3 |
| * | | | | | | | | | | | | Removed unnecessary service for user retrieval and improved API error message. | Patricio Cano | 2016-08-18 | 1 | -19/+0 |
| * | | | | | | | | | | | | Added documentation and CHANGELOG item | Patricio Cano | 2016-08-18 | 2 | -2/+2 |
| * | | | | | | | | | | | | Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner P... | Patricio Cano | 2016-08-18 | 3 | -0/+60 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'rs-issue-21017' into 'master' | Robert Speicher | 2016-08-18 | 2 | -0/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Update Hamlit to 2.6.1rs-issue-21017 | Robert Speicher | 2016-08-18 | 2 | -0/+45 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '4273-slash-commands' into 'master' | Robert Speicher | 2016-08-18 | 20 | -16/+1715 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix behavior around commands with optional arguments4273-slash-commands | Douwe Maan | 2016-08-18 | 2 | -29/+48 |
| * | | | | | | | | | | Remove unneeded aliases | Douwe Maan | 2016-08-18 | 6 | -83/+68 |
| * | | | | | | | | | | Fix specs and implement fixes based on failing specs | Douwe Maan | 2016-08-17 | 2 | -51/+17 |
| * | | | | | | | | | | Merge branch 'master' into 4273-slash-commands | Douwe Maan | 2016-08-16 | 77 | -361/+1831 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Fixed specs and fixes based on failing specs | Douwe Maan | 2016-08-16 | 6 | -357/+279 |
| * | | | | | | | | | | Force notes poll after commands have been executed | Douwe Maan | 2016-08-12 | 2 | -13/+13 |
| * | | | | | | | | | | Refactor slash command definition | Douwe Maan | 2016-08-12 | 1 | -15/+15 |
| * | | | | | | | | | | Simplify the slash commands DSL to store action blocks instead of creating me... | Rémy Coutable | 2016-08-13 | 5 | -56/+179 |
| * | | | | | | | | | | New TodoService#todo_exists? method | Rémy Coutable | 2016-08-13 | 2 | -1/+13 |
| * | | | | | | | | | | Accept blocks for `.desc` and `.condition` slash commands DSL | Rémy Coutable | 2016-08-13 | 1 | -19/+42 |
| * | | | | | | | | | | Make slash commands contextual | Rémy Coutable | 2016-08-13 | 3 | -31/+219 |