summaryrefslogtreecommitdiff
path: root/app/views/projects/notes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactorSimon Knox2017-02-162-1/+1
|\
| * style links on system notes to look clickableSimon Knox2017-02-151-0/+1
| * Change wording of MR comment boxmarkdown-slash-commands-textAnnabel Dunstone Gray2017-02-131-1/+0
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactorSimon Knox2017-02-141-6/+8
|\ \ | |/
| * Refactored diff notes Vue appPhil Hughes2017-02-091-2/+1
| * Merge branch '25134-mobile-issue-view-doesn-t-show-organization-membership' i...Annabel Dunstone Gray2017-02-071-4/+7
| |\
| | * Fix static class error25134-mobile-issue-view-doesn-t-show-organization-membershipAnnabel Dunstone Gray2017-02-071-1/+1
| | * Show organisation membership and delete comment on smaller viewports, plus ch...dimitrieh2017-02-061-4/+7
* | | notes use new task_list, and PATCH instead of POSTSimon Knox2017-02-081-1/+1
|/ /
* | Backport changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-061-1/+1
|/
* HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-241-1/+1
* support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-0/+1
* Fixed edit form authenticity_token call failing the testsfixed-edit-form-failing-testPhil Hughes2017-01-061-2/+1
* Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available...Fatih Acet2017-01-051-1/+1
|\
| * include all expected instance vars for _show.html.haml template within tests26155-merge-request-tabs-don-t-render-when-no-commits-availableMike Greiling2017-01-031-1/+1
* | Fix review comments.single-edit-comment-widget-2Fatih Acet2017-01-052-2/+2
* | Review fixes.Fatih Acet2017-01-041-2/+2
* | Fix warning styling for responsive design.Fatih Acet2017-01-041-2/+2
* | Fix task list for single edit note widget changes.Fatih Acet2017-01-042-0/+4
* | Put empty note edit form to correct place.Fatih Acet2017-01-042-2/+3
* | Remove dependency on Note instance from notes edit form.Adam Niedzielski2017-01-042-6/+4
* | Refactor discussion edit widget to have only one at a time.Fatih Acet2017-01-043-1/+7
|/
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-312-3/+3
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-311-1/+1
* Fix text overflow25930-discussion-actions-overlap-header-textFilipa Lacerda2016-12-221-1/+1
* break comment "edited at" block out of the note-text element to prevent issue...25155-fix-edited-text-in-commentsMike Greiling2016-12-121-1/+1
* resolves lowercase issue in system note for labels, label description and title24737-labeling-system-notes-downcase-labelsNur Rony2016-11-221-1/+1
* makes system notes less intrusive to a conversationless-intrusive-system-noteNur Rony2016-11-171-1/+6
* Fixed up resolve discussionsPhil Hughes2016-11-101-2/+2
* Add hover to trash icon in notesblackst0ne2016-10-211-1/+1
* Clean up stray Sign up ref.Bryce Johnson2016-10-151-1/+1
* Use CacheMarkdownField for notesNick Thomas2016-10-071-1/+1
* Merge branch 'resolve-buttons-path' into 'master' Jacob Schatz2016-09-261-5/+3
|\
| * Changed props to use stringsresolve-buttons-pathPhil Hughes2016-09-211-3/+3
| * Pass the full project path for resolve buttonsPhil Hughes2016-09-211-3/+1
* | Change "Please register or login" to "Please sign up or sign in"rs-sign-up-sign-inRobert Speicher2016-09-211-2/+2
|/
* Fix note form hint showing slash commands supported for commitsRémy Coutable2016-09-201-2/+4
* Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-checkStan Hu2016-09-121-1/+2
* Add hover color to emoji iconClement Ho2016-08-251-2/+2
* fix location of markdown help locationchange-markdown-help-locationJohn Northrup2016-08-221-1/+1
* Change location of slash commands in notes widgetAchilleas Pipinellis2016-08-221-1/+1
* Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-192-14/+44
|\
| * Replace CSS border'd check icon with real icon.Connor Shea2016-08-091-1/+1
| * Updated issues with jump tp buttonPhil Hughes2016-08-011-3/+4
| * Fixed failing testsPhil Hughes2016-07-291-1/+2
| * Moved most of the data handling into discussion & notes modelsPhil Hughes2016-07-292-4/+3
| * Comment & resolve button text is done through VueJSPhil Hughes2016-07-261-1/+1
| * Shows tooltip for resolved even if user cant resolve commentsPhil Hughes2016-07-261-1/+0
| * Added resolved by users name into tooltipPhil Hughes2016-07-261-20/+21
| * Added ability to toggle resolving by commentingPhil Hughes2016-07-261-0/+1