summaryrefslogtreecommitdiff
path: root/app/views/notify/new_merge_request_email.html.haml
Commit message (Collapse)AuthorAgeFilesLines
* Remove last remaining `reference_only_path` usagesRobert Speicher2015-09-031-1/+1
|
* Revert "Merge branch 'fix_email_images' into 'master'"Hannes Rosenögger2015-04-131-1/+1
| | | | | | | | This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634. This change needed to be reverted, because not enough email clients support inline images.
* Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-271-1/+1
|
* replace images in emails with inline imagesHannes Rosenögger2015-03-121-1/+1
| | | | | | 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
* Simplify the default layout of notification emailsPierre de La Morinerie2014-03-031-3/+1
| | | | | | | | | | * Less margin: the content appears as the text of the message. * Streamlined footer: everything on one line, with a small separator. * Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display the content of the message. Switching to a simpler layout fixes the issue.
* Add the description to the "new issue" and "new merge request" emailsPierre de La Morinerie2014-03-031-2/+6
| | | | | Previously the content of the issue or merge request was missing from the email.
* Remove custom link to target in notification emailsPierre de La Morinerie2014-03-031-2/+0
| | | | | | Every email has a different way of showing a link to the discussion on the website. We don't need this anymore, as we now have a standard "View in GitLab" link in the footer of every email.
* Fix minor errors/annoyances in email templatesDrew Blessing2013-11-081-1/+1
| | | | | | | | There was some funny syntax in merge request email templates. There was a ! before the merge request number when there probably should be a #. This may be some carry over from markdown but should not be in email templates. There were also some capitalization discrepancies among the subject lines. For those OCD people out there I standardized the capitalization. :)
* have email views use iidJames Newton2013-08-291-1/+1
|
* Update emails to describe path using for_fork?Izaak Alpert2013-07-171-1/+1
| | | | | | | | | | | | Forked MR's will print Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch> Non forked MR's will print Branch <source_branch> -> <target_branch> Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038
* MR on fork: Email fixes, style fixesIzaak Alpert2013-07-171-1/+1
| | | | | | | | | -Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
* Merge Request on forked projectsIzaak Alpert2013-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
* restyle and cleanup emailsDmitriy Zaporozhets2013-03-121-18/+8
|
* Update app/views/notify/new_merge_request_email.html.hamlRobert Hopson2012-12-281-1/+1
| | | Fix spelling of 'assignee'
* Fix email send on close/reopen issue. Display project name with namespace. ↵Dmitriy Zaporozhets2012-12-201-1/+2
| | | | remove css style
* Fully embrace Ruby 1.9 hash syntaxRobert Speicher2012-08-101-11/+11
| | | | Didn't bother with files in db/, config/, or features/
* Update notifications mails and notify specs for GFMRiyad Preukschas2012-08-061-2/+2
|
* Make Notify#new_merge_request_email resque friendly.Robb Kidd2012-05-151-4/+2
|
* Notification when created merge requestValery Sizov2011-12-171-0/+20
View Lorry Controller Status