summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Fix incorrect "stopped impersonation" log messagefix-impersonation-logStan Hu2016-08-231-1/+1
* Merge branch 'revert_revert_issuable_lock' into 'master' Douwe Maan2016-08-232-2/+9
|\
| * Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-222-2/+9
* | Split Koding admin/user docsAchilleas Pipinellis2016-08-221-1/+1
|/
* Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-191-0/+1
|\
| * Todos sorting dropdownissue_18135Felipe Artur2016-08-191-0/+1
* | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-192-0/+17
|\ \
| * | Support integration with Koding (online IDE)Gokmen Goksel2016-08-192-0/+17
* | | 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-194-6/+18
|\ \ \
| * \ \ Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-193-7/+79
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-182-0/+15
| |\ \ \
| * | | | Fix adding a user to a group in admin sectionSean McGivern2016-08-181-1/+1
| * | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-189-23/+38
| |\ \ \ \
| * | | | | Allow project group links to be expiredSean McGivern2016-08-181-1/+3
| * | | | | Add expiration date to group membershipsSean McGivern2016-08-181-2/+7
| * | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1842-287/+937
| |\ \ \ \ \
| * | | | | | 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-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