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
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
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
Jeroen van Baarsen
fbdaf0e2a5
Update noteable after a new note is added
...
**What does this do?**
It makes sure that whenever a new note is added to an noteable item, the
updated_at of that item is also updated.
**Why is this needed?**
At this moment when you post a comment on an issue or add a label to an issue,
the updated_at is not changed. Because of this the filtering for least recently
updated is not really useful (since it only takes in account the original text
from the noteable).
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2015-06-05 15:22:55 +02:00
Robert Speicher
3cb6a33846
More SystemNoteService cleanup
2015-05-26 16:30:07 -04:00
Robert Speicher
b94c6d9f5b
Check if system is truthy in Note.cross_reference?
2015-05-11 00:01:16 -04:00
Robert Speicher
48e6fb532a
Add a SystemNoteService class
...
There's a lot of code in the Note model that only deals with creating
system notes, so we're going to split that into its own class.
2015-05-11 00:01:01 -04:00
Robert Speicher
0e89ff0fb0
Simplify Note#upvote? and Note#downvote?
2015-05-10 23:56:15 -04:00
Douwe Maan
889832578a
Fix small issues.
2015-04-24 12:31:16 +02:00
Douwe Maan
2456695422
Fix errors.
2015-04-24 12:30:37 +02:00
Douwe Maan
e739eb036d
Move participants method to shared Participable concern.
2015-04-24 12:30:36 +02:00
Douwe Maan
0ff778c0f4
Link cross-project cross-reference notes to correct project.
2015-04-24 12:30:36 +02:00
Douwe Maan
8ed7ac9d44
Use project.commit convenience method.
2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets
c30079f3f4
Merge branch 'rs-mentionable-examples-refactor' into 'master'
...
Update mentionable shared examples to be (a bit) more understandable
These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now.
I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it.
See merge request !1780
2015-04-23 20:50:48 +00:00
Dmitriy Zaporozhets
a4006a6b48
Merge branch 'better-commit-mentions' into 'master'
...
Clean up code around commit mentions.
Builds upon !527 .
See merge request !528
2015-04-20 12:42:31 +00:00
Robert Speicher
2dace3679f
Note#cross_reference_exists? should be checking the noteable_type also
2015-04-16 16:30:15 -04:00
Dominik Sander
d4fec49abc
Fix merge request comments on files with multiple commits
...
Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.
* `Note#set_diff` do not use stored the diff when creating a new note
in merge requests (we can not be sure the diff did not changed since
the last comment on that line)
* Do not rely just on `outdated?` of the first note when displaying
comments of a MR in the discussion tab, but partition the
active/outdated notes and display them all
* In the inline changes tab just select the active notes, so an
outdated note does not prevent an active one from being rendered
* Just show active comments in the side-by-side changes tab
2015-04-15 18:23:57 +02:00
Douwe Maan
959ebbcade
Clean up code around commit mentions.
2015-04-15 17:57:31 +02:00
Stan Hu
dfd256f29e
Support configurable attachment size via Application Settings
...
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
2015-04-02 00:04:08 -07:00
Douwe Maan
6b92236eeb
Don't include system notes in issue/MR comment count.
2015-03-23 16:43:08 +01:00
Stan Hu
fad71576f9
Fix cross references when usernames, milestones, or project names contain underscores.
...
Remove emphasis from system notes to avoid Markdown conflicts in names.
2015-03-19 07:07:30 -07:00
Dmitriy Zaporozhets
0eaabc2708
Revert "Note: add default_scope { order(created_at: :asc, id: :asc) }"
...
This reverts commit 7602cef572
2015-03-18 11:42:03 -07:00
Dmitriy Zaporozhets
b5e961eb4c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-03-18 11:15:27 -07:00
Samuel Bernard
7602cef572
Note: add default_scope { order(created_at: :asc, id: :asc) }
2015-03-18 17:06:17 +01:00
Douwe Maan
ebfc7d052b
Fix condensed range in MR push comment.
2015-03-18 16:37:29 +01:00
Dmitriy Zaporozhets
7dadd423d5
Merge branch 'condensed-mr-commits' into 'master'
...
Condense commits already in target branch when updating merge request source branch.
Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043 .
(Not shown in screenshot, but works fine with rebases as well)
See merge request !1648
2015-03-07 00:13:10 +00:00
Douwe Maan
84ebc22ad2
Use 2 periods instead of 3 to signify inclusive range.
2015-03-06 23:12:26 +01:00
Douwe Maan
663b3c968f
Condense commits already in target branch when updating merge request source branch.
2015-03-06 18:09:00 +01:00
Stan Hu
7e204cf389
Added comment notification events to HipChat and Slack services.
...
Supports four different event types all bundled under the "note" event type:
- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet
2015-03-06 06:54:00 -08:00
Robert Schilling
Valery Sizov
Douwe Maan
Yorick Peterse
Robert Speicher
Stan Hu
Dmitriy Zaporozhets
Ben Boeckel
Jeroen van Baarsen
Dmitriy Zaporozhets
Dominik Sander
Samuel Bernard
