Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix incorrect "stopped impersonation" log messagefix-impersonation-log | Stan Hu | 2016-08-23 | 1 | -1/+1 |
* | Merge branch 'revert_revert_issuable_lock' into 'master' | Douwe Maan | 2016-08-23 | 2 | -2/+9 |
|\ | |||||
| * | Revert the revert of Optimistic Lockingrevert_revert_issuable_lock | Valery Sizov | 2016-08-22 | 2 | -2/+9 |
* | | Split Koding admin/user docs | Achilleas Pipinellis | 2016-08-22 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'issue_18135' into 'master' | Douwe Maan | 2016-08-19 | 1 | -0/+1 |
|\ | |||||
| * | Todos sorting dropdownissue_18135 | Felipe Artur | 2016-08-19 | 1 | -0/+1 |
* | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' | Stan Hu | 2016-08-19 | 2 | -0/+17 |
|\ \ | |||||
| * | | Support integration with Koding (online IDE) | Gokmen Goksel | 2016-08-19 | 2 | -0/+17 |
* | | | Merge branch 'issue-boards-label-text-color' into 'master' | Robert Speicher | 2016-08-19 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Added text color to issues labels in issue board lists | Phil Hughes | 2016-08-19 | 1 | -1/+1 |
* | | | Merge branch 'expiration-date-on-memberships' into 'master' | Douwe Maan | 2016-08-19 | 4 | -6/+18 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into 'expiration-date-on-memberships' | Sean McGivern | 2016-08-19 | 3 | -7/+79 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge branch 'master' into expiration-date-on-memberships | Douwe Maan | 2016-08-18 | 2 | -0/+15 |
| |\ \ \ | |||||
| * | | | | Fix adding a user to a group in admin section | Sean McGivern | 2016-08-18 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into expiration-date-on-memberships | Sean McGivern | 2016-08-18 | 9 | -23/+38 |
| |\ \ \ \ | |||||
| * | | | | | Allow project group links to be expired | Sean McGivern | 2016-08-18 | 1 | -1/+3 |
| * | | | | | Add expiration date to group memberships | Sean McGivern | 2016-08-18 | 1 | -2/+7 |
| * | | | | | Merge branch 'master' into expiration-date-on-memberships | Sean McGivern | 2016-08-18 | 42 | -287/+937 |
| |\ \ \ \ \ | |||||
| * | | | | | | Allow to edit access expiration date. | Adam Niedzielski | 2016-08-05 | 1 | -1/+1 |
| * | | | | | | Replace optional parameters with keyword arguments. | Adam Niedzielski | 2016-08-02 | 1 | -1/+6 |
| * | | | | | | WIP | Adam Niedzielski | 2016-08-01 | 1 | -1/+1 |
* | | | | | | | Merge branch 'cs-async-branch-dropdown' into 'master' | Jacob Schatz | 2016-08-19 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Fix tests. | Connor Shea | 2016-08-17 | 1 | -1/+1 |
| * | | | | | | Initial implementation of an async branch dropdown for Revert and Cherry Pick. | Connor Shea | 2016-08-17 | 1 | -0/+7 |
* | | | | | | | Merge branch 'diff-line-comment-vuejs' into 'master' | Douwe Maan | 2016-08-19 | 3 | -7/+79 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Improve performance of MR show page | Douwe Maan | 2016-08-18 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-18 | 3 | -9/+16 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-18 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 6 | -6/+298 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Store discussion_id on Note for faster discussion lookup. | Douwe Maan | 2016-08-17 | 1 | -5/+1 |
| * | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 1 | -8/+6 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-16 | 13 | -30/+138 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Address review feedback | Douwe Maan | 2016-08-16 | 2 | -3/+3 |
| * | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-12 | 21 | -154/+352 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add specs for NotesController and DiscussionsController | Douwe Maan | 2016-08-12 | 2 | -2/+2 |
| * | | | | | | | | | | Actually don't send resolved notifications when deleting a note | Douwe Maan | 2016-08-04 | 1 | -0/+2 |
| * | | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-03 | 14 | -103/+170 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Don't send resolved notifications when deleting a note | Douwe Maan | 2016-07-28 | 1 | -2/+0 |
| * | | | | | | | | | | | Add 'Resolved all discussions' system note | Douwe Maan | 2016-07-28 | 2 | -0/+4 |
| * | | | | | | | | | | | Backend tweaks | Douwe Maan | 2016-07-28 | 2 | -7/+7 |
| * | | | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-07-28 | 9 | -7/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Updates the text above discussions when resolving notes & discussions | Phil Hughes | 2016-07-27 | 2 | -4/+14 |
| * | | | | | | | | | | | | Added resolved by users name into tooltip | Phil Hughes | 2016-07-26 | 2 | -2/+6 |
| * | | | | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Phil Hughes | 2016-07-26 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add endpoints to resolve diff notes and discussions | Douwe Maan | 2016-07-25 | 3 | -8/+56 |
| * | | | | | | | | | | | | | Assigns to variable rather than using VueJS method | Phil Hughes | 2016-07-24 | 1 | -2/+2 |
| * | | | | | | | | | | | | | Resolve all endpoint | Phil Hughes | 2016-07-24 | 1 | -0/+5 |
| * | | | | | | | | | | | | | Posts to rails to update note eventually | Phil Hughes | 2016-07-24 | 1 | -0/+5 |
* | | | | | | | | | | | | | | Merge branch '2fa-check-git-http' into 'master' | Robert Speicher | 2016-08-18 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Refactor `find_for_git_client` method to not use assignment in conditionals a... | Patricio Cano | 2016-08-17 | 1 | -2/+2 |