b0164771ec
Simplify code around (cross)-references
2015-10-12 11:54:46 +02:00
da347f3602
Simplify Note#editable?
2015-09-30 16:58:35 -04:00
d7812a95cf
Re-annotate models
2015-09-06 07:48:48 -07:00
b7e6ae03dc
Case-insensetive search for comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 15:59:48 +02:00
95f8f7c729
api: add 'system', 'upvote', and 'downvote' fields to note queries
...
This reverts commit 4c586dc7c2
2015-08-12 17:02:33 -04:00
8b6ae0104d
Merge branch 'master' into comment-updated-by
2015-08-06 12:52:26 +02:00
6353ca9ae8
Revert "Update noteable after a new note is added"
...
This reverts commit fbdaf0e2a5
2015-08-05 12:00:12 +03:00
36bd6c8494
Show who last edited a comment if it wasn't the original author
2015-07-30 14:45:54 +02:00
f3d4767d0c
Rename `notice_added_references` to `create_new_cross_references!`
2015-07-13 21:31:16 -04:00
2120e2dd95
Replace remaining references to `Note.create_cross_reference_note`
2015-06-22 12:13:46 +02:00
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
3cb6a33846
More SystemNoteService cleanup
2015-05-26 16:30:07 -04:00
b94c6d9f5b
Check if `system` is truthy in `Note.cross_reference?`
2015-05-11 00:01:16 -04:00
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
0e89ff0fb0
Simplify `Note#upvote?` and `Note#downvote?`
2015-05-10 23:56:15 -04:00
889832578a
Fix small issues.
2015-04-24 12:31:16 +02:00
2456695422
Fix errors.
2015-04-24 12:30:37 +02:00
e739eb036d
Move participants method to shared Participable concern.
2015-04-24 12:30:36 +02:00
0ff778c0f4
Link cross-project cross-reference notes to correct project.
2015-04-24 12:30:36 +02:00
8ed7ac9d44
Use project.commit convenience method.
2015-04-24 12:29:36 +02:00
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
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
2dace3679f
Note#cross_reference_exists? should be checking the noteable_type also
2015-04-16 16:30:15 -04:00
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
959ebbcade
Clean up code around commit mentions.
2015-04-15 17:57:31 +02:00
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
6b92236eeb
Don't include system notes in issue/MR comment count.
2015-03-23 16:43:08 +01:00
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
0eaabc2708
Revert "Note: add default_scope { order(created_at: :asc, id: :asc) }"
...
This reverts commit 7602cef572
2015-03-18 11:42:03 -07:00
b5e961eb4c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-03-18 11:15:27 -07:00
7602cef572
Note: add default_scope { order(created_at: :asc, id: :asc) }
2015-03-18 17:06:17 +01:00
ebfc7d052b
Fix condensed range in MR push comment.
2015-03-18 16:37:29 +01:00
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
84ebc22ad2
Use 2 periods instead of 3 to signify inclusive range.
2015-03-06 23:12:26 +01:00
663b3c968f
Condense commits already in target branch when updating merge request source branch.
2015-03-06 18:09:00 +01:00
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
0632e85c82
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.
2015-02-20 10:23:34 +01:00
8681cb3137
Add labels notes
2015-02-08 22:35:41 +06:00
3e97ac2022
Add index on order columns
2015-02-06 10:21:48 -08:00
a5b255fbdf
Code improvements according to styleguide
2015-01-22 09:37:47 -08:00
7d1e6f1546
Merge pull request #8607 from skburgart/fix-typos
...
Fix various typos
2015-01-21 23:02:48 -08:00
505a492cd8
Only count the user's last vote
2015-01-19 21:18:36 +00:00
5c80160218
Fix various typos
...
signe-in -> signed-in
go_to_gihub_for_permissions -> go_to_github_for_permissions
descendand -> descendant
behavour -> behaviour
recepient_email -> recipient_email
generate_fingerpint -> generate_fingerprint
dependes -> depends
Cant't -> Can't
wisit -> visit
notifcation -> notification
sufficent_scope -> sufficient_scope?
levet -> level
2015-01-18 10:29:37 -05:00
b758b4c80b
If noteable is nil - make discussion outdated
2015-01-10 19:26:00 -08:00
4ab728bfe8
Fix random Argument error when update note
...
In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-15 16:31:23 +02:00
940ed58e76
Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-11-12 13:19:35 +02:00
95e8f9797a
Merge pull request #7617 from pkill/issue-280-commit-note-notifications
...
Issue-280 Send notifications when a note is added to a commit and author...
2014-11-12 12:17:27 +02:00
383ac10ca5
Issue-280 Send notifications when a note is added to a commit and author is a group member
...
This fixes a bug where commit authors weren't receiving email notifications for notes added to their commits and their membership was in the group but not the project. The fix is to look up membership via the team object which accounts for both project and group members.
2014-11-05 10:28:59 -06:00
2ee1ec4300
Do not allow cross reference note in a mr if a mr contains mentioned commit.
2014-11-05 12:53:10 +01:00
f808ecf11e
DRY mentioned in magic note constant
2014-10-19 22:19:56 +02:00
Douwe Maan
Robert Speicher
Stan Hu
Dmitriy Zaporozhets
Ben Boeckel
Valery Sizov
Jeroen van Baarsen
Dmitriy Zaporozhets
Dominik Sander
Samuel Bernard
Nikita Verkhovin
Michael Clarke
Steven Burgart
Alex Elman
Marin Jankovski
Ciro Santilli
