-
- Downloads
Merge branch 'pipeline-emails' into 'master'
Add a new pipeline email service ## What does this MR do? Add a new pipeline email service ## What are the relevant issue numbers? Closes #3976 ## Remaining tasks * [x] Preserve `·` and ` ` * [x] Use XHTML 1.0 * [ ] Use the same layout (`app/views/layouts/notify.html.haml`) * [ ] Digest or not (assets or public) * [x] A similar email for succeeded pipeline * [x] Plain text versions for both emails ## Screenshots (if relevant) https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16594345 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] `PipelinesEmailService` - [x] `SendPipelineNotificationService` See merge request !6019
No related branches found
No related tags found
Showing
- CHANGELOG.md 1 addition, 0 deletionsCHANGELOG.md
- app/assets/images/mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif 0 additions, 0 deletions...lers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif
- app/assets/images/mailers/ci_pipeline_notif_v1/gitlab-logo.gif 0 additions, 0 deletions...ssets/images/mailers/ci_pipeline_notif_v1/gitlab-logo.gif
- app/assets/images/mailers/ci_pipeline_notif_v1/icon-branch-gray.gif 0 additions, 0 deletions.../images/mailers/ci_pipeline_notif_v1/icon-branch-gray.gif
- app/assets/images/mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif 0 additions, 0 deletions...ailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif
- app/assets/images/mailers/ci_pipeline_notif_v1/icon-commit-gray.gif 0 additions, 0 deletions.../images/mailers/ci_pipeline_notif_v1/icon-commit-gray.gif
- app/assets/images/mailers/ci_pipeline_notif_v1/icon-x-red-inverted.gif 0 additions, 0 deletions...ages/mailers/ci_pipeline_notif_v1/icon-x-red-inverted.gif
- app/assets/images/mailers/ci_pipeline_notif_v1/icon-x-red.gif 0 additions, 0 deletions...assets/images/mailers/ci_pipeline_notif_v1/icon-x-red.gif
- app/controllers/admin/services_controller.rb 2 additions, 6 deletionsapp/controllers/admin/services_controller.rb
- app/controllers/projects/builds_controller.rb 3 additions, 1 deletionapp/controllers/projects/builds_controller.rb
- app/helpers/gitlab_routing_helper.rb 16 additions, 0 deletionsapp/helpers/gitlab_routing_helper.rb
- app/mailers/.gitkeep 0 additions, 0 deletionsapp/mailers/.gitkeep
- app/mailers/emails/pipelines.rb 43 additions, 0 deletionsapp/mailers/emails/pipelines.rb
- app/mailers/notify.rb 1 addition, 0 deletionsapp/mailers/notify.rb
- app/models/ci/build.rb 14 additions, 9 deletionsapp/models/ci/build.rb
- app/models/project.rb 2 additions, 1 deletionapp/models/project.rb
- app/models/project_services/builds_email_service.rb 1 addition, 1 deletionapp/models/project_services/builds_email_service.rb
- app/models/project_services/pipelines_email_service.rb 96 additions, 0 deletionsapp/models/project_services/pipelines_email_service.rb
- app/models/service.rb 3 additions, 2 deletionsapp/models/service.rb
- app/services/ci/send_pipeline_notification_service.rb 19 additions, 0 deletionsapp/services/ci/send_pipeline_notification_service.rb
3.57 KiB
2.97 KiB
663 B
369 B
278 B
1013 B
660 B
app/mailers/.gitkeep
deleted
100644 → 0
app/mailers/emails/pipelines.rb
0 → 100644