| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'mr-formatting' into 'master' | Robert Speicher | 2016-04-19 | 1 | -6/+6 |
| |\ | | | | | | | | | | | | | use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740 | ||||
| | * | format merge request references properly | Ben Bodenmiller | 2016-04-18 | 1 | -6/+6 |
| | | | |||||
| * | | Improve 'auto fsck' admin emails | Jacob Vosmaer | 2016-04-18 | 1 | -1/+1 |
| |/ | |||||
| * | More create_listauto-fsck | Jacob Vosmaer | 2016-04-14 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck | Jacob Vosmaer | 2016-04-12 | 1 | -0/+2 |
| |\ | |||||
| | * | Premailer shouldn't remove script tags from our emails | Robert Speicher | 2016-04-05 | 1 | -0/+2 |
| | | | | | | | | | Closes #14943. | ||||
| * | | Rename almost all the things | Jacob Vosmaer | 2016-04-06 | 1 | -1/+1 |
| | | | |||||
| * | | Rebase repo check MR | Jacob Vosmaer | 2016-04-04 | 1 | -0/+21 |
| |/ | |||||
| * | Improve and finish the fallback to the In-Reply-To and References header for ↵2364-fallback-to-in-reply-to-header | Rémy Coutable | 2016-03-25 | 2 | -36/+111 |
| | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fix #2364. Fall back to In-Reply-To header when reply key not available | David Padilla | 2016-03-25 | 2 | -2/+7 |
| | | |||||
| * | Add new notifications for issue move action | Grzegorz Bizon | 2016-03-17 | 1 | -0/+27 |
| | | | | | [ci skip] | ||||
| * | Improving the original label-subscribing implementation | Rémy Coutable | 2016-03-15 | 2 | -1/+61 |
| | | | | | | | | 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 | ||||
| * | Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobs | Rémy Coutable | 2016-03-15 | 1 | -1/+5 |
| | | | | | | | | | 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 | ||||
| * | Move profile notifications specs to separate filefix/ci-emails-broken-link | Grzegorz Bizon | 2016-02-12 | 2 | -98/+107 |
| | | |||||
| * | Move build emails specs to separate file | Grzegorz Bizon | 2016-02-12 | 3 | -177/+186 |
| | | | | | | This also extracts shared examples for notification emails to separate file. | ||||
| * | Fix broken link in CI build notification emails | Grzegorz Bizon | 2016-02-12 | 1 | -38/+40 |
| | | | | | Closes #13199 | ||||
| * | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail | Jason Lee | 2016-02-09 | 1 | -0/+37 |
| | | |||||
| * | Added X-GitLab-... headers to emails from CI and Email On Push services | Anton Baklanov | 2016-01-19 | 1 | -2/+55 |
| | | | | | Fixes #2098 | ||||
| * | Minor improvements, unsubscribe from email footer | Zeger-Jan van de Weg | 2016-01-09 | 1 | -16/+16 |
| | | |||||
| * | Unsubscribe from thread through link in email footer | Zeger-Jan van de Weg | 2016-01-09 | 1 | -1/+33 |
| | | |||||
| * | Make AbuseReportMailer responsible for knowing if it should deliver | Robert Speicher | 2016-01-04 | 1 | -0/+38 |
| | | |||||
| * | Migrate CI::Services and CI::WebHooks to Services and WebHooks | Kamil Trzcinski | 2015-12-10 | 2 | -35/+29 |
| | | |||||
| * | fix deprecation messages in tests | Valery Sizov | 2015-12-03 | 1 | -5/+7 |
| | | |||||
| * | Remove some repetition in notify spec.gmail_actions_links_on_set_of_emails | Marin Jankovski | 2015-11-25 | 1 | -61/+32 |
| | | |||||
| * | Specs for links in email notifications for Gmail Actions. | Marin Jankovski | 2015-11-25 | 1 | -1/+93 |
| | | |||||
| * | Fix code that depends on incorrect inflector behavior | Dmitriy Zaporozhets | 2015-11-03 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'stanhu/gitlab-ce-fix-message-id-notify' | Dmitriy Zaporozhets | 2015-10-01 | 1 | -0/+1 |
| |\ | |||||
| | * | Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being ↵ | Stan Hu | 2015-10-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | dropped Closes #2867 | ||||
| * | | Note the original location of a moved project when notifying users of the moveproject_moving | Valery Sizov | 2015-10-01 | 1 | -1/+1 |
| |/ | |||||
| * | WIP | Kamil Trzcinski | 2015-09-29 | 1 | -2/+1 |
| | | |||||
| * | Devise 3.5.x deprecates `confirm!` in favor of `confirm` | Robert Speicher | 2015-09-19 | 1 | -3/+3 |
| | | |||||
| * | fix specs. Stage 6 | Valery Sizov | 2015-09-15 | 1 | -6/+6 |
| | | |||||
| * | Refactor CI tests | Dmitriy Zaporozhets | 2015-09-09 | 1 | -0/+36 |
| | | |||||
| * | Merge branch 'master' into rubocop-for-tests | Dmitriy Zaporozhets | 2015-06-23 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Update email_spec gem | Robert Speicher | 2015-06-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | This fixes spec/mailers/notify_spec Also only require email_spec in the one place it's used | ||||
| * | | Fix Style/Blocks cop violations | Robert Speicher | 2015-06-22 | 1 | -3/+1 |
| |/ | |||||
| * | Update ffaker gem | Robert Speicher | 2015-05-20 | 1 | -2/+2 |
| | | | | | | | 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`. | ||||
| * | Add tests for password reset token changes | Vinnie Okada | 2015-05-16 | 1 | -33/+24 |
| | | |||||
| * | Explain reset token expiration in emails | Vinnie Okada | 2015-05-16 | 1 | -0/+5 |
| | | | | | | Tell new users when their password reset token expires and provide a link to get a new one. | ||||
| * | Revert "Allow to configure smtp and sendmail in gitlab.yml" | Dmitriy Zaporozhets | 2015-05-06 | 1 | -3/+3 |
| | | |||||
| * | Allow to configure smtp and sendmail in gitlab.yml | Jakub Jirutka | 2015-05-06 | 1 | -3/+3 |
| | | |||||
| * | Make Reply-To config apply to change e-mail confirmation and other notifications | Stan Hu | 2015-05-01 | 1 | -2/+1 |
| | | | | | | | | | sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556 | ||||
| * | Use project.commit convenience method. | Douwe Maan | 2015-04-24 | 1 | -1/+1 |
| | | |||||
| * | Let commit model know about its project. | Douwe Maan | 2015-04-24 | 1 | -3/+3 |
| | | |||||
| * | Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replyto | Douwe Maan | 2015-04-14 | 1 | -0/+15 |
| | | |||||
| * | Revert "Merge branch 'fix_email_images' into 'master'" | Hannes Rosenögger | 2015-04-13 | 1 | -79/+3 |
| | | | | | | | | | This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634. This change needed to be reverted, because not enough email clients support inline images. | ||||
| * | Add ability to configure Reply-To address in gitlab.yml | Stan Hu | 2015-04-03 | 1 | -0/+8 |
| | | | | | Closes #1305 | ||||
| * | Clean up code by using keyword arguments. | Douwe Maan | 2015-03-23 | 1 | -6/+6 |
| | | |||||
| * | Send EmailsOnPush email when branch or tag is created or deleted. | Douwe Maan | 2015-03-18 | 1 | -2/+96 |
| | | |||||
| * | replace images in emails with inline images | Hannes Rosenögger | 2015-03-12 | 1 | -3/+79 |
| | | | | | | | 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 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |