Douwe Maan
150b4f66e6
Make sure non-highlighted diffs are still escaped
2016-01-22 01:47:17 +01:00
Rubén Dávila
35a776754c
Update Issue/MR everytime a Note is saved/destroyed.
2016-01-19 15:02:26 -05:00
Rémy Coutable
5efbfa14d4
Move complex view condition to a model method
...
This is moved to a model method rather than an helper method because the
API will need it too.
2016-01-13 16:37:17 +01:00
Valery Sizov
d3807328d8
note votes methids implementation
2015-12-29 10:11:20 +02:00
Valery Sizov
83d42c1518
Revert upvotes and downvotes params to MR API
2015-12-28 11:41:16 +02:00
Valery Sizov and Valery Sizov
a1b63e1252
revert back vote buttons to issue and MR pages
2015-12-25 14:11:19 +02:00
Douwe Maan
48b3ad6d37
Banzai::XFilter -> Banzai::Filter::XFilter
2015-12-15 16:10:32 +01:00
Douwe Maan
7781bda9bd
Move Markdown/reference logic from Gitlab::Markdown to Banzai
2015-12-15 15:51:16 +01:00
Valery Sizov
72b7d1f59d
emoji aliases problem
2015-12-11 13:17:12 +02:00
Dmitriy Zaporozhets
b20f677baa
Merge remote-tracking branch 'origin/emoji_edit_disallow'
2015-12-10 19:40:18 +01:00
Douwe Maan
10387f6b8a
Merge branch 'master' into tmp-reference-pipeline-and-caching
...
# 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
2015-12-10 14:04:34 +01:00
Valery Sizov
e3ee46a13b
Don't allow to edit award emoji comments
2015-12-10 14:39:37 +02:00
Stan Hu
9dbc768db8
Update annotations
2015-12-08 21:00:01 -08:00
Douwe Maan
926c3bef9f
Merge branch 'master' into reference-pipeline-and-caching
2015-12-08 13:40:32 +01:00
Robert Speicher
ad6a771dc6
Add custom LineCodeValidator
2015-12-07 16:57:26 -05:00
Douwe Maan
d611a38798
Merge branch 'master' into reference-pipeline-and-caching
2015-12-07 14:48:53 +01:00
Grzegorz Bizon
893d08c0dc
Simplify contains_emoji_only? method in Note
2015-12-07 11:00:03 +01:00
Grzegorz Bizon
176d6e2a8f
Refactor note awards to reuse emoji_pattern and improve validator
2015-12-05 22:09:52 +01:00
Grzegorz Bizon
83d8185f5a
Make method supports_award? public in Note
2015-12-03 13:39:00 +01:00
Grzegorz Bizon
f08f921d53
Support emoji awards also in merge requests
2015-12-03 13:39:00 +01:00
Grzegorz Bizon
ba08811d07
Move note emoji-award implementation to note model (feature envy)
2015-12-03 13:38:59 +01:00
Grzegorz Bizon
9cf67f72a5
Add validator for award-emoji note
2015-12-03 13:38:59 +01:00
Douwe Maan
2955ca613b
Merge branch 'master' into reference-pipeline-and-caching
2015-12-02 11:20:51 +01:00
Robert Schilling
26b12e2c37
Add upvote/downvote fields to merge request and note API to preserve compatibility
2015-11-21 21:36:31 +01:00
Valery Sizov
bdf4007cb7
adressing comments
2015-11-19 18:12:17 +02:00
Valery Sizov
23c5473cc0
added spinach tests
2015-11-19 13:20:09 +02:00
Valery Sizov
fdd5a8f2e1
addressing comments
2015-11-19 01:26:00 +02:00
Valery Sizov
fd2c0fe446
award emoji
2015-11-19 01:25:27 +02:00
Douwe Maan
de0acf3cf7
Merge branch 'master' into reference-pipeline-and-caching
2015-10-21 11:36:41 +02:00
Douwe Maan
34148d1576
Merge branch 'master' into rs-redactor-filter
2015-10-16 11:26:48 +02:00
Yorick Peterse
bed29940ef
Fixed Rubocop styling issues
2015-10-15 12:05:01 +02:00
Yorick Peterse
e5925d073e
Renamed Note.inc_associations to with_associations
2015-10-15 12:05:01 +02:00
Yorick Peterse
b5f8161dae
Eager load project associations for notes
...
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.
2015-10-15 12:05:01 +02:00
Yorick Peterse
8237da0d4a
Eager load note projects when viewing issues
2015-10-15 12:05:01 +02:00
Yorick Peterse
1554786c6a
Eager load various issue/note associations
...
This ensures we don't end up running N+1 queries for the objects in the
affected collections.
2015-10-15 12:05:01 +02:00
Douwe Maan
95f0440a78
Merge branch 'master' into rs-redactor-filter
2015-10-15 11:26:58 +02:00
Douwe Maan
ef44138ce4
Merge branch 'master' into rs-redactor-filter
2015-10-14 22:42:59 +02:00
Douwe Maan
925dc5925b
Cache rendered contents of issues, MRs and notes
2015-10-14 21:29:35 +02:00
Douwe Maan
4a5b77188e
Participable doesn't need to know about Mentionable
2015-10-14 16:20:11 +02:00
Douwe Maan
27d952b119
Fix cross-references originating from notes
2015-10-12 14:30:44 +02:00
Douwe Maan
b0164771ec
Simplify code around (cross)-references
2015-10-12 11:54:46 +02:00
Robert Speicher
da347f3602
Simplify Note#editable?
2015-09-30 16:58:35 -04:00
Stan Hu
d7812a95cf
Re-annotate models
2015-09-06 07:48:48 -07:00
Dmitriy Zaporozhets
b7e6ae03dc
Case-insensetive search for comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-19 15:59:48 +02:00
Ben Boeckel
95f8f7c729
api: add 'system', 'upvote', and 'downvote' fields to note queries
...
This reverts commit 4c586dc7c2
2015-08-12 17:02:33 -04:00
Douwe Maan
8b6ae0104d
Merge branch 'master' into comment-updated-by
2015-08-06 12:52:26 +02:00
Valery Sizov
6353ca9ae8
Revert "Update noteable after a new note is added"
...
This reverts commit fbdaf0e2a5
2015-08-05 12:00:12 +03:00
Douwe Maan
36bd6c8494
Show who last edited a comment if it wasn't the original author
2015-07-30 14:45:54 +02:00
Robert Speicher
f3d4767d0c
Rename notice_added_references to create_new_cross_references!
2015-07-13 21:31:16 -04:00
Robert Speicher and Dmitriy Zaporozhets
2120e2dd95
Replace remaining references to Note.create_cross_reference_note
2015-06-22 12:13:46 +02:00
Douwe Maan
Rubén Dávila
Rémy Coutable
Valery Sizov
Valery SizovandValery Sizov
Douwe Maan
Dmitriy Zaporozhets
Stan Hu
Robert Speicher
Grzegorz Bizon
Robert Schilling
Yorick Peterse
Ben Boeckel