Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix email line-height in Outlookoutlook-email-spacing | Sean McGivern | 2016-08-17 | 1 | -1/+1 |
| | | | | | Outlook seems to handle `white-space: pre` weirdly, so just use `pre` elements (but only for emails!). | ||||
* | Add description to text/plain emails | dixpac | 2016-08-04 | 2 | -0/+4 |
| | | | | | | Added to * new_issue_email * new_merge_request_email | ||||
* | Don't fail when a LegacyDiffNote didn't store the right diff | Douwe Maan | 2016-07-15 | 1 | -1/+1 |
| | |||||
* | Style diff and blob file headers the same way | Douwe Maan | 2016-07-06 | 1 | -2/+2 |
| | |||||
* | Add DiffFile#blob and #old_blob | Douwe Maan | 2016-07-06 | 1 | -3/+2 |
| | |||||
* | refactor to use haml insteadfix/error-typo | James Lopez | 2016-06-22 | 2 | -6/+6 |
| | |||||
* | fix typo | James Lopez | 2016-06-22 | 1 | -1/+1 |
| | |||||
* | fixed merge conflicts on UI branch | James Lopez | 2016-06-16 | 28 | -86/+51 |
|\ | |||||
| * | UI and copywriting improvements13948-access-request-to-projects-and-groups | Rémy Coutable | 2016-06-14 | 20 | -62/+21 |
| | | | | | | | | | | | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Factorize members mails into a new Emails::Members module | Rémy Coutable | 2016-06-14 | 28 | -63/+51 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Add request access for groups | Rémy Coutable | 2016-06-14 | 15 | -25/+29 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Initial implementation of user access request to projects | David Alexander | 2016-06-14 | 4 | -0/+14 |
| | | |||||
* | | lots of refactoring again based on feedback. Changed the UI slightly and ↵ | James Lopez | 2016-06-15 | 2 | -3/+6 |
| | | | | | | | | also fixed a small bug | ||||
* | | fixing specs and some code cleanup | James Lopez | 2016-06-15 | 2 | -2/+2 |
| | | |||||
* | | adding notifications stuff and more refactoring for exporting projects | James Lopez | 2016-06-14 | 4 | -0/+26 |
|/ | |||||
* | Fix tests offenses: use `pipeline` of Ci::Build and rename views | Kamil Trzcinski | 2016-06-06 | 4 | -10/+10 |
| | |||||
* | Added author to various Markdown calls in views | Yorick Peterse | 2016-05-26 | 3 | -3/+3 |
| | | | | | This ensures all these calls have an author set, allowing the use of "all" mentions where possible. | ||||
* | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting | Sean McGivern | 2016-05-17 | 2 | -39/+58 |
| | | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 | ||||
* | Clean up LegacyDiffNote somewhat | Douwe Maan | 2016-05-13 | 1 | -1/+1 |
| | |||||
* | Extract LegacyDiffNote out of Note | Douwe Maan | 2016-05-13 | 1 | -1/+1 |
| | |||||
* | Support e-mail notifications for comments on project snippets | Stan Hu | 2016-05-02 | 2 | -0/+9 |
| | | | | Closes #2334 | ||||
* | format merge request references properly | Ben Bodenmiller | 2016-04-18 | 8 | -8/+8 |
| | |||||
* | Add new notifications for issue move action | Grzegorz Bizon | 2016-03-17 | 2 | -0/+10 |
| | | | | [ci skip] | ||||
* | Improving the original label-subscribing implementation | Rémy Coutable | 2016-03-15 | 7 | -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 labels | Timothy Andrew | 2016-03-15 | 6 | -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 emails | Grzegorz Bizon | 2016-02-12 | 2 | -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-mail | Jason Lee | 2016-02-09 | 3 | -0/+9 |
| | |||||
* | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | 2016-01-29 | 1 | -1/+1 |
| | |||||
* | Use `to_s(:iso8601)` where appropriate | Robert Speicher | 2016-01-07 | 2 | -2/+2 |
| | |||||
* | 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 |
| |