Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert the revert of Optimistic Lockingrevert_revert_issuable_lock | Valery Sizov | 2016-08-22 | 2 | -2/+9 |
* | 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 | 2 | -3/+10 |
|\ \ | |||||
| * \ | 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 | 1 | -0/+10 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into expiration-date-on-memberships | Sean McGivern | 2016-08-18 | 5 | -10/+5 |
| |\ \ \ | |||||
| * | | | | Allow project group links to be expired | Sean McGivern | 2016-08-18 | 1 | -1/+3 |
| * | | | | Merge branch 'master' into expiration-date-on-memberships | Sean McGivern | 2016-08-18 | 25 | -186/+758 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 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-16 | 7 | -15/+72 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Address review feedback | Douwe Maan | 2016-08-16 | 2 | -3/+3 |
| * | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-12 | 14 | -143/+339 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | 6 | -31/+75 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 | 4 | -4/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | | Moved 2FA check to `auth.rb` and cleaned up the flow `authenticate_user` | Patricio Cano | 2016-08-16 | 1 | -8/+8 |
| * | | | | | | | | | | | Added better information about the personal tokens | Patricio Cano | 2016-08-16 | 1 | -1/+4 |
| * | | | | | | | | | | | 2FA check is now done in the main GitHTTPClientController | Patricio Cano | 2016-08-16 | 1 | -0/+7 |
* | | | | | | | | | | | | Merge branch '4273-slash-commands' into 'master' | Robert Speicher | 2016-08-18 | 4 | -9/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into 4273-slash-commands | Douwe Maan | 2016-08-16 | 7 | -15/+72 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed specs and fixes based on failing specs | Douwe Maan | 2016-08-16 | 1 | -7/+1 |
| * | | | | | | | | | | | Fix autocomplete on commit and issue/MR edit pages | Douwe Maan | 2016-08-12 | 3 | -7/+8 |
| * | | | | | | | | | | | Support slash commands in noteable description and notes | Rémy Coutable | 2016-08-13 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Refactor to mark Changes tab as active on new MR page. | Ruben Davila | 2016-08-18 | 2 | -7/+1 |
* | | | | | | | | | | | Fix tabs navigation and do not update URL via pushstate | Alfredo Sumaran | 2016-08-17 | 1 | -1/+7 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '20808-merge-request-new-diff-view' into 'master' | Robert Speicher | 2016-08-17 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | |