Commit Graph
93 Commits
Author SHA1 Message Date
Douwe Maan fa9004c78c Send notification to all participants when MR is merged. 2015-07-30 15:29:43 +02:00
Douwe Maan 6960e83b1e Fix. 2015-05-15 13:54:41 +02:00
Douwe Maan fb86ec519c Move stuff around a bit in NotifictionService. 2015-05-15 12:45:18 +02:00
Douwe Maan 27af24c1c9 No longer needed to pass project argument to commit methods. 2015-04-24 12:29:36 +02:00
Douwe Maan c644dd01a4 Only send note notifications to people accessible by the note author.
Should not make a difference most of the time, since if they're participating in the thread, they have access to the project.
2015-04-15 17:57:31 +02:00
Douwe Maan 959ebbcade Clean up code around commit mentions. 2015-04-15 17:57:31 +02:00
Douwe Maan b73ffbd3cb Fix for snippets. 2015-04-15 17:57:26 +02:00
Douwe Maan efe9629346 Fix Mention notification level. 2015-04-15 17:57:26 +02:00
Douwe Maan e50556fcc8 Let invites be declined. 2015-04-14 12:08:11 +02:00
Douwe Maan 717fa136a5 Add emails around invitation. 2015-04-14 12:08:10 +02:00
Douwe Maan 403b727138 Slightly refactor getting note notification recipients. 2015-04-02 10:57:01 +02: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 9162e34bb0 Merge branch 'issue_subscription' into 'master'
Subscription to issue/mr

Fixes #1911 and #1909

![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png)

![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png)

See merge request !1702
2015-03-17 16:45:04 +00:00
Valery Sizov 1b437ec349 tests 2015-03-16 21:38:41 +02:00
Valery Sizov f53683e67f fix specs 2015-03-16 16:51:49 +02:00
Valery Sizov 410d25c8ca rename table subscribe; make it polymorfic 2015-03-16 15:22:50 +02:00
Valery Sizov 09ef69b7c8 code folding fix 2015-03-16 13:52:55 +02:00
Valery Sizov 9698b36c1c Subscription 2015-03-15 19:44:59 +02:00
Douwe Maan bbdf23261c Use member instead of tm. 2015-03-15 13:50:38 +01:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Dmitriy Zaporozhets de629b4835 Blocking user does not remove him/her from project/groups but show blocked label 2015-03-09 19:02:30 -07:00
Dmitriy Zaporozhets 2b02852507 Add issue/mr participants to reasign events
Also refactor NotificationService a bit
2015-01-25 20:31:02 -08:00
Dmitriy Zaporozhets ce9686e3f5 Include issue/mr participants in list of recipients for close/reopen emails 2015-01-25 19:59:04 -08:00
Steven Burgart 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
Dmitriy Zaporozhets c5ba87a2fb Merge pull request #8096 from cirosantilli/regex-to-string
Replace regex methods by string ones since faster and more readable
2015-01-15 14:37:11 -08:00
Dmitriy Zaporozhets cf95736865 New feature: add 'Mention' notification level
It does disable all emails expect system one or when you was @mentioned

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-29 15:55:21 +02:00
Ciro Santilli cd688a6011 Replace regex methods by string ones since faster
and more readable.
2014-12-28 23:53:27 +01:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Jacob Vosmaer 25a566da0a Remove unused password argument from notification
We were still passing a 'password' argument around, but it is not used
anywhere because we send a password reset link in the welcome email
nowadays.
2014-12-01 15:11:26 +01:00
Dmitriy Zaporozhets fd17ba9ffc Mentioned users are not limited by project scope any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-30 13:26:45 +02:00
Ciro Santilli f808ecf11e DRY mentioned in magic note constant 2014-10-19 22:19:56 +02:00
Dmitriy Zaporozhets bdbadebe3e Fix adminarea and emails for new membership logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
Marin Jankovski 56398ea161 Do not sent a generated password via email for admin created user. 2014-07-15 13:25:11 +02:00
Dmitriy Zaporozhets 5bb2840dc4 Merge branch 'notification_when_reopened' into 'master'
Notification when reopened issue or mr

Fixes #1396

See merge request !939
2014-07-05 05:40:32 +00:00
Marin Jankovski 310231dbed Reopen mr email notification. 2014-07-03 13:40:21 +02:00
Dmitriy Zaporozhets dcd14c0af0 Merge branch 'no_notification_for_merger' into 'master'
No notification for merger

Fixes #1378

See merge request !935
2014-07-03 10:51:33 +00:00
Marin Jankovski 1208c6caa8 Notification for reopened issue. 2014-07-03 12:51:24 +02:00
Marin Jankovski c3533deda1 Don't notify the user that triggered the mr notification. 2014-07-03 10:26:47 +02:00
Marin Jankovski f50c7ecadc Remove new lines. 2014-07-02 19:09:27 +02:00
Marin Jankovski bc7656a306 Do not notify person who merged the MR. 2014-07-02 16:38:03 +02:00
Marin Jankovski 12f696c23e Remove unecessary return. 2014-07-02 16:02:26 +02:00
Marin Jankovski 39f82b75f5 When assigning an unassigned issue send notification with the correct text. 2014-07-02 11:55:05 +02:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 14:24:54 +03:00
Dmitriy Zaporozhets 525fa6c11b Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-10 12:29:23 +03:00
Marin Jankovski 109ab1a58b Add comments, fix style, better names for notification methods. 2014-04-01 17:18:52 +02:00
Marin Jankovski 528a641e9e Use group notification settings while honoring project settings. 2014-04-01 17:18:52 +02:00
Marin Jankovski ce30a56f33 Add or remove watchers from list based on their notification settings. 2014-04-01 17:18:52 +02:00
Marin Jankovski c34186f882 Refactor project watchers collecting. 2014-03-28 17:51:13 +01:00