root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
101,375 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

265 Commits

Author SHA1 Message Date
Grzegorz Bizon 1068ec2e92 Merge branch '66741-remove-spec-rails_helper-rb' into 'master' 
Remove spec/rails_helper.rb

Closes #66741

See merge request gitlab-org/gitlab-ce!32380
 2019-09-03 13:48:17 +00:00
Ash McKenzie 19ff9d9899
Replace rails_helper.rb with spec_helper.rb 
rails_helper.rb's only logic was to require
spec_helper.rb.
 2019-08-30 12:26:18 +10:00
Heinrich Lee Yu 55d0df7a9f Fix issue due notification emails threading 
It should not be a start to a new thread but rather
a reply to an existing thread
 2019-08-29 09:41:57 +08:00
Alex Kalderimis ac94033b2d Handle namespaced models 
We encountered issues with setting module headers for namespaced models.
These changes address this. We retain the namespacing, but transform the
classnames to make them into safe email headers.
 2019-08-21 19:23:27 +00:00
Mario de la Ossa 10a42a8a76
Respect alt email when sending group access notifications 
When sending access granted/rejected emails we should also respect
custom emails set for groups/sub-groups
 2019-07-25 21:09:25 -06:00
Marcia Ramos e6aa6ec165 Move document to new location, split in 3 
- Move steps to new doc
- Move all concepts to different docs
 2019-07-15 08:02:33 +00:00
Heinrich Lee Yu eec2c48013 Remove group in notification email subject 
This reverts to previous behavior where we have the group only when
we don't have a project
 2019-07-01 16:23:11 +08:00
Sean McGivern e6532ca203 Fix notes email with group-level notification email 
A Noteable doesn't have a group directly, unless it's an epic - we need
to look for the project's group to find the right email address.
 2019-06-24 09:20:10 +00:00
Frank van Rest df4c1a75de Uniform html and text emails 
Uniform new_issue_email html and text emails
Uniform note_email html and text emails
Uniform new_merge_request_email html and text emails
 2019-06-21 13:48:43 +03:00
Stan Hu ede045820f Omit blocked admins from repository check e-mails 
Blocked admins should not receive notifications about failed repository
checks.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63019
 2019-06-12 12:55:25 -07:00
Wei-Meng Lee 11fb4d4209 Fix typo in project invitation declined test 2019-05-31 20:49:27 +08:00
Wei-Meng Lee 1a402d888c Send notifications to group-specific email address 
- Select notification email by walking up group/subgroup path
- Add settings UI to set group email notification address
- Add tests
 2019-05-31 20:49:27 +08:00
Luke Bennett 1fb499de27
Add leave link to access_granted email 
Allows users to leave a project/group
that they have been added to.
Add function to leave a namespace by url param
If the `leave` param is present on a project/group show page,
click the leave link.
 2019-05-03 17:19:16 +01:00
Vladimir Shushlin d69d29011c Mark unverified pages domains for removal 
Set pages_domain.remove_at when disabling it
Add specs for marking pages domain for removal
Notify user that domain is being removed
Add documentation
 2019-04-09 17:46:29 +00:00
Oswaldo Ferreira ca884980ee [CE] Support multiple assignees for merge requests 
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
 2019-04-08 18:40:00 -03:00
Heinrich Lee Yu 473674a2c3
Prevent premailer from converting HTML entities 
This prevents `&mdash` in our templates being change to `-`
 2019-04-04 15:02:00 +08:00
Stan Hu 997290fcba Resolve conflicts in spec/mailers/notify_spec.rb 2019-03-04 22:33:37 -08:00
Yorick Peterse 59db98a0ca
Merge dev master into GitLab.com master 2019-03-04 19:44:46 +01:00
Alexandru Croitor 77985826d9 Show header and footer system messages in email 
* Add email_header_and_footer_enabled flag to appearances table
* Set email_header_and_footer_enabled default value to false
* Add checkbox to appearance to toggle show header and footer in emails
* Add email_header_and_footer_enabled to allowed params in controller
* Add header and footer messages to the html and text email layouts
* Remove the color styling for emails header and footer
* Add empty_mailer layout for emails without layout,
to have the header and footer applied
 2019-02-27 22:07:50 +02:00
Jarka Košanová 38f3c2e186 Remove link after issue move when no permissions 
Don't show new issue link after move
when a user does not have permissions
to display the new issue
 2019-02-20 10:17:49 +01:00
Kushal Pandya 08c1989b0d
Use `sanitize_name` to sanitize URL in user full name 2019-01-31 16:52:48 +01:00
Rémy Coutable 3a2abc1d50
Enable the Layout/ExtraSpacing cop 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-24 13:05:45 +01:00
Heinrich Lee Yu f54290de75 Remove caching of CSV file 
Load whole file in memory to simplify code
 2019-01-07 11:21:30 +08:00
Heinrich Lee Yu 3c02697114 Import CSV Backend 
Process CSV uploads async using a worker then email results
 2019-01-07 11:16:58 +08:00
Douwe Maan ff5dace7bb
Always use colon at end of discussion notification email headline 2018-12-20 16:40:52 +01:00
Rémy Coutable 24f9fa11a3
Fix a potential frozen string error in app/mailers/notify.rb 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-12-11 15:13:42 +01:00
Rémy Coutable d78272a13b
Fix a frozen string error in app/mailers/notify.rb 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-12-10 13:59:33 +01:00
Cindy Pallares e122e14ac6
Merge branch 'security-guest-comments' into 'master' 
[master]Fixed ability to comment on and edit/delete comments on locked or confidential issues

See merge request gitlab/gitlabhq!2612
 2018-11-28 19:11:56 -05:00
Mayra Cabrera 177d847cf5 Automatically disable Auto DevOps for project upon first pipeline failure 2018-09-06 19:20:42 +00:00
Grzegorz Bizon f794b9989d Update notification specs after renaming a class 2018-07-16 13:46:00 +02:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Lin Jen-Shin 220f37a02b This test was copied from EE 2018-07-10 01:49:50 +08:00
Lin Jen-Shin c83381938a Move spec/mailers/previews to app/mailers/previews 2018-07-06 20:17:54 +08:00
Mark Chao 5b994b8199 Notify only when unmergeable due to conflict 
There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.

Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.

Remove unmergeable_reason as now only conflict is notified

Update spec
 2018-06-20 23:27:17 +08:00
Takuya Noguchi d46c12290d Replace have_html_espaced_body_text after 517598ba 2018-06-03 22:29:51 +09:00
Takuya Noguchi 3579ed016a Revert "Add a new have_html_escaped_body_text that match an HTML-escaped text" 
This reverts commit 517598ba10.
 2018-06-03 22:17:36 +09:00
Mark Chao 180685be97 Fix merge request unmergeable notification email plural interpolation 2018-05-31 23:13:20 +09:00
Douwe Maan e97a87433b Merge branch 'mr-conflict-notification' into 'master' 
MR unmergeable notification

See merge request gitlab-org/gitlab-ce!18042
 2018-05-24 08:49:54 +00:00
Mark Chao a660f54896 Plural reason(s) 2018-05-18 09:50:01 +08:00
🙈 jacopo beschi 🙉 01275667e3 Resolve "Opening Project with invite but without accepting leads to 404 error page" 2018-05-17 09:19:47 +00:00
lulalala dc174e9655 Notify with email when merge request became unmergeable 
Display MR unmergeable reasons
 2018-05-17 08:54:51 +08:00
Mario de la Ossa 02741ca4c5
Backport 5480-epic-notifications from EE 2018-05-07 12:58:47 -06:00
Stan Hu 47b1528abe Fix undefined method `one?` when pushing to an existing merge request 
An untested code path was triggering an Exception because Fixnum
doesn't have `one?` implemented in Rails, while arrays and collections
do.

Closes #45152
 2018-04-07 23:43:40 -07:00
Eric Eastwood a6c7d8050e Add custom additonal email text to all emails 
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474

Conflicts:
	db/schema.rb
	ee/app/controllers/ee/admin/application_settings_controller.rb
	ee/app/helpers/ee/application_settings_helper.rb
	ee/app/models/ee/application_setting.rb
	ee/app/models/license.rb
	ee/app/views/layouts/service_desk.html.haml
	ee/app/views/notify/approved_merge_request_email.html.haml
	ee/app/views/notify/service_desk_new_note_email.text.erb
	ee/app/views/notify/service_desk_thank_you_email.text.erb
	ee/app/views/notify/unapproved_merge_request_email.html.haml
	ee/lib/ee/api/entities.rb
	ee/spec/controllers/admin/application_settings_controller_spec.rb
	ee/spec/models/application_setting_spec.rb
	ee/spec/requests/api/settings_spec.rb
	lib/api/settings.rb
	spec/mailers/previews/notify_preview.rb
 2018-04-04 12:29:03 -05:00
Sean McGivern 682eb75834 Fix body of email when commits are pushed to an MR 
This was sending the current user, which is the recipient! It should be the user
who pushed the commits.
 2018-04-03 13:22:25 +01:00
Eric Eastwood dc45cc5411 Fix unapproved unassigned MR email erroring out 
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/3092

Conflicts:
	ee/app/views/notify/unapproved_merge_request_email.html.haml
	spec/mailers/notify_spec.rb
 2018-03-28 10:34:12 -05:00
Dmitriy Zaporozhets 8fe9995f11
Replace deprecated name_with_namespace with full_name in app and spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-03-05 16:15:26 +02:00
Nick Thomas ee68bd9771
Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
🙈 jacopo beschi 🙉 80090c8b06 Resolve "group request membership mail with too long list of "To:"" 2018-02-19 17:47:08 +00:00
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00