summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Keep committing ... spinner when conflict resolvedkeep-committing-spinner-when-conflict-resolvedSean McGivern2016-08-191-3/+1
* Merge branch 'labels-grammar' into 'master' Achilleas Pipinellis2016-08-191-2/+2
|\
| * fix same mistake as in eeDe Wet Blomerus2016-08-181-2/+2
* | Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-1976-137/+3629
|\ \
| * | Fix expansion of discussions in diffdiff-line-comment-vuejsDouwe Maan2016-08-183-5/+3
| * | Improve performance of MR show pageDouwe Maan2016-08-189-22/+33
| * | Fix jumping between discussions on changes tabDouwe Maan2016-08-181-0/+1
| * | Fix MR note discussion IDDouwe Maan2016-08-181-1/+3
| * | Remove right margin on Jump button iconDouwe Maan2016-08-181-2/+6
| * | Fix bug causing “Jump to discussion” button not to showDouwe Maan2016-08-182-11/+7
| * | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1856-139/+1379
| |\ \
| * \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1852-176/+844
| |\ \ \
| * | | | Fix class method definitionDouwe Maan2016-08-171-1/+1
| * | | | Add changelog entryDouwe Maan2016-08-171-0/+1
| * | | | Function should return a boolean.Connor Shea2016-08-171-1/+1
| * | | | Forgot another one.Connor Shea2016-08-171-0/+2
| * | | | Fix a lingering conflict.Connor Shea2016-08-171-5/+1
| * | | | Fix more incomplete if/else statements.Connor Shea2016-08-172-0/+8
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-17153-179/+8177
| |\ \ \ \
| * | | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-1713-47/+191
| * | | | | Remove non-standard VueJS files from vendor.Connor Shea2016-08-173-11391/+2
| * | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1718-124/+11801
| |\ \ \ \ \
| * | | | | | Add return statements for if statements that were missing them.Connor Shea2016-08-171-0/+4
| * | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-16241-917/+4136
| |\ \ \ \ \ \
| * | | | | | | Add documentation for discussion resolution.Connor Shea2016-08-166-8/+40
| * | | | | | | Init commit on documentation for resolving inline comments in MRsAchilleas Pipinellis2016-08-171-0/+8
| * | | | | | | Remove accidental addition of table and index.Connor Shea2016-08-161-10/+0
| * | | | | | | Add comment for v-cloak selector. [ci skip]Connor Shea2016-08-161-1/+2
| * | | | | | | Fix Resolve All button.Connor Shea2016-08-161-5/+1
| * | | | | | | Improve CSS for line comment resolution button.Connor Shea2016-08-161-5/+2
| * | | | | | | Add test for jumping between discussions and unhiding toggled discussions.Connor Shea2016-08-161-0/+18
| * | | | | | | Address review feedbackDouwe Maan2016-08-169-86/+116
| * | | | | | | Resolve feedback.Connor Shea2016-08-153-9/+16
| * | | | | | | Single quotes for consistency, cache 'this' selector.Connor Shea2016-08-151-3/+4
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-12606-6514/+9877
| |\ \ \ \ \ \ \
| * | | | | | | | Add specs for system note and email when all discussions are resolvedDouwe Maan2016-08-123-0/+111
| * | | | | | | | Add specs for NotesController and DiscussionsControllerDouwe Maan2016-08-125-4/+222
| * | | | | | | | Add specs for Discussion and MergeRequest modelsDouwe Maan2016-08-123-3/+712
| * | | | | | | | Don’t show “Resolve discussion” for non-author/membersDouwe Maan2016-08-125-14/+35
| * | | | | | | | Add specs for new Note and DiffNote methods.Douwe Maan2016-08-123-0/+303
| * | | | | | | | Fix a bug and a test.Connor Shea2016-08-101-4/+6
| * | | | | | | | Set color of resolve icon with CSS.Connor Shea2016-08-101-2/+6
| * | | | | | | | If the next discussion is closed, toggle it open.Connor Shea2016-08-091-0/+6
| * | | | | | | | Replace CSS border'd check icon with real icon.Connor Shea2016-08-093-9/+5
| * | | | | | | | Implement Jump behavior for Changes tabDouwe Maan2016-08-046-31/+131
| * | | | | | | | Actually don't send resolved notifications when deleting a noteDouwe Maan2016-08-042-4/+2
| * | | | | | | | Fixed issue with expand diff not initializing resolve buttonsPhil Hughes2016-08-042-5/+7
| * | | | | | | | Jumps between discussions on the changes tabPhil Hughes2016-08-042-25/+34
| * | | | | | | | Comment & resolve button no longer looks for can-resolve attributePhil Hughes2016-08-0413-87/+107
| * | | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-03298-2652/+5823
| |\ \ \ \ \ \ \ \
View Lorry Controller Status