Age | Commit message (Collapse) | Author |
|
error page"
|
|
|
|
An untested code path was triggering an Exception because Fixnum
doesn't have `one?` implemented in Rails, while arrays and collections
do.
Closes #45152
|
|
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
|
|
This was sending the current user, which is the recipient! It should be the user
who pushed the commits.
|
|
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
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
|
|
Adds `#build_notification_recipients` to `NotificationRecipientService`
that returns the `NotificationRecipient` objects in order to be able to
access the new attribute `reason`.
This new attribute is used in the different notifier methods in order to
add the reason as a header: `X-GitLab-NotificationReason`.
Only the reason with the most priority gets sent.
|
|
|
|
When a note is part of a discussion, the email sent out will be
`In-Reply-To` the previous note in that discussion. It also
`References` all the previous notes in that discussion, and the
original issue.
Closes gitlab-org/gitlab-ce#36054.
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Utilizes the Devise `confirmable` capabilities. Issue #37385
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
There was a race condition issue when the application was generating an
email and was using a language that was previously being used in other
request.
|
|
|
|
|
|
- Ignore JS fixtures
- Ignore qa directory
- Rewrite concern specs to put concern name first
|
|
|
|
Visit `/rails/mailers/notify` on your local running GitLab instance to
show a preview pipeline success emails.
|
|
|
|
|
|
|
|
|
|
|
|
FFaker can generate data that randomly break our test suite. This
simplifies our factories and use sequences which are more predictive.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
We perform a bunch of setup for most of these cases, and it didn't make
sense to do an entirely new costly setup just to test a different string
in the same body of the email we just generated in the last test.
|
|
This shared example was only used by this spec so having it in a
separate file provided no benefit, at the cost of clarity. This also
reduces the three `it` blocks into a single test with
`aggregate_failures`.
|
|
|
|
This solves transient failures when a text contains HTML-escapable
characters such as `'`.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
Add setting to enable/disable HTML emails
Closes #24880
See merge request !7749
|
|
This new global setting will allow admins to specify if HTML emails should be sent or not,
this is basically useful when system administrators want to save some disk space by avoiding
emails in HTML format and using only the Plain Text version.
|
|
|
|
|
|
|
|
* Added keyword arguments to truncated_diff_lines method to allow for using highlighting or not (html templates vs. text)
* Tweaked templates for consistency and format appropriateness
|
|
Previously the `truncated_diff_lines` method for outputting a discussion diff took in already highlighted lines, which meant it wasn't reuseable for truncating ANY lines. In the way it was used, it also meant that for any email truncation, the whole diff was being highlighted before being truncated, meaning wasted time highlighting lines that wouldn't even be used (granted, they were being memoized, so perhaps this wasn't that great of an issue). I refactored truncation away from highlighting, in order to truncate formatted diffs for text templates in email, using `>`s to designate each line, but otherwise retaining the parsing already done to create `diff_lines`.
Additionally, while notes on merge requests or commits had already been tested, there was no existing test for notes on a diff on an MR or commit. Added mailer tests for such, and a unit test for truncating diff lines.
|