| Age | Commit message (Collapse) | Author |
|---|
|
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
|
|
|
|
This fixes spec/mailers/notify_spec
Also only require email_spec in the one place it's used
|
|
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`.
|
|
|
|
Tell new users when their password reset token expires and provide a
link to get a new one.
|
|
|
|
|
|
sent through Devise
Fix test case that was passing due to a broken `around` statement.
Closes #1556
|
|
|
|
|
|
|
|
This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing
changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634.
This change needed to be reverted,
because not enough email clients support inline images.
|
|
Closes #1305
|
|
|
|
|
|
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
|
|
|
|
|
|
gitlab.corp.company.com.
|
|
See #1924.
|
|
See #1809.
|
|
See #1754.
|
|
See #1827.
|
|
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.
|
|
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
|
Addex X-GitLab-Project header to GitLab emails.
|
|
Closes #1932.
|
|
Fixes #8748.
|
|
We were still passing a 'password' argument around, but it is not used
anywhere because we send a password reset link in the welcome email
nowadays.
|
|
Prevent test failures when Gitlab is configured to use a port other than
80.
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Additions to email threading
This MR follows !142:
* Add threading to "Merge request reopened" emails (see 310231dbed83e66ad4d17b8c25f225f60b30eeb7)
See merge request !145
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
* send a 'In-Reply-To' header along the 'References' header
* subject of answers to an existing thread begins with 'Re: '
|
|
This reverts commit 97fd990ecde387290be269ef7daafa5761f94af6, reversing
changes made to f451a697e0c018359e6d8ff3aaba4eb0484c4bee.
Conflicts:
app/mailers/emails/notes.rb
app/mailers/emails/projects.rb
|
|
If one commit is pushed, display the commit message in the subject
line. Otherwise display the number of commits pushed to the repository.
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
* send a ‘In-Reply-To’ header along the ‘References’ header
* subject of answers to an existing thread begins with ‘Re: ’
This fixes threading with at least Mail.app and Airmail.
|
|
This fixes email threading in Mail.app, that doesn't like when a thread
doesn't have stable recipients.
For instance, here is a possible sender-recipient combinations before:
From: A
To: Me
New issue
From: B
To: Me
Reply on new issue
From: A
To: Me
Another reply
Mail.app doesn't see B as a participant to the original email thread,
and decides to break the thread: it will group all messages from A
together, and separately all messages from B.
This commit makes the thread look like this:
From: A
To: gitlab/project
Cc: Me
New issue
From: B
To: gitlab/project
Cc: Me
Reply on new issue
From: A
To: gitlab/project
Cc: Me
Another reply
Mail.app sees a common recipient, and group the thread correctly.
|
|
Added email threading for update emails on issues and merge requests
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
This fixes issue #161.
|
|
The 'author_id_of_changes' attribute is not persisted in the database.
As we retrieve the merge request from the DB just before sending the
email, this attribute was always nil.
Also there was no tests for the merge notification code - tests have
been added.
Fix #6605
|
|
Rationale: the author name is now displayed in the email "From" field;
this information is no longer needed.
|
|
Previously the content of the issue or merge request was missing from
the email.
|
