Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | adds second batch of tests changed to active tenseactive-tense-test-coverage | tiagonbotelho | 2016-08-09 | 2 | -2/+2 |
| | |||||
* | Introduce Compare model in the codebase. | Paco Guzman | 2016-08-03 | 1 | -4/+6 |
| | | | This object will manage Gitlab::Git::Compare instances | ||||
* | Make Notify specs more robust by setting up assignee names | Rémy Coutable | 2016-07-22 | 1 | -1/+1 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Represent DiffRefs as proper class instead of tuple array | Douwe Maan | 2016-07-06 | 1 | -2/+2 |
| | |||||
* | Merge branch 'explicit-requesters-scope' into 'master' | Douwe Maan | 2016-07-01 | 1 | -5/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude requesters from Project#members, Group#members and User#members ## What does this MR do? It excludes requesters from the `Project#members`, `Group#members` and `User#members` associations, and adds new `Project#requesters` and `Group#requesters` associations. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Without this, if you call `project.members`, requesters are included in the results! This is at best misleading, and at worst can lead to security issues. By excluding requesters from the `#members` associations, we avoid introducing security inadvertently since you have to call the `#requesters` association explicitly to get requesters. ## What are the relevant issue numbers? This is something I realized while fixing the security issue #19102. ## Does this MR meet the acceptance criteria? - [x] I don't think this needs a CHANGELOG since this is an internal change - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4946 | ||||
| * | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope | Rémy Coutable | 2016-07-01 | 1 | -5/+5 |
| | | | | | | | | | | | | And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-lines | Grzegorz Bizon | 2016-07-01 | 1 | -5/+0 |
|/ | |||||
* | Fallback to group's owners/masters when a project has none18757-fix | Rémy Coutable | 2016-06-20 | 1 | -14/+47 |
| | | | | | | | A project in a group can have no explicit owners/masters, in that case we fallbacks to the group's owners/masters. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Add previews for all customized Devise emails | Robert Speicher | 2016-06-16 | 1 | -2/+21 |
| | |||||
* | UI and copywriting improvements13948-access-request-to-projects-and-groups | Rémy Coutable | 2016-06-14 | 1 | -54/+78 |
| | | | | | | | | | + 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 | 1 | -77/+179 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Add request access for groups | Rémy Coutable | 2016-06-14 | 1 | -2/+98 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Update tests for the current_application_settings request store changes | DJ Mountney | 2016-05-27 | 1 | -3/+3 |
| | |||||
* | New confirmation email :fire: | Robert Speicher | 2016-05-25 | 1 | -1/+1 |
| | |||||
* | Customize ActionMailer preview path | Robert Speicher | 2016-05-25 | 1 | -0/+11 |
| | |||||
* | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonot | Robert Speicher | 2016-05-24 | 1 | -2/+2 |
| | | | | Also removes the note from the development/testing.md guide | ||||
* | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting | Sean McGivern | 2016-05-17 | 1 | -7/+9 |
| | | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 | ||||
* | Only generate repository push email once | Sean McGivern | 2016-05-11 | 1 | -30/+6 |
| | | | | | | | | | The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.) | ||||
* | Merge branch 'mr-formatting' into 'master' | Robert Speicher | 2016-04-19 | 1 | -6/+6 |
|\ | | | | | | | | | | | | | use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740 | ||||
| * | format merge request references properly | Ben Bodenmiller | 2016-04-18 | 1 | -6/+6 |
| | | |||||
* | | Improve 'auto fsck' admin emails | Jacob Vosmaer | 2016-04-18 | 1 | -1/+1 |
|/ | |||||
* | More create_listauto-fsck | Jacob Vosmaer | 2016-04-14 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck | Jacob Vosmaer | 2016-04-12 | 1 | -0/+2 |
|\ | |||||
| * | Premailer shouldn't remove script tags from our emails | Robert Speicher | 2016-04-05 | 1 | -0/+2 |
| | | | | | | | | Closes #14943. | ||||
* | | Rename almost all the things | Jacob Vosmaer | 2016-04-06 | 1 | -1/+1 |
| | | |||||
* | | Rebase repo check MR | Jacob Vosmaer | 2016-04-04 | 1 | -0/+21 |
|/ | |||||
* | Improve and finish the fallback to the In-Reply-To and References header for ↵2364-fallback-to-in-reply-to-header | Rémy Coutable | 2016-03-25 | 2 | -36/+111 |
| | | | | | | | | | | | | | | | | the reply-by-email feature A few things to note: - The IncomingEmail feature is now enabled even without a correctly-formatted sub-address - Message-ID for new thread mail are kept the same so that subsequent notifications to this thread are grouped in the thread by the email service that receives the notification (i.e. In-Reply-To of the answer == Message-ID of the first thread message) - To maximize our chance to be able to retrieve the reply key, we look for it in the In-Reply-To header and the References header - The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]" - Improve docs thanks to Axil | ||||
* | Fix #2364. Fall back to In-Reply-To header when reply key not available | David Padilla | 2016-03-25 | 2 | -2/+7 |
| | |||||
* | Add new notifications for issue move action | Grzegorz Bizon | 2016-03-17 | 1 | -0/+27 |
| | | | | [ci skip] | ||||
* | Improving the original label-subscribing implementation | Rémy Coutable | 2016-03-15 | 2 | -1/+61 |
| | | | | | | | 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 | ||||
* | Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobs | Rémy Coutable | 2016-03-15 | 1 | -1/+5 |
| | | | | | | | | Related to #2235. This is done by: 1. Delaying the notification sending after the SSH key is commited in DB 2. Gracefully exit the mailer method if the record cannot be found | ||||
* | Move profile notifications specs to separate filefix/ci-emails-broken-link | Grzegorz Bizon | 2016-02-12 | 2 | -98/+107 |
| | |||||
* | Move build emails specs to separate file | Grzegorz Bizon | 2016-02-12 | 3 | -177/+186 |
| | | | | | This also extracts shared examples for notification emails to separate file. | ||||
* | Fix broken link in CI build notification emails | Grzegorz Bizon | 2016-02-12 | 1 | -38/+40 |
| | | | | 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 | 1 | -0/+37 |
| | |||||
* | Added X-GitLab-... headers to emails from CI and Email On Push services | Anton Baklanov | 2016-01-19 | 1 | -2/+55 |
| | | | | Fixes #2098 | ||||
* | Minor improvements, unsubscribe from email footer | Zeger-Jan van de Weg | 2016-01-09 | 1 | -16/+16 |
| | |||||
* | Unsubscribe from thread through link in email footer | Zeger-Jan van de Weg | 2016-01-09 | 1 | -1/+33 |
| | |||||
* | Make AbuseReportMailer responsible for knowing if it should deliver | Robert Speicher | 2016-01-04 | 1 | -0/+38 |
| | |||||
* | Migrate CI::Services and CI::WebHooks to Services and WebHooks | Kamil Trzcinski | 2015-12-10 | 2 | -35/+29 |
| | |||||
* | fix deprecation messages in tests | Valery Sizov | 2015-12-03 | 1 | -5/+7 |
| | |||||
* | Remove some repetition in notify spec.gmail_actions_links_on_set_of_emails | Marin Jankovski | 2015-11-25 | 1 | -61/+32 |
| | |||||
* | Specs for links in email notifications for Gmail Actions. | Marin Jankovski | 2015-11-25 | 1 | -1/+93 |
| | |||||
* | Fix code that depends on incorrect inflector behavior | Dmitriy Zaporozhets | 2015-11-03 | 1 | -1/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'stanhu/gitlab-ce-fix-message-id-notify' | Dmitriy Zaporozhets | 2015-10-01 | 1 | -0/+1 |
|\ | |||||
| * | Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being ↵ | Stan Hu | 2015-10-01 | 1 | -0/+1 |
| | | | | | | | | | | | | dropped Closes #2867 | ||||
* | | Note the original location of a moved project when notifying users of the moveproject_moving | Valery Sizov | 2015-10-01 | 1 | -1/+1 |
|/ | |||||
* | WIP | Kamil Trzcinski | 2015-09-29 | 1 | -2/+1 |
| | |||||
* | Devise 3.5.x deprecates `confirm!` in favor of `confirm` | Robert Speicher | 2015-09-19 | 1 | -3/+3 |
| | |||||
* | fix specs. Stage 6 | Valery Sizov | 2015-09-15 | 1 | -6/+6 |
| |