home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,219 Commits 48 Branches 340 Tags
b2dc9176018729efc1969035b30017c2ed81a708
Commit Graph
143 Commits
Author SHA1 Message Date
Robert Speicher 7b66dcf65e Add previews for all customized Devise emails 2016-06-16 20:10:52 -04:00
Rémy Coutable 515205d3c1 UI and copywriting improvements 
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:18:14 +02:00
Rémy Coutable 6d103a2f47 Factorize members mails into a new Emails::Members module 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:07:26 +02:00
Rémy Coutable d26f81239a Add request access for groups 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:07:26 +02:00
DJ Mountney 7d57b11093 Update tests for the current_application_settings request store changes 2016-05-27 19:05:52 -07:00
Robert Speicher 3e3463218d New confirmation email 🔥 2016-05-25 16:56:06 -04:00
Robert Speicher 2682c58847 Customize ActionMailer preview path 2016-05-25 16:56:06 -04:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses 
Also removes the note from the development/testing.md guide
 2016-05-24 15:40:29 -04:00
Sean McGivern a9977f2b7a Syntax-highlight diffs in push emails 
Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
 2016-05-17 13:23:17 +01:00
Sean McGivern 5f27e26bb4 Only generate repository push email once 
The repository push email can be very expensive to generate, especially
with syntax-highlighted diffs. Instead of generating the email for each
recipient, generate one email object and reset the Message-Id and To
headers for each recipient. (Cloning would also be expensive in the case
of large emails, although probably not as bad as generating from
scratch.)
 2016-05-11 09:16:01 +01:00
Robert Speicher 7b09bab68e Merge branch 'mr-formatting' into 'master' 
use ! rather than # for merge request references

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278

See merge request !3740
 2016-04-19 16:23:41 +00:00
Ben Bodenmiller b68e3925ff format merge request references properly 2016-04-18 23:32:02 -07:00
Jacob Vosmaer fdf6ca6c01 Improve 'auto fsck' admin emails 2016-04-18 10:58:40 +02:00
Jacob Vosmaer 77daebe660 More create_list 2016-04-14 17:05:41 +02:00
Jacob Vosmaer 7b1bb0f4db Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-12 17:44:02 +02:00
Jacob Vosmaer 5cf56e5647 Rename almost all the things 2016-04-06 13:47:05 +02:00
Robert Speicher ee1de011d1 Premailer shouldn't remove script tags from our emails 
Closes #14943.
 2016-04-05 17:03:34 -04:00
Jacob Vosmaer bf9526739b Rebase repo check MR 2016-04-04 17:23:43 +02:00
Rémy Coutable 9f218fc184 Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature 
A few things to note:
- The IncomingEmail feature is now enabled even without a
  correctly-formatted sub-address
- Message-ID for new thread mail are kept the same so that subsequent
  notifications to this thread are grouped in the thread by the email
  service that receives the notification
  (i.e. In-Reply-To of the answer == Message-ID of the first thread message)
- To maximize our chance to be able to retrieve the reply key, we look
  for it in the In-Reply-To header and the References header
- The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]"
- Improve docs thanks to Axil
 2016-03-25 13:05:15 +01:00
David PadillaandRémy Coutable 31e76baf61 Fix #2364. Fall back to In-Reply-To header when reply key not available 2016-03-25 13:05:15 +01:00
Grzegorz Bizon 15d32b6a11 Add new notifications for issue move action 
[ci skip]
 2016-03-17 07:39:16 +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
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 c0033e96ba Move profile notifications specs to separate file 2016-02-12 14:01:28 +01:00
Grzegorz Bizon 055ec4dc0a Move build emails specs to separate file 
This also extracts shared examples for notification emails to separate
file.
 2016-02-12 14:01:28 +01:00
Grzegorz Bizon c9f202b2ef Fix broken link in CI build notification emails 
Closes #13199
 2016-02-12 14:01:27 +01:00
Jason LeeandRémy Coutable 9474e36f46 Add option to include the sender name in body of Notify email. fix #7824 2016-02-09 12:58:13 +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
Robert Speicher 01248d2051 Make AbuseReportMailer responsible for knowing if it should deliver 2016-01-04 18:59:25 -05:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Valery Sizov 162cd0099c fix deprecation messages in tests 2015-12-03 10:33:43 +02:00
Marin Jankovski 5c0be319cc Remove some repetition in notify spec. 2015-11-25 13:59:03 +01:00
Marin Jankovski 7da750cc30 Specs for links in email notifications for Gmail Actions. 2015-11-25 13:27:31 +01:00
Dmitriy Zaporozhets d23ffc832c Fix code that depends on incorrect inflector behavior 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-03 12:00:27 +01:00
Dmitriy Zaporozhets 63bbe42c9c Merge branch 'stanhu/gitlab-ce-fix-message-id-notify' 2015-10-01 16:28:10 +02:00
Stan Hu 2e92600b30 Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being dropped 
Closes #2867
 2015-10-01 01:46:08 -07: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
Kamil Trzcinski 30c78e70cb WIP 2015-09-29 10:47:03 +02:00
Robert Speicher 69723d2002 Devise 3.5.x deprecates confirm! in favor of confirm 2015-09-19 21:15:13 -04:00
Valery Sizov 88b3195ecf fix specs. Stage 6 2015-09-15 16:29:36 +03:00
Dmitriy Zaporozhets cc4ef4da11 Refactor CI tests 2015-09-09 14:17:16 +02:00
Dmitriy Zaporozhets f40b99d02e Merge branch 'master' into rubocop-for-tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb
 2015-06-23 10:44:03 +02:00
Robert Speicher 15a05be70d Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
Robert SpeicherandDmitriy Zaporozhets 20a871cc21 Update email_spec gem 
This fixes spec/mailers/notify_spec

Also only require email_spec in the one place it's used
 2015-06-22 12:13:46 +02:00
Robert Speicher 9789b56a31 Update ffaker gem 
Adds a version requirement which it didn't have before, at 2.0.0. This
version has breaking API changes in that the namespace is now `FFaker`
instead of `Faker`.
 2015-05-20 19:22:00 -04:00
Vinnie Okada 56e06b03bf Add tests for password reset token changes 2015-05-16 14:11:33 -06:00
Vinnie Okada 0bfab084a8 Explain reset token expiration in emails 
Tell new users when their password reset token expires and provide a
link to get a new one.
 2015-05-16 14:03:07 -06:00
Dmitriy Zaporozhets 317ed1fa90 Revert "Allow to configure smtp and sendmail in gitlab.yml" 2015-05-06 17:39:18 +03:00