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-08-13Support slash commands in noteable description and notesRémy Coutable
Some important things to note: - commands are removed from noteable.description / note.note - commands are translated to params so that they are treated as normal params in noteable Creation services - the logic is not in the models but in the Creation services, which is the right place for advanced logic that has nothing to do with what models should be responsible of! - UI/JS needs to be updated to handle notes which consist of commands only - the `/merge` command is not handled yet Other improvements: - Don't process commands in commit notes and display a flash is note is only commands - Add autocomplete for slash commands - Add description and params to slash command DSL methods - Ensure replying by email with a commands-only note works - Use :subscription_event instead of calling noteable.subscribe - Support :todo_event in IssuableBaseService Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-13Add specs for NotesController and DiscussionsControllerDouwe Maan
2016-08-04Actually don't send resolved notifications when deleting a noteDouwe Maan
2016-07-29Don't send resolved notifications when deleting a noteDouwe Maan
2016-07-29Add 'Resolved all discussions' system noteDouwe Maan
2016-07-29Backend tweaksDouwe Maan
2016-07-27Updates the text above discussions when resolving notes & discussionsPhil Hughes
2016-07-26Added resolved by users name into tooltipPhil Hughes
2016-07-26Add endpoints to resolve diff notes and discussionsDouwe Maan
2016-07-24Assigns to variable rather than using VueJS methodPhil Hughes
2016-07-24Resolve all endpointPhil Hughes
2016-07-24Posts to rails to update note eventuallyPhil Hughes
2016-07-21Add Discussion model to represent MR/diff discussionDouwe Maan
2016-07-07Display new diff notes and allow creation through the web interfaceDouwe Maan
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-06Backend awardables on commentsZJ van de Weg
2016-05-18Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet
2016-05-18Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet
# Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
2016-05-18Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-18Fix latests concernsZJ van de Weg
2016-05-14Extract LegacyDiffNote out of NoteDouwe Maan
2016-05-10Add tests on Awardables and Award EmojiZeger-Jan van de Weg
2016-05-06Create table for award emojiZeger-Jan van de Weg
2016-04-12Fix code review issuesRobert Schilling
2016-04-12Delete notes via APIRobert Schilling
2016-03-16Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ
`render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336)
2016-01-28[WIP] Background process note logic for #3948Josh Frye
2016-01-19Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable
This commits also fixes two minor issues: - Ensure notes that the current user is not allowed to see are not returned in the AJAX notes loading - Ensure the notes counter badge is decremented of 1 instead of 2
2015-12-23base implementation of emoji picker [ci skip]Valery Sizov
2015-12-16Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets
2015-12-15Fixed Rubocop offensesGabriel Mazetto
2015-12-12Fix note pollingRobert Speicher
Closes #4032
2015-12-03Notify user when award-emoji comment is invalidGrzegorz Bizon
2015-12-03Render json message with errors if note didn't pass validationGrzegorz Bizon
2015-11-22Emoji bug: Invalid url to imageValery Sizov
2015-11-21Award: merge request fixValery Sizov
2015-11-20Fix for EmojiValery Sizov
2015-11-19adressing commentsValery Sizov
2015-11-19satisfy rubocopValery Sizov
2015-11-19Emoji: fix image of emoji when it is submitted via commentValery Sizov
2015-11-19award emojiValery Sizov
2015-11-16Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"Robert Speicher
This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
2015-11-12Avoid render edit_form in each notes.Jason Lee
Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes).
2015-10-20Redirect to a default path if HTTP_REFERER is not setStan Hu
Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
2015-07-30Show who last edited a comment if it wasn't the original authorDouwe Maan
2015-06-26Update controller filtersDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-16Support commenting on a diff in side-by-side viewStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-04-20Fixed the Rails/ActionFilter copJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-03-03Fix bug where editing a comment with "+1" or "-1" would cause a server errorStan Hu
Closes #1151
2014-10-16Add Markdown preview to more formsVinnie Okada
Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.