summaryrefslogtreecommitdiff
path: root/app/views/projects/notes
Commit message (Collapse)AuthorAgeFilesLines
* Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-checkStan Hu2016-09-121-1/+2
| | | | | Currently this permission check incurs a significant performance hit on loading issues where it does not make sense to check this permission in the first place.
* 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
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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 styling bugs
| * Fixed failing testsPhil Hughes2016-07-291-1/+2
| |
| * Moved most of the data handling into discussion & notes modelsPhil Hughes2016-07-292-4/+3
| | | | | | | | | | Reduced some duplicated code with compiling components Fixed bug with resolve button tooltip not updating after resolving discussion
| * 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
| |
| * Correctly resolves/unresolves discussionsPhil Hughes2016-07-261-2/+3
| |
| * Hide resolve button when not allowedDouwe Maan2016-07-251-19/+40
| |
| * Fix discussion partialsDouwe Maan2016-07-241-4/+0
| |
| * Added comment & resolve button to reply formPhil Hughes2016-07-241-1/+1
| |
| * Seperated resolve all button from reply buttonPhil Hughes2016-07-242-2/+2
| |
| * Added resolve button to discussionsPhil Hughes2016-07-242-1/+5
| | | | | | | | Top count displays how many resolved discussions
| * Use VueJS resourcePhil Hughes2016-07-241-1/+1
| |
| * Moved away from vuejs-railsPhil Hughes2016-07-241-1/+1
| | | | | | | | Fixed issue with resolve buttons always being visible - even when not logged in
| * Posts to rails to update note eventuallyPhil Hughes2016-07-241-3/+5
| |
| * Fixed issue when adding or deleting through jQueryPhil Hughes2016-07-241-1/+1
| |
| * VueJS updatesPhil Hughes2016-07-241-1/+1
| |
| * Resolve all comments buttonPhil Hughes2016-07-241-2/+2
| | | | | | | | Store that manages the state of each button
| * Diff line comments resolvePhil Hughes2016-07-241-0/+4
| |
* | Link to slash commands documentation from form hintsDouwe Maan2016-08-122-3/+10
| |
* | Disable slash commands on edit formsDouwe Maan2016-08-121-1/+5
|/
* Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-216-108/+5
|\ | | | | | | | | | | | | Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
| * Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-206-108/+5
| |
* | Add image border in Markdown preview (!5162)winniehell2016-07-211-1/+1
|/
* Added redirect_to_referer to login link on issuesPhil Hughes2016-07-191-2/+2
| | | | Closes #19968
* Merge branch 'quick-start-ci-route' into 'master' Douwe Maan2016-07-121-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make "Get started with Builds" Help Page link work properly `help_page_path('ci/quick_start', 'README')` causes a link to `https://gitlab.com/help/ci%2Fquick_start/README` which in turn breaks every relative link on the page. This remedies the problem. That said, this is probably a horrible way of fixing this issue, *but* it does work. I can’t find much information on linking this deeply with Rails routes. If anyone has suggestions as to a better way of handling this, I'll gladly take them. I tried a few different things, but none of them really worked. Resolves #14872. cc: @axil @rspeicher @elstamey See merge request !3561
| * Update the help_page_path route to accept paths directly instead of using ↵Connor Shea2016-07-111-1/+1
| | | | | | | | parameters.
* | Merge branch 'remove-pinto-from-flash' into 'master' Jacob Schatz2016-07-111-0/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove pinTo from Flash ## What does this MR do? - replace `pinTo` of `Flash` by `parent` parameter in constructor - move positioning of layout containers from CoffeeScript to layout files - adjust styling of inline flash messages ## Are there points in the code the reviewer needs to double check? - display of flash messages in general ## Why was this MR needed? - allow finding and positioning flash message containers within layout files - allow adding different CSS classes to flash containers within layout files (necessary for fixing #18908) - allow multiple flash messages to be displayed at different places at the same time - make inline flash messages look nicer ## What are the relevant issue numbers? closes #18908, closes part of #18897 ## Screenshots ### Inline flash message (before) ![before](/uploads/c5b3cc05140eaeb9d14e481fa506ebbf/before.png) ![before-mobile](/uploads/004b1f2b9510bd97f4f8a7a6e56f17ef/before-mobile.png) ### Inline flash message (after) ![inline-flash-message](/uploads/fe2a23b63623612b696d529e81fa459e/inline-flash-message.png) ![inline-flash-mobile](/uploads/6207604acfebcf7402d77d5638c89ca8/inline-flash-mobile.png) ### Other flash messages (after) ![flash-message-issue](/uploads/d7e12bd0da68cfa333471ed102428cec/flash-message-issue.png) --- ![flash-new-project](/uploads/3465967dba83296068f154f149d26f64/flash-new-project.png) --- ![flash-sign-in](/uploads/4a5b317d5a369034f43343031607a0c2/flash-sign-in.png) --- ![flash-file-comment](/uploads/488a1119374be7e2173c0a590cfd8821/flash-file-comment.png) --- ![flash-fork](/uploads/f41964e8b910801e03eef3d7649e5009/flash-fork.png) --- ![flash-update-profile](/uploads/9fd972d6c6609fbbf86afcd99d343b5f/flash-update-profile.png) --- ### This is possible now ![flashs-everywhere](/uploads/07f425534511fb4ecaa1d7e2a9870787/flashs-everywhere.png) See merge request !4854
| * Remove `pinTo` from `Flash` and make inline flash messages look nicer (!4854)winniehell2016-06-301-0/+2
| |
* | Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-062-13/+4
| |
* | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵Douwe Maan2016-07-061-2/+2
| | | | | | | | responsibility to other classes
* | Style diff and blob file headers the same wayDouwe Maan2016-07-061-11/+8
| |
* | Remove unneeded divDouwe Maan2016-07-063-8/+4
|/
* Memoize the maximum access level for the author of notesStan Hu2016-06-291-1/+1
| | | | | | | In #19273, we saw that retrieving ProjectTeam#human_max_access for each note takes the bulk of the time when rendering certain issues or merge requests. We observe that most of the comments in an issue are typically done by the same users. This MR memoizes the max access level by user ID.
* Support for rendering/redacting multiple documentsYorick Peterse2016-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the way certain documents are rendered (currently only Notes) and how documents are redacted. Previously both rendering and redacting would run on a per document basis. The result of this was that for every document we'd have to run countless queries just to figure out if we could display a set of links or not. This commit changes things around so that redacting Markdown documents is no longer tied into the html-pipeline Gem. This in turn allows it to redact multiple documents in a single pass, thus reducing the number of queries needed. In turn rendering issue/merge request notes has been adjusted to take advantage of this new setup. Instead of rendering Markdown somewhere deep down in a view the Markdown is rendered and redacted in the controller (taking the current user and all that into account). This has been done in such a way that the "markdown()" helper method can still be used on its own. This particular commit also paves the way for caching rendered HTML on object level. Right now there's an accessor method Note#note_html which is used for setting/getting the rendered HTML. Once we cache HTML on row level we can simply change this field to be a column and call a "save" whenever needed and we're pretty much done.
* Merge branch 'note-emoji-system-note' into 'master' Jacob Schatz2016-06-201-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Hides award emoji & access level on system notes ## What does this MR do? Hides award emoji & access level on system notes as they aren't applicable to them notes. ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png) See merge request !4629
| * Uses not when checking for system notenote-emoji-system-notePhil Hughes2016-06-171-2/+2
| |
| * Hides award emoji & access level on system notesPhil Hughes2016-06-131-2/+2
| |
* | Merge branch 'markdowner' into 'master' Jacob Schatz2016-06-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Markdown shortcut buttons ## What does this MR do? Adds markdown shortcut buttons to text area for comments. ## Are there points in the code the reviewer needs to double check? Because changing `textarea.val('something')` kills the natural browser undo stack, I had to implement a custom undo stack using state. You can't use the "undoable" state undo pattern because you need to go back to a previous state regardless of cursor position. The undo also adds an undo history item once you delete stuff or press enter. You can also edit multiple textareas at once and it will keep an undo history for each textarea individually, so the undo state should not collide between textareas. ## Why was this MR needed? It has been requested multiple times and the competition has it. https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433 Libraries are available that already implement this functionality but they are enormous and bloaty. I implemented this in very few lines of code and kept it very simple and as minimal as possible. This was also some competitions approach. I believe so as to not include too much JS. Adding extra buttons with new functionality **should only need new HTML and no new JS**. Only extra complex thing was adding a overridden undo stack, which was made as simple as possible as well. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433 ## Screenshots (if relevant) **NOTE:** One thing you cannot see in this screenshot is that I am pressing <kbd>Cmd</kbd><kbd>Z</kbd> to undo and <kbd>Cmd</kbd><kbd>Shift</kbd><kbd>Z</kbd> to redo which is the undo/redo stack I implemented. <kbd>Ctrl</kbd><kbd>Y</kbd> also works for redo. ![markdown-editor](/uploads/2517bfb1a7b4269da7fcc4003c88b7f6/markdown-editor.gif) cc @dzaporozhets for UI cc @iamphill @alfredo1 for JS review cc @JobV if you like the idea. Fixes: #17185 See merge request !4305
| * | Move buttons to upper right.Jacob Schatz2016-06-171-10/+1
| | |
| * | Initial markdown ez buttonsJacob Schatz2016-06-171-0/+9
| |/
* | Fixed alignment of buttons in note formscomment-form-button-spacingPhil Hughes2016-06-172-2/+2
|/
* Shows award emoji for comments to all users who are logged in.Connor Shea2016-06-081-1/+2
|