| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master' | Phil Hughes | 2017-06-15 | 1 | -3/+25 |
| | | | | | | | | Fix note highlight being lost after real time update Closes #33483 See merge request !12098 | ||||
| * | Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' ↵ | Clement Ho | 2017-06-15 | 1 | -1/+1 |
| | | | | | | | | | | into 'master' Fix autocomplete not working on note edit form Closes #33529 See merge request !12106 | ||||
| * | Merge commit 'abc61f260074663e5711d3814d9b7d301d07a259' into 9-3-stable | Clement Ho | 2017-06-09 | 1 | -132/+226 |
| |\ | |||||
| | * | Improve user experience around slash commands in instant comments | Kushal Pandya | 2017-06-05 | 1 | -14/+87 |
| | | | |||||
| | * | Merge branch 'fix-up-notes-technical-debt' into 'master' | Fatih Acet | 2017-05-29 | 1 | -108/+115 |
| | |\ | | | | | | | | | | | | | Fix up some notes.js tech debt See merge request !11283 | ||||
| | | * | Fix up some notes tech debtfix-up-notes-technical-debt | Eric Eastwood | 2017-05-26 | 1 | -108/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix up tech debt comments from @jschatz1 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757436 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757905 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757952 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28758013 | ||||
| | * | | More consistent padding of notes, system notes, and note form | Douwe Maan | 2017-05-26 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into ↵ | Phil Hughes | 2017-05-22 | 1 | -2/+3 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix jQuery data attribute caching issue causing expanding issues Closes #32705 See merge request !11609 | ||||
| | | * | Fix jQuery data attribute caching issue casuing expanding issues | Eric Eastwood | 2017-05-22 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Command | Result $link.data('lineType') | '' $link.data('line-type') | '' $link.attr('data-line-type') | 'new' $link[0].dataset.lineType | 'new' | ||||
| | * | | Merge branch 'adopt-es-module-syntax' into 'master' | Filipa Lacerda | 2017-05-22 | 1 | -7/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | Adopt ES module syntax See merge request !9567 | ||||
| | | * | | update remaining uses of CJS syntax to ES module syntax | Mike Greiling | 2017-05-16 | 1 | -7/+9 |
| | | | | | |||||
| | * | | | Fix system note comparison and standardize note setup | Eric Eastwood | 2017-05-19 | 1 | -11/+11 |
| | | |/ | |/| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
| | * | | Fix ability to edit diff notes multiple times | Kushal Pandya | 2017-05-18 | 1 | -3/+3 |
| | | | | |||||
| | * | | Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master' | Phil Hughes | 2017-05-18 | 1 | -7/+16 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking to unresolved/expanded diff note Closes #32424 See merge request !11458 | ||||
| | | * | | Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-note | Eric Eastwood | 2017-05-17 | 1 | -7/+16 |
| | | |/ | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327 | ||||
| | * | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵ | Phil Hughes | 2017-05-18 | 1 | -20/+22 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note flicker with note you can't edit and trailing new line edge case Closes #32449 See merge request !11472 | ||||
| | | * | | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-case | Eric Eastwood | 2017-05-18 | 1 | -20/+22 |
| | | |/ | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449 | ||||
| | * | | Disable reference prefixes in notes for Snippets | Sam Rose | 2017-05-18 | 1 | -2/+3 |
| | |/ | |||||
| | * | Make `gfm_auto_complete` into a module and fix up tech debt | Eric Eastwood | 2017-05-16 | 1 | -1/+0 |
| | | | |||||
| | * | Merge branch '32125-fix-link-to-note-in-diff' into 'master' | Fatih Acet | 2017-05-16 | 1 | -29/+41 |
| | |\ | | | | | | | | | | | | | | | | | | | Fix linking to resolved note in diff Closes #32125 See merge request !11327 | ||||
| | | * | Fix linking to resolved note in diff32125-fix-link-to-note-in-diff | Eric Eastwood | 2017-05-12 | 1 | -29/+41 |
| | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125 | ||||
| | * | | Merge branch '24373-warning-message-go-away' into 'master' | Phil Hughes | 2017-05-16 | 1 | -3/+16 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Notes warning message should go away once resolved Closes #24373 See merge request !10823 | ||||
| | | * | | Notes: Warning message should go away once resolved | Jacopo | 2017-05-15 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | | Flash error messages disappear(`fadeOut`) automatically after any successful request | ||||
| | * | | | Improve slash command stripping, escape temporary note contents | Kushal Pandya | 2017-05-15 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | 31886 Remove spinner from loading comment31886-remover-comment-load-spinner | tauriedavis | 2017-05-12 | 1 | -3/+0 |
| | |/ / | |||||
| | * | | Fix slash commands detection in comments | Kushal Pandya | 2017-05-11 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'remove-needless-bind-polyfills' into 'master' | Filipa Lacerda | 2017-05-09 | 1 | -20/+18 |
| | |\ | | | | | | | | | | | | | Remove needless bind and indexOf polyfills See merge request !11187 | ||||
| | | * | remove bind polyfill from notes.js | Mike Greiling | 2017-05-08 | 1 | -20/+18 |
| | | | | |||||
| | * | | Merge branch 'up-arrow-focus-discussion-comment' into 'master' | Filipa Lacerda | 2017-05-09 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed UP arrow key not editing last comment in discussion Closes #31348 See merge request !11173 | ||||
| | | * | | Fixed UP arrow key not editing last comment in discussion | Phil Hughes | 2017-05-08 | 1 | -1/+1 |
| | | |/ | | | | | | | | | | Closes #31348 | ||||
| | * | | Merge request widget redesign | Fatih Acet | 2017-05-09 | 1 | -2/+10 |
| | |/ | |||||
| * | | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2' | Timothy Andrew | 2017-05-31 | 1 | -2/+2 |
| | | | | | | | | | | | Escapes html content before appending it to the DOM See merge request !2107 | ||||
| * | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into ↵ | Phil Hughes | 2017-05-22 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | 'master' Fix jQuery data attribute caching issue causing expanding issues Closes #32705 See merge request !11609 | ||||
| * | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532 | ||||
| * | | Remove line referencing an non-existing class in the 9-2-stable branch | Rémy Coutable | 2017-05-19 | 1 | -1/+0 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch '31886-remover-comment-load-spinner' into 'master' | Annabel Dunstone Gray | 2017-05-19 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | 31886 Remove spinner from loading comment Closes #31886 See merge request !11339 | ||||
| * | | Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master' | Phil Hughes | 2017-05-19 | 1 | -7/+16 |
| | | | | | | | | | | | | | | | Fix linking to unresolved/expanded diff note Closes #32424 See merge request !11458 | ||||
| * | | Merge branch '9-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 9-2-stable | kushalpandya | 2017-05-19 | 1 | -23/+25 |
| |\ \ | |||||
| | * | | Merge branch '32425-fix-diff-notes-instant-editing' into 'master' | Phil Hughes | 2017-05-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | Fix ability to edit diff notes multiple times Closes #32425 See merge request !11456 | ||||
| | * | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵ | Phil Hughes | 2017-05-19 | 1 | -20/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note flicker with note you can't edit and trailing new line edge case Closes #32449 See merge request !11472 | ||||
| * | | | Merge branch '32125-fix-link-to-note-in-diff' into 'master' | Fatih Acet | 2017-05-19 | 1 | -45/+58 |
| |/ / | | | | | | | | | | | | | | | Fix linking to resolved note in diff Closes #32125 See merge request !11327 | ||||
| * | | Merge branch '32016-escape-instant-comments-and-slash-commands' into 'master' | Douwe Maan | 2017-05-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | Improve slash command stripping, escape temporary note contents Closes #32016 See merge request !11341 | ||||
| * | | Merge branch '32016-slash-command-strip-fix' into 'master' | Filipa Lacerda | 2017-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Fix slash commands detection in comments Closes #32016 See merge request !11265 | ||||
| * | | Merge branch 'mr-widget-redesign-review' into 'master' | Jacob Schatz | 2017-05-09 | 1 | -2/+10 |
| |/ | | | | | | | | Merge request widget redesign Closes #25424 and #27950 See merge request !10319 | ||||
| * | Fix Karma failures for jQuery deferreds | Kushal Pandya | 2017-05-05 | 1 | -1/+1 |
| | | |||||
| * | Add instant comments support | Kushal Pandya | 2017-05-05 | 1 | -58/+287 |
| | | |||||
| * | Add real-time note edits :chipmunk: | Eric Eastwood | 2017-05-03 | 1 | -69/+148 |
| | | |||||
| * | Add renderNote animation and added spec | Luke "Jared" Bennett | 2017-04-19 | 1 | -7/+15 |
| | | |||||
| * | alfredo review changes | Luke "Jared" Bennett | 2017-04-07 | 1 | -1/+1 |
| | | |||||
| * | Review changes | Luke "Jared" Bennett | 2017-04-07 | 1 | -1/+1 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |