Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Make sure notify email always has author info."remove-author-from-email | Job van der Voort | 2015-12-15 | 1 | -2/+0 |
| | | | | This reverts commit 303f79f8046876c7a461708dee5d1f50f12737bf. | ||||
* | Merge branch 'ci-project-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 4 | -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 Project | Kamil Trzcinski | 2015-12-11 | 4 | -6/+6 |
| | | |||||
* | | Merge branch 'ci-services-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 4 | -0/+69 |
|\ \ | |/ | | | | | | | | | | | Ci Services migrate See merge request !1985 | ||||
| * | Migrate CI::Services and CI::WebHooks to Services and WebHooks | Kamil Trzcinski | 2015-12-10 | 4 | -0/+69 |
| | | |||||
* | | Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages | Stan Hu | 2015-12-11 | 1 | -0/+2 |
|\ \ | | | | | | | Make sure notify email always has author info. | ||||
| * | | Make sure notify email always has author info. | Jason Lee | 2015-11-18 | 1 | -0/+2 |
| |/ | |||||
* | | Remove obsolete variables in `repository_push_email` | Grzegorz Bizon | 2015-12-08 | 2 | -25/+27 |
|/ | |||||
* | Ensure variable is evalled | Gert Goet | 2015-10-29 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-07 | 4 | -4/+4 |
|\ | |||||
| * | Merge branch 'fix-email-typo' into 'master' | Dmitriy Zaporozhets | 2015-10-01 | 1 | -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 template | Ben Boeckel | 2015-09-30 | 1 | -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_moving | Valery Sizov | 2015-10-01 | 2 | -2/+2 |
| |/ | |||||
| * | Fix HTML link that was improperly escaped in new user e-mail | Stan Hu | 2015-09-16 | 1 | -1/+1 |
| | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9640 | ||||
* | | Remove last remaining `reference_only_path` usages | Robert Speicher | 2015-09-03 | 3 | -3/+3 |
|/ | |||||
* | Use entity number for plus sign | Steve Norman | 2015-05-27 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix-typo-in-email' into 'master' | Robert Speicher | 2015-05-26 | 2 | -4/+4 |
|\ | | | | | | | | | | | Fix "Asignee" typo in new issue/merge request emails See merge request !676 | ||||
| * | email: fix typo | Ben Boeckel | 2015-05-18 | 2 | -4/+4 |
| | | |||||
* | | Fill in email on the new password form | Vinnie Okada | 2015-05-16 | 1 | -1/+1 |
| | | |||||
* | | Explain reset token expiration in emails | Vinnie Okada | 2015-05-16 | 2 | -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.invitation | Douwe Maan | 2015-04-14 | 8 | -12/+8 |
| | |||||
* | Let invites be declined. | Douwe Maan | 2015-04-14 | 9 | -1/+25 |
| | |||||
* | Add invites controller. | Douwe Maan | 2015-04-14 | 8 | -0/+49 |
| | |||||
* | Revert "Merge branch 'fix_email_images' into 'master'" | Hannes Rosenögger | 2015-04-13 | 3 | -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 Zaporozhets | 2015-04-07 | 1 | -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 Maan | 2015-03-31 | 1 | -2/+1 |
| | | | | | | | | notification email. | ||||
* | | Use relative URL for Markdown references, except in mails.email-full-url | Douwe Maan | 2015-03-27 | 3 | -3/+3 |
|/ | |||||
* | Send EmailsOnPush email when branch or tag is created or deleted. | Douwe Maan | 2015-03-18 | 2 | -96/+99 |
| | |||||
* | Fix email template css for project moved emails | Dmitriy Zaporozhets | 2015-03-17 | 1 | -2/+2 |
| | |||||
* | More actively use css variabled to prevent colors duplication | Dmitriy Zaporozhets | 2015-03-17 | 1 | -2/+2 |
| | |||||
* | Use `group_member` instead of `users_group` or `membership`. | Douwe Maan | 2015-03-15 | 2 | -2/+2 |
| | |||||
* | replace images in emails with inline images | Hannes Rosenögger | 2015-03-12 | 3 | -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 Maan | 2015-02-25 | 2 | -4/+14 |
| | | | | See #1924. | ||||
* | Wrap commit message in EmailsOnPush email. | Douwe Maan | 2015-02-25 | 1 | -1/+2 |
| | | | | See #1867. | ||||
* | Fix links in EmailsOnPush text version. | Douwe Maan | 2015-02-25 | 1 | -2/+5 |
| | |||||
* | Add option to disable code diffs to EmailOnPush. | Douwe Maan | 2015-02-25 | 2 | -36/+39 |
| | | | | See #1950 | ||||
* | Add list of changed files to EmailsOnPush. | Douwe Maan | 2015-02-25 | 2 | -13/+54 |
| | | | | See #1906. | ||||
* | Upgrade to Rails 4.1.9 | Vinnie Okada | 2015-02-14 | 17 | -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 notifications | Hannes Rosenögger | 2015-01-17 | 1 | -1/+1 |
| | |||||
* | Add commit dates to repository-push email tempalte | Miz | 2014-12-11 | 1 | -1/+3 |
| | |||||
* | improve ssh key emails | Ben Bodenmiller | 2014-10-28 | 2 | -3/+3 |
| | |||||
* | Update email templates for email on push service with links to commit and ↵ | Marin Jankovski | 2014-09-30 | 2 | -4/+4 |
| | | | | repository. | ||||
* | Fix adminarea and emails for new membership logic | Dmitriy Zaporozhets | 2014-09-15 | 2 | -2/+2 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge pull request #7677 from cirosantilli/factor-issue-mr-text-email | Dmitriy Zaporozhets | 2014-09-04 | 3 | -12/+8 |
|\ | | | | | Fix missing to on reassign Merge Request text email to unassigned. | ||||
| * | Fix missing to on reassign MR text email to unassigned. | Ciro Santilli | 2014-09-03 | 3 | -12/+8 |
| | | | | | | | | Factors out text MR and issue email. | ||||
* | | Fix missing to on reassign MR email to unassigned. | Ciro Santilli | 2014-09-01 | 3 | -18/+12 |
|/ | | | | Factors out MR and issue email. | ||||
* | Remove HAML eval for const strings. | Ciro Santilli | 2014-08-26 | 1 | -1/+1 |
| | |||||
* | Fix email on push | Dmitriy Zaporozhets | 2014-07-29 | 2 | -5/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Do not sent a generated password via email for admin created user. | Marin Jankovski | 2014-07-15 | 2 | -14/+2 |
| | |||||
* | Merge branch 'notification_when_reopened' into 'master' | Dmitriy Zaporozhets | 2014-07-05 | 2 | -0/+10 |
|\ | | | | | | | | | | | | | | | Notification when reopened issue or mr Fixes #1396 See merge request !939 |