Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure non-highlighted diffs are still escapedunescaped-diffs | Douwe Maan | 2016-01-22 | 1 | -2/+6 |
| | |||||
* | Update Issue/MR everytime a Note is saved/destroyed. | Rubén Dávila | 2016-01-19 | 1 | -1/+1 |
| | |||||
* | Move complex view condition to a model method | Rémy Coutable | 2016-01-13 | 1 | -0/+4 |
| | | | | | This is moved to a model method rather than an helper method because the API will need it too. | ||||
* | note votes methids implementationupvote_count_to_api | Valery Sizov | 2015-12-29 | 1 | -2/+2 |
| | |||||
* | Revert upvotes and downvotes params to MR API | Valery Sizov | 2015-12-28 | 1 | -2/+0 |
| | |||||
* | revert back vote buttons to issue and MR pages | Valery Sizov | 2015-12-25 | 1 | -1/+8 |
| | |||||
* | Banzai::XFilter -> Banzai::Filter::XFilter | Douwe Maan | 2015-12-15 | 1 | -2/+2 |
| | |||||
* | Move Markdown/reference logic from Gitlab::Markdown to Banzai | Douwe Maan | 2015-12-15 | 1 | -2/+2 |
| | |||||
* | emoji aliases problem | Valery Sizov | 2015-12-11 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/emoji_edit_disallow' | Dmitriy Zaporozhets | 2015-12-10 | 1 | -1/+1 |
|\ | |||||
| * | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching | Douwe Maan | 2015-12-10 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb | ||||
| * | Update annotations | Stan Hu | 2015-12-08 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-caching | Douwe Maan | 2015-12-08 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Add custom LineCodeValidator | Robert Speicher | 2015-12-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-07 | 1 | -0/+30 |
|\ \ | |/ | |||||
| * | Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notes | Grzegorz Bizon | 2015-12-07 | 1 | -2/+1 |
| | | |||||
| * | Refactor note awards to reuse `emoji_pattern` and improve validator | Grzegorz Bizon | 2015-12-05 | 1 | -18/+14 |
| | | |||||
| * | Make method `supports_award?` public in `Note` | Grzegorz Bizon | 2015-12-03 | 1 | -2/+2 |
| | | |||||
| * | Support emoji awards also in merge requests | Grzegorz Bizon | 2015-12-03 | 1 | -3/+4 |
| | | |||||
| * | Move note emoji-award implementation to note model (feature envy) | Grzegorz Bizon | 2015-12-03 | 1 | -0/+33 |
| | | |||||
| * | Add validator for award-emoji note | Grzegorz Bizon | 2015-12-03 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-02 | 1 | -38/+20 |
|\ \ | |/ | |||||
| * | Add upvote/downvote fields to merge request and note API to preserve ↵fix-award-emoji-api | Robert Schilling | 2015-11-21 | 1 | -0/+10 |
| | | | | | | | | compatibility | ||||
| * | adressing comments | Valery Sizov | 2015-11-19 | 1 | -2/+3 |
| | | |||||
| * | added spinach tests | Valery Sizov | 2015-11-19 | 1 | -0/+1 |
| | | |||||
| * | addressing comments | Valery Sizov | 2015-11-19 | 1 | -2/+2 |
| | | |||||
| * | award emoji | Valery Sizov | 2015-11-19 | 1 | -38/+8 |
| | | |||||
* | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-10-21 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'master' into rs-redactor-filterrs-redactor-filter | Douwe Maan | 2015-10-16 | 1 | -0/+5 |
| |\ | |||||
| | * | Fixed Rubocop styling issues | Yorick Peterse | 2015-10-15 | 1 | -1/+1 |
| | | | |||||
| | * | Renamed Note.inc_associations to with_associations | Yorick Peterse | 2015-10-15 | 1 | -1/+1 |
| | | | |||||
| | * | Eager load project associations for notes | Yorick Peterse | 2015-10-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | This ensures that when viewing an issue each note already has the associated project, project members, group and group members available. Since this information is requres for every note this results in quite the reduction of SQL queries being executed. | ||||
| | * | Eager load note projects when viewing issues | Yorick Peterse | 2015-10-15 | 1 | -1/+4 |
| | | | |||||
| | * | Eager load various issue/note associations | Yorick Peterse | 2015-10-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This ensures we don't end up running N+1 queries for the objects in the affected collections. | ||||
| * | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-15 | 1 | -10/+3 |
| |\ \ | | |/ | |||||
* | | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-14 | 1 | -10/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix cross-references originating from notes | Douwe Maan | 2015-10-12 | 1 | -10/+3 |
| | | | |||||
| * | | Simplify code around (cross)-references | Douwe Maan | 2015-10-12 | 1 | -1/+1 |
| | | | |||||
* | | | Cache rendered contents of issues, MRs and notes | Douwe Maan | 2015-10-14 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Participable doesn't need to know about Mentionable | Douwe Maan | 2015-10-14 | 1 | -2/+2 |
|/ | |||||
* | Simplify Note#editable?rs-update-note | Robert Speicher | 2015-09-30 | 1 | -1/+1 |
| | |||||
* | Re-annotate models | Stan Hu | 2015-09-06 | 1 | -0/+1 |
| | |||||
* | Case-insensetive search for commentscomment-case-insensetive-search | Dmitriy Zaporozhets | 2015-08-19 | 1 | -1/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | api: add 'system', 'upvote', and 'downvote' fields to note queries | Ben Boeckel | 2015-08-12 | 1 | -0/+4 |
| | | | | This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9. | ||||
* | Merge branch 'master' into comment-updated-by | Douwe Maan | 2015-08-06 | 1 | -1/+1 |
|\ | |||||
| * | Revert "Update noteable after a new note is added"revert_touch | Valery Sizov | 2015-08-05 | 1 | -1/+1 |
| | | | | | | | | This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78. | ||||
* | | Show who last edited a comment if it wasn't the original author | Douwe Maan | 2015-07-30 | 1 | -0/+1 |
|/ | |||||
* | Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773 | Robert Speicher | 2015-07-13 | 1 | -1/+1 |
| | |||||
* | Replace remaining references to `Note.create_cross_reference_note` | Robert Speicher | 2015-06-22 | 1 | -5/+0 |
| |