summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-193-7/+79
|\
| * Improve performance of MR show pageDouwe Maan2016-08-181-1/+1
| * Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-183-9/+16
| |\
| * \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-182-1/+3
| |\ \
| * \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-176-6/+298
| |\ \ \
| * | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-171-5/+1
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-171-8/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1613-30/+138
| |\ \ \ \ \
| * | | | | | Address review feedbackDouwe Maan2016-08-162-3/+3
| * | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1221-154/+352
| |\ \ \ \ \ \
| * | | | | | | Add specs for NotesController and DiscussionsControllerDouwe Maan2016-08-122-2/+2
| * | | | | | | Actually don't send resolved notifications when deleting a noteDouwe Maan2016-08-041-0/+2
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-0314-103/+170
| |\ \ \ \ \ \ \
| * | | | | | | | Don't send resolved notifications when deleting a noteDouwe Maan2016-07-281-2/+0
| * | | | | | | | Add 'Resolved all discussions' system noteDouwe Maan2016-07-282-0/+4
| * | | | | | | | Backend tweaksDouwe Maan2016-07-282-7/+7
| * | | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-07-289-7/+33
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Updates the text above discussions when resolving notes & discussionsPhil Hughes2016-07-272-4/+14
| * | | | | | | | | Added resolved by users name into tooltipPhil Hughes2016-07-262-2/+6
| * | | | | | | | | Merge branch 'master' into diff-line-comment-vuejsPhil Hughes2016-07-261-2/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add endpoints to resolve diff notes and discussionsDouwe Maan2016-07-253-8/+56
| * | | | | | | | | | Assigns to variable rather than using VueJS methodPhil Hughes2016-07-241-2/+2
| * | | | | | | | | | Resolve all endpointPhil Hughes2016-07-241-0/+5
| * | | | | | | | | | Posts to rails to update note eventuallyPhil Hughes2016-07-241-0/+5
* | | | | | | | | | | Merge branch '2fa-check-git-http' into 'master' Robert Speicher2016-08-181-0/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactor `find_for_git_client` method to not use assignment in conditionals a...Patricio Cano2016-08-171-2/+2
| * | | | | | | | | | | Moved 2FA check to `auth.rb` and cleaned up the flow `authenticate_user`Patricio Cano2016-08-161-8/+8
| * | | | | | | | | | | Added better information about the personal tokensPatricio Cano2016-08-161-1/+4
| * | | | | | | | | | | 2FA check is now done in the main GitHTTPClientControllerPatricio Cano2016-08-161-0/+7
* | | | | | | | | | | | Handle legacy sort order values21028-missing-default-sort-for-users-with-an-existing-cookieSean McGivern2016-08-181-0/+5
* | | | | | | | | | | | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-185-13/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Fix specs and implement fixes based on failing specsDouwe Maan2016-08-171-3/+3
| * | | | | | | | | | | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1613-30/+138
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fixed specs and fixes based on failing specsDouwe Maan2016-08-161-7/+1
| * | | | | | | | | | | Fix autocomplete on commit and issue/MR edit pagesDouwe Maan2016-08-123-7/+8
| * | | | | | | | | | | Refactor slash command definitionDouwe Maan2016-08-121-3/+17
| * | | | | | | | | | | Simplify the slash commands DSL to store action blocks instead of creating me...Rémy Coutable2016-08-131-5/+3
| * | | | | | | | | | | Make slash commands contextualRémy Coutable2016-08-131-1/+1
| * | | | | | | | | | | Support slash commands in noteable description and notesRémy Coutable2016-08-132-2/+3
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-182-4/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Address review comments from @smcgivern.17334-u2f-device-identifiersTimothy Andrew2016-08-181-2/+1
| * | | | | | | | | | | Allow naming U2F devices.Timothy Andrew2016-08-182-3/+15
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Rename TodoService#mark_todos_as_done_by_id{,s}Ahmad Sherif2016-08-181-1/+1
* | | | | | | | | | | Implement TodoService#mark_todos_as_done_by_idAhmad Sherif2016-08-181-3/+1
* | | | | | | | | | | Simplify SQL queries of marking a todo as doneAhmad Sherif2016-08-181-4/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Refactor to mark Changes tab as active on new MR page.Ruben Davila2016-08-182-7/+1
* | | | | | | | | | Fix tabs navigation and do not update URL via pushstateAlfredo Sumaran2016-08-171-1/+7
* | | | | | | | | | Merge branch '20808-merge-request-new-diff-view' into 'master' Robert Speicher2016-08-171-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix merge request new view not changing code view rendering style20808-merge-request-new-diff-viewPaco Guzman2016-08-111-0/+2
* | | | | | | | | | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-175-0/+232
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status