Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Extend processable builds to include skipped onesfix/pipeline-stage-processing | Grzegorz Bizon | 2016-08-19 | 2 | -15/+12 |
| | |||||
* | Add test that shows problem with pipeline processing | Grzegorz Bizon | 2016-08-19 | 1 | -3/+43 |
| | |||||
* | Merge branch 'labels-grammar' into 'master' | Achilleas Pipinellis | 2016-08-19 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | Fix same tiny grammar mistake as in ee This is a tiny grammar fix that was already merged into EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/667#note_14043471 See merge request !5865 | ||||
| * | fix same mistake as in ee | De Wet Blomerus | 2016-08-18 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'diff-line-comment-vuejs' into 'master' | Douwe Maan | 2016-08-19 | 76 | -137/+3629 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff line comments resolve ## What does this MR do? Diff line comments can be resolved. Part of #10325 To do: - [x] Backend (@DouweM) - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331 - [x] System note when all discussions are resolved - [x] Notification when all discussions are resolved - [x] Write unit tests - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9 - [x] Frontend (@iamphill) - [x] Fix bugs - [x] Write more feature tests - [x] Frontend (@connorshea) - [x] Address frontend feedback - [x] Feature specs for Jump feature - [x] Documentation - [x] Add Vue.js in a standard way See merge request !5022 | ||||
| * | | Fix expansion of discussions in diffdiff-line-comment-vuejs | Douwe Maan | 2016-08-18 | 3 | -5/+3 |
| | | | |||||
| * | | Improve performance of MR show page | Douwe Maan | 2016-08-18 | 9 | -22/+33 |
| | | | |||||
| * | | Fix jumping between discussions on changes tab | Douwe Maan | 2016-08-18 | 1 | -0/+1 |
| | | | |||||
| * | | Fix MR note discussion ID | Douwe Maan | 2016-08-18 | 1 | -1/+3 |
| | | | |||||
| * | | Remove right margin on Jump button icon | Douwe Maan | 2016-08-18 | 1 | -2/+6 |
| | | | |||||
| * | | Fix bug causing “Jump to discussion” button not to show | Douwe Maan | 2016-08-18 | 2 | -11/+7 |
| | | | |||||
| * | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-18 | 56 | -139/+1379 |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * \ \ | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-18 | 52 | -176/+844 |
| |\ \ \ | |||||
| * | | | | Fix class method definition | Douwe Maan | 2016-08-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add changelog entry | Douwe Maan | 2016-08-17 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Function should return a boolean. | Connor Shea | 2016-08-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Forgot another one. | Connor Shea | 2016-08-17 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Fix a lingering conflict. | Connor Shea | 2016-08-17 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | Fix more incomplete if/else statements. | Connor Shea | 2016-08-17 | 2 | -0/+8 |
| | | | | | |||||
| * | | | | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 153 | -179/+8177 |
| |\ \ \ \ | |||||
| * | | | | | Store discussion_id on Note for faster discussion lookup. | Douwe Maan | 2016-08-17 | 13 | -47/+191 |
| | | | | | | |||||
| * | | | | | Remove non-standard VueJS files from vendor. | Connor Shea | 2016-08-17 | 3 | -11391/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 18 | -124/+11801 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add return statements for if statements that were missing them. | Connor Shea | 2016-08-17 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-16 | 241 | -917/+4136 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add documentation for discussion resolution. | Connor Shea | 2016-08-16 | 6 | -8/+40 |
| | | | | | | | | |||||
| * | | | | | | | Init commit on documentation for resolving inline comments in MRs | Achilleas Pipinellis | 2016-08-17 | 1 | -0/+8 |
| | | | | | | | | |||||
| * | | | | | | | Remove accidental addition of table and index. | Connor Shea | 2016-08-16 | 1 | -10/+0 |
| | | | | | | | | |||||
| * | | | | | | | Add comment for v-cloak selector. [ci skip] | Connor Shea | 2016-08-16 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fix Resolve All button. | Connor Shea | 2016-08-16 | 1 | -5/+1 |
| | | | | | | | | |||||
| * | | | | | | | Improve CSS for line comment resolution button. | Connor Shea | 2016-08-16 | 1 | -5/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add test for jumping between discussions and unhiding toggled discussions. | Connor Shea | 2016-08-16 | 1 | -0/+18 |
| | | | | | | | | |||||
| * | | | | | | | Address review feedback | Douwe Maan | 2016-08-16 | 9 | -86/+116 |
| | | | | | | | | |||||
| * | | | | | | | Resolve feedback. | Connor Shea | 2016-08-15 | 3 | -9/+16 |
| | | | | | | | | |||||
| * | | | | | | | Single quotes for consistency, cache 'this' selector. | Connor Shea | 2016-08-15 | 1 | -3/+4 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-12 | 606 | -6514/+9877 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add specs for system note and email when all discussions are resolved | Douwe Maan | 2016-08-12 | 3 | -0/+111 |
| | | | | | | | | | |||||
| * | | | | | | | | Add specs for NotesController and DiscussionsController | Douwe Maan | 2016-08-12 | 5 | -4/+222 |
| | | | | | | | | | |||||
| * | | | | | | | | Add specs for Discussion and MergeRequest models | Douwe Maan | 2016-08-12 | 3 | -3/+712 |
| | | | | | | | | | |||||
| * | | | | | | | | Don’t show “Resolve discussion” for non-author/members | Douwe Maan | 2016-08-12 | 5 | -14/+35 |
| | | | | | | | | | |||||
| * | | | | | | | | Add specs for new Note and DiffNote methods. | Douwe Maan | 2016-08-12 | 3 | -0/+303 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix a bug and a test. | Connor Shea | 2016-08-10 | 1 | -4/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Set color of resolve icon with CSS. | Connor Shea | 2016-08-10 | 1 | -2/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | If the next discussion is closed, toggle it open. | Connor Shea | 2016-08-09 | 1 | -0/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Replace CSS border'd check icon with real icon. | Connor Shea | 2016-08-09 | 3 | -9/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Implement Jump behavior for Changes tab | Douwe Maan | 2016-08-04 | 6 | -31/+131 |
| | | | | | | | | | |||||
| * | | | | | | | | Actually don't send resolved notifications when deleting a note | Douwe Maan | 2016-08-04 | 2 | -4/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed issue with expand diff not initializing resolve buttons | Phil Hughes | 2016-08-04 | 2 | -5/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Jumps between discussions on the changes tab | Phil Hughes | 2016-08-04 | 2 | -25/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ordered the jump to discussion by order in the DOM | ||||
| * | | | | | | | | Comment & resolve button no longer looks for can-resolve attribute | Phil Hughes | 2016-08-04 | 13 | -87/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some bugs when removing notes |