Commit graph

11 commits

Author SHA1 Message Date
Achilleas Pipinellis
c6d80dec76
Copyedit plugins docs
[ci skip]
2018-04-06 14:20:38 +02: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
Marcia Ramos
fe399402df Replaces "Libre" => "Core" 2018-03-28 15:13:47 -03:00
Achilleas Pipinellis
d16e1fe52c
Add info on CI job traces for admins 2018-03-27 18:47:49 +02:00
Lin Jen-Shin
5928b0c298 Update incoming emails documents 2018-03-02 19:51:08 +08:00
Marcia Ramos
650d11beb4 Docs: search/replace "Enterprise Edition" and adjust when applicable 2018-02-22 16:13:35 +00:00
Achilleas Pipinellis
41cd11d5b8
Change docs links to https://about.gitlab.com/products/ 2018-02-07 12:47:56 +01:00
Marcia Ramos
c234913e22 Docs: add indexes for monitoring and performance monitoring 2017-12-14 18:24:42 +00:00
Marcia Ramos
cb2d3aeb92 Docs: Update admin docs 2017-12-13 15:22:02 +00:00
Marcia Ramos
35090a959d add index for doc/administration/operations/ 2017-12-11 14:05:08 -02:00
Marcia Ramos
de4f2a6e82 Docs: admin index 2017-12-07 15:09:22 +00:00