home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,355 Commits 48 Branches 340 Tags
f036d4095e5700a1663ce3429b0342fa813c3c7a
Commit Graph
165 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f71f165f99 Fix CI mailer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-30 11:16:00 +02:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02: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
Valery Sizov f5af4efabd fix runners page 2015-09-10 17:05:43 +03:00
Valery Sizov 381180bc27 remove gitlab_ci config 2015-09-10 13:42:41 +03:00
Dmitriy Zaporozhets 90c338a495 Move helpers back to original directory 2015-09-09 14:37:34 +02:00
Douwe Maan 843694f902 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-08-26 17:53:31 -07:00
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Douwe Maan 2088880383 Ignore empty incoming messages. 2015-08-24 10:57:35 -07:00
Douwe Maan eacdd5080a Fix Basemailer#can? 2015-08-19 14:58:41 -07:00
Douwe Maan 0bc94198fc Fix BaseMailer. 2015-08-19 12:51:42 -07:00
Douwe Maan 992dbbd9fe Move sent_notification! out of Notify. 2015-08-19 12:35:23 -07:00
Douwe Maan a8a861ae2a Add BaseMailer to house shared mailer functionality. 2015-08-19 12:35:08 -07:00
Douwe Maan 03b54f1f03 Fix responding to commit notes 2015-08-19 11:35:13 -07:00
Douwe Maan 76dbafba86 Send a rejection email when the incoming email couldn't be processed. 2015-08-19 11:10:21 -07:00
Douwe Maan 6b31827a41 Include display name with reply to address. 2015-08-19 10:17:32 -07:00
Douwe Maan 4f34d363a5 Correctly set Message-ID for comment notifications. 2015-08-19 10:17:20 -07:00
Douwe Maan 73eef57d5e Make MR notification email subject more standard. 2015-08-19 10:16:30 -07:00
Douwe Maan 8906cabae7 Changes and stuff. 2015-08-18 17:02:26 -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
Stan Hu 1dc906d586 Use the configured display name in e-mails from Devise mailer 2015-05-05 19:54:21 -07:00
Stan Hu 4dda17a5bf Make Reply-To config apply to change e-mail confirmation and other notifications 
sent through Devise

Fix test case that was passing due to a broken `around` statement.

Closes #1556
 2015-05-01 22:57:10 -07:00
Robert Speicher aa9435cddb Remove duplicate settings for default_url_options 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
 2015-04-25 19:46:04 -04: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
Dmitriy Zaporozhets ecb58dacd6 Merge branch 'reference-access-control' into 'master' 
Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742
 2015-04-13 14:10:25 +00:00
Stan Hu 81a5a9713d Add ability to configure Reply-To address in gitlab.yml 
Closes #1305
 2015-04-03 06:47:54 -07:00
Douwe Maan c5d7660000 Fix errors. 2015-04-02 22:36:54 +02:00
Dmitriy Zaporozhets 6ec8ff069c Enable more rubocop style checks 2015-03-24 18:28:10 -07: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
Hannes Rosenögger 94affe6d51 Merge branch 'master' into 'master' 
Make email display name configurable

#216

See merge request !80
 2015-03-11 05:41:58 +00:00
Vyacheslav Slinko 61ed518781 Make email display name configurable 2015-03-11 11:04:23 +07: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 969de4c15a Fix EmailsOnPush to allow sending from @company.com for GitLab at gitlab.corp.company.com. 2015-02-25 15:51:13 +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