| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-email | Eric Eastwood | 2018-04-04 | 3 | -10/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474 Conflicts: db/schema.rb ee/app/controllers/ee/admin/application_settings_controller.rb ee/app/helpers/ee/application_settings_helper.rb ee/app/models/ee/application_setting.rb ee/app/models/license.rb ee/app/views/layouts/service_desk.html.haml ee/app/views/notify/approved_merge_request_email.html.haml ee/app/views/notify/service_desk_new_note_email.text.erb ee/app/views/notify/service_desk_thank_you_email.text.erb ee/app/views/notify/unapproved_merge_request_email.html.haml ee/lib/ee/api/entities.rb ee/spec/controllers/admin/application_settings_controller_spec.rb ee/spec/models/application_setting_spec.rb ee/spec/requests/api/settings_spec.rb lib/api/settings.rb spec/mailers/previews/notify_preview.rb | ||||
| * | Fix unapproved unassigned MR email erroring outce-3092-fix-unassigned-unapproved-mr-email-failing | Eric Eastwood | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/3092 Conflicts: ee/app/views/notify/unapproved_merge_request_email.html.haml spec/mailers/notify_spec.rb | ||||
| * | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-06 | 1 | -0/+10 |
| |\ | |||||
| | * | Make it possible to preview pipeline success/failed emails | Toon Claes | 2017-04-06 | 1 | -0/+11 |
| | | | | | | | | | | | Visit `/rails/mailers/notify` on your local running GitLab instance to show a preview pipeline success emails. | ||||
| * | | Remove unused code | Douwe Maan | 2017-04-05 | 1 | -18/+0 |
| | | | |||||
| * | | Address review comments | Douwe Maan | 2017-04-05 | 1 | -0/+115 |
| |/ | |||||
| * | Add previews for all customized Devise emails | Robert Speicher | 2016-06-16 | 1 | -2/+21 |
| | | |||||
| * | New confirmation email :fire: | Robert Speicher | 2016-05-25 | 1 | -1/+1 |
| | | |||||
| * | Customize ActionMailer preview path | Robert Speicher | 2016-05-25 | 1 | -0/+11 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |