home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
97 Commits
Author SHA1 Message Date
Grzegorz Bizon 15d32b6a11 Add new notifications for issue move action 
[ci skip]
 2016-03-17 07:39:16 +01:00
Rémy Coutable e90d6ec1d8 Create a SentNotification record for #relabeled_issue_email / #relabeled_merge_request_email 2016-03-15 18:36:54 +01:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation 
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
 2016-03-15 18:22:02 +01:00
Timothy AndrewandRémy Coutable 0444fa560a Original implementation to allow users to subscribe to labels 
1. Allow subscribing (the current user) to a label

- Refactor the `Subscription` coffeescript class
  - The main change is that it accepts a container, and conducts all
    DOM queries within its scope. We need this because the labels
    page has multiple instances of `Subscription` on the same page.

2. Creating an issue or MR with labels notifies users subscribed to those labels

- Label `has_many` subscribers through subscriptions.

3. Adding a label to an issue or MR notifies users subscribed to those labels

- This only applies to subscribers of the label that has just been
  added, not all labels for the issue.
 2016-03-15 17:25:37 +01:00
Rémy Coutable 76350e2ede Ensure "new SSH key" email do not ends up as dead Sidekiq jobs 
Related to #2235.

This is done by:
1. Delaying the notification sending after the SSH key is commited in DB
2. Gracefully exit the mailer method if the record cannot be found
 2016-03-15 11:23:57 +01:00
Grzegorz Bizon c9f202b2ef Fix broken link in CI build notification emails 
Closes #13199
 2016-02-12 14:01:27 +01:00
Anton Baklanov 84124380e8 Added X-GitLab-... headers to emails from CI and Email On Push services 
Fixes #2098
 2016-01-19 20:18:39 +02:00
Zeger-Jan van de Weg 26cedc7e0b Minor improvements, unsubscribe from email footer 2016-01-09 19:32:03 +01:00
Zeger-Jan van de Weg 58867eff46 Unsubscribe from thread through link in email footer 2016-01-09 12:41:22 +01:00
Douwe MaanandRobert Speicher 12ce1cbfcf Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification 
Hotfix note mail with notification
 2016-01-04 13:33:58 -05:00
Kamil Trzciński e81ae1e68c Merge branch 'ci-services-migrate' into 'master' 
Ci Services migrate



See merge request !1985
 2015-12-14 10:32:57 +00:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Grzegorz Bizon 360a96a299 Fix specs by adding forgotten instance variable 2015-12-08 08:43:09 +01:00
Grzegorz Bizon 9f2752e5dc Remove obsolete variables in repository_push_email 2015-12-08 08:43:08 +01:00
Grzegorz Bizon 4beba7494b Improve Messagee::RepositoryPush 2015-12-08 08:43:08 +01:00
Grzegorz Bizon e2f937ce22 Refactor RepositoryPush, move to Message namespace 2015-12-08 08:43:08 +01:00
Grzegorz Bizon 8c6db54e12 Extract repository_push_email to separate class 2015-12-08 08:43:08 +01:00
Dmitriy Zaporozhets 616675b4a6 Remove duplication in mailers/emails/notes.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 11:55:43 +01:00
Dmitriy Zaporozhets bfbfa3b5f0 Remove duplication in issue emails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 23:56:16 +01:00
Valery Sizov 5b57313051 Note the original location of a moved project when notifying users of the move 2015-10-01 09:54:56 +03:00
Douwe Maan 3377808193 Fix reply by email for comments on a specific line in a diff/commit. 2015-09-20 18:18:39 +02:00
Douwe Maan 992dbbd9fe Move sent_notification! out of Notify. 2015-08-19 12:35:23 -07:00
Douwe Maan 73eef57d5e Make MR notification email subject more standard. 2015-08-19 10:16:30 -07:00
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -07:00
Douwe Maan 59f0d91a20 Prefix EmailsOnPush email subject with [Git]. 2015-05-25 16:35:37 +02:00
Dmitriy Zaporozhets 317ed1fa90 Revert "Allow to configure smtp and sendmail in gitlab.yml" 2015-05-06 17:39:18 +03:00
Jakub Jirutka b4be7aed77 Allow to configure smtp and sendmail in gitlab.yml 2015-05-06 13:15:33 +02:00
Douwe Maan 84a1590252 Let commit model know about its project. 2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets d2a895dad8 Merge branch 'emailsonpush-replyto' into 'master' 
Set EmailsOnPush reply-to address to committer email when enabled.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2227.

See merge request !520
 2015-04-15 12:37:51 +00:00
Douwe Maan cb5362e7ce Follow newline guidelines. 2015-04-14 15:16:00 +02:00
Douwe Maan c26b001ebc Set EmailsOnPush reply-to address to committer email when enabled. 2015-04-14 12:52:33 +02:00
Douwe Maan 1b5c483d89 Consistently use "invitation" rather than "invite" in text. 2015-04-14 12:25:16 +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 c5d7660000 Fix errors. 2015-04-02 22:36:54 +02:00
Douwe Maan f039e8e03f Don't use required keyword arguments to maintain support for Ruby 2.0. 2015-03-23 21:20:48 +01:00
Douwe Maan b13bed62ea Clean up code by using keyword arguments. 2015-03-23 15:08:19 +01:00
Douwe Maan bf235053ad Send EmailsOnPush email when branch or tag is created or deleted. 2015-03-18 14:07:28 +01:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01:00
Douwe Maan 4658e554b7 Fix EmailsOnPush comparison link to include first commit. 2015-02-25 18:14:29 +01:00
Douwe Maan 5d86332153 Send EmailsOnPush when deleting commits using force push. 
See #1924.
 2015-02-25 15:12:19 +01:00
Douwe Maan 85af3e82bf Add option to disable code diffs to EmailOnPush. 
See #1950
 2015-02-25 14:29:49 +01:00
Douwe Maan e0c186c357 Add option to send EmailsOnPush from committer email if domain matches. 
See #1809.
 2015-02-25 14:20:35 +01:00
Douwe Maan 6afb03ee96 Remove incorrect footer from EmailsOnPush body. 
See #1754.
 2015-02-25 13:13:46 +01:00
Douwe Maan 607f0c05fe Change EmailsOnPush subject to include namespace, repo and branch. 
See #1827.
 2015-02-25 13:13:27 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email. 
Closes #1932.
 2015-02-07 23:19:17 +01: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
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