10871732df
Use entity number for plus sign
2015-05-27 13:04:18 +00:00
cc0f223858
Merge branch 'fix-typo-in-email' into 'master'
...
Fix "Asignee" typo in new issue/merge request emails
See merge request !676
2015-05-26 21:47:04 +00:00
b8571f141e
email: fix typo
2015-05-18 09:33:16 -04:00
af428b1259
Fill in email on the new password form
2015-05-16 14:03:18 -06:00
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
88c2639356
Remove superfluous info from invite accepted/declined mails.
2015-04-14 23:06:21 +02:00
e50556fcc8
Let invites be declined.
2015-04-14 12:08:11 +02:00
39f389ae0f
Add invites controller.
2015-04-14 12:07:33 +02:00
8e9fbd847d
Revert "Merge branch 'fix_email_images' into 'master'"
...
This reverts commit d66148ef39cdb64a81a8
2015-04-13 12:34:47 +02:00
18dfe0ce76
Merge branch 'emailsonpush-last-line' into 'master'
...
Fix final line in EmailsOnPush email diff being rendered as error.
Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194 .
Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18 .
See merge request !480
2015-04-07 09:54:23 +00:00
08eac512bd
Move EmailsOnPush highlight CSS inline instead of being in every notification email.
2015-03-31 12:36:36 +02:00
e08d947e77
Use relative URL for Markdown references, except in mails.
2015-03-27 10:39:05 +01:00
bf235053ad
Send EmailsOnPush email when branch or tag is created or deleted.
2015-03-18 14:07:28 +01:00
aa4691acac
Fix email template css for project moved emails
2015-03-17 18:38:10 -07:00
d659c1d1fd
More actively use css variabled to prevent colors duplication
2015-03-17 18:01:33 -07:00
99f995755e
Use `group_member` instead of `users_group` or `membership`.
2015-03-15 13:49:41 +01:00
3c7e0f45c2
replace images in emails with inline images
...
This adds the functionality of replacing all images that were uploaded
to gitlab with inline images(base64) in emails.
This change fixes the broken images in emails that 7.8 introduced
2015-03-12 09:26:06 +01:00
5d86332153
Send EmailsOnPush when deleting commits using force push.
...
See #1924 .
2015-02-25 15:12:19 +01:00
769f137a53
Wrap commit message in EmailsOnPush email.
...
See #1867 .
2015-02-25 14:37:15 +01:00
ae70a80fc2
Fix links in EmailsOnPush text version.
2015-02-25 14:32:55 +01:00
85af3e82bf
Add option to disable code diffs to EmailOnPush.
...
See #1950
2015-02-25 14:29:49 +01:00
7b34c9dc59
Add list of changed files to EmailsOnPush.
...
See #1906 .
2015-02-25 13:40:05 +01:00
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
e460e04e16
Add Diff syntax colors for email-on-push notifications
2015-01-17 19:19:28 +01:00
2ff6066088
Add commit dates to repository-push email tempalte
2014-12-11 14:18:18 +02:00
56ffa0fba4
improve ssh key emails
2014-10-28 00:06:22 -07:00
75eacf4d44
Update email templates for email on push service with links to commit and repository.
2014-09-30 11:28:43 +02:00
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
487f78be12
Merge pull request #7677 from cirosantilli/factor-issue-mr-text-email
...
Fix missing to on reassign Merge Request text email to unassigned.
2014-09-04 16:02:53 +03:00
c586192813
Fix missing to on reassign MR text email to unassigned.
...
Factors out text MR and issue email.
2014-09-03 01:33:02 +02:00
330251de91
Fix missing to on reassign MR email to unassigned.
...
Factors out MR and issue email.
2014-09-01 17:35:25 +02:00
15c8967238
Remove HAML eval for const strings.
2014-08-26 18:01:46 +02:00
f844556531
Fix email on push
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 15:18:11 +03:00
56398ea161
Do not sent a generated password via email for admin created user.
2014-07-15 13:25:11 +02:00
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
6a6803c2f9
Show full commit message and author name for Email on push service
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-04 17:42:11 +03:00
310231dbed
Reopen mr email notification.
2014-07-03 13:40:21 +02:00
39f82b75f5
When assigning an unassigned issue send notification with the correct text.
2014-07-02 11:55:05 +02:00
b88401c9aa
Merge branch 'mail_template' into 'master'
...
Mail template changes (add the command line for http) when a project is moved in an other namespace.
See subject, it is just the addition of the set-url for http(s) origin in the mails.
2014-07-01 11:48:47 +00:00
1355ede49d
Wipe wall notes feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 14:24:54 +03:00
b3b0876e98
Add the http(s) command lines in the mails for the new origin when a project was moved in an other namespace.
2014-05-21 10:37:41 +02:00
058c48845b
Merge branch 'fix_merge_request_emails' into 'master'
...
Remove markdown syntax from notification emails
Merge request notifications once again gained markdown syntax 😄 In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c5
2014-05-08 18:36:32 +00:00
17b3da07ce
Remove markdown notation from notification emails
2014-04-28 14:33:17 -05:00
25cc5fbf78
do not html encode plaintext part of emails for push notifications
...
Also-by: Andrew Karpow <andy@ndyk.de>
2014-04-26 03:43:24 +02:00
043c9f8640
Change Diff to Changes in views.
2014-03-26 14:00:12 +01:00
9f405068cd
SHow group name in access granted email
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-11 13:33:47 +02:00
ad278c4e74
Make the merge request notification emails more readable
...
Emphasize the meaningful informations, and remove the less needed ones:
* Use "!" to identify a merge request
* Write the name of the commented file for diff notes
* Don't show the assignee in the "merged merge request" email
2014-03-03 16:58:44 +01:00
306744bbb0
Simplify the default layout of notification emails
...
* Less margin: the content appears as the text of the message.
* Streamlined footer: everything on one line, with a small separator.
* Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display
the content of the message. Switching to a simpler layout fixes the
issue.
2014-03-03 16:58:44 +01:00
ec196fbbf2
Remove the quote-style around message in notification emails
...
Rationale:
* In this notification email, the message is the most important content.
It should not be dimmed or smaller than the rest of the text.
* Now that all UI elements are removed, the message *is* the email. It
should be written as a standard email message, without styling.
2014-03-03 16:58:44 +01:00
eeb011e34a
Remove the author name from issue notes emails
...
Rationale: the author name is now displayed in the email "From" field;
this information is no longer needed.
2014-03-03 16:58:44 +01:00
Steve Norman
Robert Speicher
Ben Boeckel
Vinnie Okada
Douwe Maan
Hannes Rosenögger
Dmitriy Zaporozhets
Miz
Ben Bodenmiller
Marin Jankovski
Ciro Santilli
Marin Jankovski
Mathieu Schroeter
Drew Blessing
Nico Suhl
Pierre de La Morinerie