Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-21Merge branch 'discussion-model' into 'master' Robert Speicher
Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
2016-07-21Add image border in Markdown preview (!5162)winniehell
2016-07-21Add Discussion model to represent MR/diff discussionDouwe Maan
2016-07-19Added redirect_to_referer to login link on issuesPhil Hughes
Closes #19968
2016-07-12Merge branch 'quick-start-ci-route' into 'master' Douwe Maan
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
2016-07-12Merge branch 'remove-pinto-from-flash' into 'master' Jacob Schatz
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
2016-07-11Update the help_page_path route to accept paths directly instead of using ↵Connor Shea
parameters.
2016-07-07Display new diff notes and allow creation through the web interfaceDouwe Maan
2016-07-07Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵Douwe Maan
responsibility to other classes
2016-07-07Style diff and blob file headers the same wayDouwe Maan
2016-07-07Remove unneeded divDouwe Maan
2016-07-01Remove `pinTo` from `Flash` and make inline flash messages look nicer (!4854)winniehell
2016-06-29Memoize the maximum access level for the author of notesStan Hu
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.
2016-06-24Support for rendering/redacting multiple documentsYorick Peterse
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.
2016-06-20Merge branch 'note-emoji-system-note' into 'master' Jacob Schatz
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
2016-06-20Merge branch 'markdowner' into 'master' Jacob Schatz
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
2016-06-17Move buttons to upper right.Jacob Schatz
2016-06-17Initial markdown ez buttonsJacob Schatz
2016-06-17Fixed alignment of buttons in note formsPhil Hughes
2016-06-17Uses not when checking for system notePhil Hughes
2016-06-13Hides award emoji & access level on system notesPhil Hughes
2016-06-09Shows award emoji for comments to all users who are logged in.Connor Shea
2016-06-06Merge branch 'edit-mobile' into 'master' Jacob Schatz
Shows the edit comment button on mobile ## What does this MR do? Shows the edit comment button on mobile. ## What are the relevant issue numbers? Closes #17214 ## Screenshots (if relevant) ![Screen_Shot_2016-06-01_at_12.33.13](/uploads/d46b800c175a53821ea8e8af49c07641/Screen_Shot_2016-06-01_at_12.33.13.png) See merge request !4402
2016-06-06Some design related tweaks.Fatih Acet
2016-06-06Award emoji implementation for notes.Fatih Acet
2016-06-06Show emoji menu in notes.Fatih Acet
2016-06-02Shows the edit comment button on mobilePhil Hughes
Closes #17214
2016-05-26Added author to various Markdown calls in viewsYorick Peterse
This ensures all these calls have an author set, allowing the use of "all" mentions where possible.
2016-05-14Rename diff_with_notes partial.Douwe Maan
2016-05-14"the outdated diff" -> "an outdated diff"Douwe Maan
2016-05-14Clean up LegacyDiffNote somewhatDouwe Maan
2016-05-14Extract LegacyDiffNote out of NoteDouwe Maan
2016-04-20Removed commented text from system notesPhil Hughes
2016-04-18Merge branch 'print-style' into 'master' Jacob Schatz
Print style [test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf) Closes #14201 See merge request !3784
2016-04-18Merge branch 'discussion-notes' into 'master' Jacob Schatz
Discussion notes update - At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues - Moved the dates to be in the header like other notes - Fixed overlapping issue on mobile See merge request !3720
2016-04-18Updated print stylePhil Hughes
Closes #14201
2016-04-15Scroll to the last comment I made and edit it.Jacob Schatz
2016-04-14Syntax & style updatesAnnabel Dunstone
2016-04-14Fixed testsPhil Hughes
2016-04-14Add line type conditional to diff line helperAnnabel Dunstone
2016-04-14Add content attributes to discussion diffs; change styling of add-note icon ↵Annabel Dunstone
to prevent white spaces in paste
2016-04-14Discussion notes updatePhil Hughes
At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues Moved the dates to be in the header like other notes Fixed overlapping issue on mobile
2016-04-14Removed GL Actions classPhil Hughes
2016-04-14Updated all GFM forms to use new GLForm classPhil Hughes
2016-04-14Notes form JS updatePhil Hughes
Updated the JS to have a standard class with standard actions for each form Created ability to have toolbar buttons that insert different prefixes dependant upon the data-prefix attribute
2016-04-12Merge branch 'member-access-note-row' into 'master' Jacob Schatz
Fixed issue with member access not being visible on notes This happened because the `note-actions`, which houses the access, was wrapped in a `can_edit` if statement ![Screen_Shot_2016-04-08_at_16.02.47](/uploads/40bffe9bb53c015f30ffa93bb018552b/Screen_Shot_2016-04-08_at_16.02.47.png) Fixes #15049 See merge request !3618
2016-04-08Fixed issue with member access not being visible on notesPhil Hughes
Fixes #15049
2016-04-08Remove comment count & icon from side by side viewAnnabel Dunstone
2016-04-08Remove comment count & iconAnnabel Dunstone
2016-04-08Update diff colors and iconsAnnabel Dunstone