summaryrefslogtreecommitdiff
path: root/app/views/notify
Commit message (Collapse)AuthorAgeFilesLines
* Add new notifications for issue move actionGrzegorz Bizon2016-03-172-0/+10
| | | | [ci skip]
* Improving the original label-subscribing implementationRémy Coutable2016-03-157-12/+8
| | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
* Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-156-0/+14
| | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
* Fix broken link in CI build notification emailsGrzegorz Bizon2016-02-122-2/+3
| | | | Closes #13199
* Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-093-0/+9
|
* Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-291-1/+1
|
* Use `to_s(:iso8601)` where appropriateRobert Speicher2016-01-072-2/+2
|
* Revert "Make sure notify email always has author info."remove-author-from-emailJob van der Voort2015-12-151-2/+0
| | | | This reverts commit 303f79f8046876c7a461708dee5d1f50f12737bf.
* Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-144-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| * Migrate CI::Project to ProjectKamil Trzcinski2015-12-114-6/+6
| |
* | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-144-0/+69
|\ \ | |/ | | | | | | | | | | Ci Services migrate See merge request !1985
| * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-104-0/+69
| |
* | Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messagesStan Hu2015-12-111-0/+2
|\ \ | | | | | | Make sure notify email always has author info.
| * | Make sure notify email always has author info.Jason Lee2015-11-181-0/+2
| |/
* | Remove obsolete variables in `repository_push_email`Grzegorz Bizon2015-12-082-25/+27
|/
* Ensure variable is evalledGert Goet2015-10-291-1/+1
|
* Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-074-4/+4
|\
| * Merge branch 'fix-email-typo' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | notify: fix typo in merged_merge_request_email template All (two) other templates with this line use 'url' rather than 'Url'. See merge request !1151
| | * notify: fix typo in merged_merge_request_email templateBen Boeckel2015-09-301-1/+1
| | | | | | | | | | | | All (two) other templates with this line use 'url' rather than 'Url'.
| * | Note the original location of a moved project when notifying users of the moveproject_movingValery Sizov2015-10-012-2/+2
| |/
| * Fix HTML link that was improperly escaped in new user e-mailStan Hu2015-09-161-1/+1
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9640
* | Remove last remaining `reference_only_path` usagesRobert Speicher2015-09-033-3/+3
|/
* Use entity number for plus signSteve Norman2015-05-271-1/+1
|
* Merge branch 'fix-typo-in-email' into 'master'Robert Speicher2015-05-262-4/+4
|\ | | | | | | | | | | Fix "Asignee" typo in new issue/merge request emails See merge request !676
| * email: fix typoBen Boeckel2015-05-182-4/+4
| |
* | Fill in email on the new password formVinnie Okada2015-05-161-1/+1
| |
* | Explain reset token expiration in emailsVinnie Okada2015-05-162-0/+4
|/ | | | | Tell new users when their password reset token expires and provide a link to get a new one.
* Remove superfluous info from invite accepted/declined mails.invitationDouwe Maan2015-04-148-12/+8
|
* Let invites be declined.Douwe Maan2015-04-149-1/+25
|
* Add invites controller.Douwe Maan2015-04-148-0/+49
|
* Revert "Merge branch 'fix_email_images' into 'master'"Hannes Rosenögger2015-04-133-3/+3
| | | | | | | | This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634. This change needed to be reverted, because not enough email clients support inline images.
* Merge branch 'emailsonpush-last-line' into 'master'Dmitriy Zaporozhets2015-04-071-2/+1
|\ | | | | | | | | | | | | | | | | | | Fix final line in EmailsOnPush email diff being rendered as error. Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194. Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18. See merge request !480
| * Move EmailsOnPush highlight CSS inline instead of being in every ↵Douwe Maan2015-03-311-2/+1
| | | | | | | | notification email.
* | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-273-3/+3
|/
* Send EmailsOnPush email when branch or tag is created or deleted.Douwe Maan2015-03-182-96/+99
|
* Fix email template css for project moved emailsDmitriy Zaporozhets2015-03-171-2/+2
|
* More actively use css variabled to prevent colors duplicationDmitriy Zaporozhets2015-03-171-2/+2
|
* Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-152-2/+2
|
* replace images in emails with inline imagesHannes Rosenögger2015-03-123-3/+3
| | | | | | 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
* Send EmailsOnPush when deleting commits using force push.Douwe Maan2015-02-252-4/+14
| | | | See #1924.
* Wrap commit message in EmailsOnPush email.Douwe Maan2015-02-251-1/+2
| | | | See #1867.
* Fix links in EmailsOnPush text version.Douwe Maan2015-02-251-2/+5
|
* Add option to disable code diffs to EmailOnPush.Douwe Maan2015-02-252-36/+39
| | | | See #1950
* Add list of changed files to EmailsOnPush.Douwe Maan2015-02-252-13/+54
| | | | See #1906.
* Upgrade to Rails 4.1.9Vinnie Okada2015-02-1417-19/+19
| | | | | | 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.
* Add Diff syntax colors for email-on-push notificationsHannes Rosenögger2015-01-171-1/+1
|
* Add commit dates to repository-push email tempalteMiz2014-12-111-1/+3
|
* improve ssh key emailsBen Bodenmiller2014-10-282-3/+3
|
* Update email templates for email on push service with links to commit and ↵Marin Jankovski2014-09-302-4/+4
| | | | repository.
* Fix adminarea and emails for new membership logicDmitriy Zaporozhets2014-09-152-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status