diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 08:55:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 08:55:42 +0000 |
| commit | 93262415e2d5554b125e2d0ae2d1dd6e18c5bd5f (patch) | |
| tree | 62966b49ff3f9f43cd969cefd8cc9382f26e6113 | |
| parent | c12d0b4d2aba9bd9e162de15025353dc6e989df9 (diff) | |
| parent | 41734b630ed86c5aa0814cb331f4f8e94e0bf2a2 (diff) | |
| download | gitlab-ce-93262415e2d5554b125e2d0ae2d1dd6e18c5bd5f.tar.gz | |
Merge branch 'issue/vars-need-eval' into 'master'
Ensure variable in mail is evalled
I received this snippet in the mail:
```
Content-Type: text/plain;
charset=UTF-8
Content-Transfer-Encoding: 7bit
Project #{@old_path_with_namespace} was moved to another location
The project is now located under
```
This MR fixes it.
Notes:
* I did a quick grep on other 'text.erb' files, but this was the only one with this type of error
* I made no changes to the specs. The only [spec](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/spec/mailers/notify_spec.rb#L412) I could find passes because (I assume) the correct value is in the html-part
See merge request !1706
| -rw-r--r-- | app/views/notify/project_was_moved_email.text.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/project_was_moved_email.text.erb b/app/views/notify/project_was_moved_email.text.erb index d8a23dabf49..b2c5f71e465 100644 --- a/app/views/notify/project_was_moved_email.text.erb +++ b/app/views/notify/project_was_moved_email.text.erb @@ -1,4 +1,4 @@ -Project #{@old_path_with_namespace} was moved to another location +Project <%= @old_path_with_namespace %> was moved to another location The project is now located under <%= namespace_project_url(@project.namespace, @project) %> |