summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-222-2/+9
* Merge branch 'issue-boards-label-text-color' into 'master' Robert Speicher2016-08-191-1/+1
|\
| * Added text color to issues labels in issue board listsPhil Hughes2016-08-191-1/+1
* | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-192-3/+10
|\ \
| * \ Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-193-7/+79
| |\ \ | | |/
| * | Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-181-0/+10
| |\ \
| * \ \ Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-185-10/+5
| |\ \ \
| * | | | Allow project group links to be expiredSean McGivern2016-08-181-1/+3
| * | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1825-186/+758
| |\ \ \ \
| * | | | | Allow to edit access expiration date.Adam Niedzielski2016-08-051-1/+1
| * | | | | Replace optional parameters with keyword arguments.Adam Niedzielski2016-08-021-1/+6
| * | | | | WIPAdam Niedzielski2016-08-011-1/+1
* | | | | | Merge branch 'cs-async-branch-dropdown' into 'master' Jacob Schatz2016-08-191-0/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix tests.Connor Shea2016-08-171-1/+1
| * | | | | Initial implementation of an async branch dropdown for Revert and Cherry Pick.Connor Shea2016-08-171-0/+7
* | | | | | 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-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-167-15/+72
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Address review feedbackDouwe Maan2016-08-162-3/+3
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1214-143/+339
| |\ \ \ \ \ \ \
| * | | | | | | | 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-036-31/+75
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-284-4/+12
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
* | | | | | | | | | | | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-184-9/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-167-15/+72
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | 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
| * | | | | | | | | | | Support slash commands in noteable description and notesRémy Coutable2016-08-131-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |