666acb10b4
Add latest changes from gitlab-org/gitlab@master
2019-10-21 03:06:30 +00:00
80f61b4035
Add latest changes from gitlab-org/gitlab@master
2019-09-18 14:02:45 +00:00
38890f3dee
Add core badges to admin_area docs
...
Some admin_area docs were missing the Core Only badge
2019-08-22 16:25:52 +00:00
7146f2ecfd
Corrected custom email hostname instructions
2019-08-09 05:47:55 +00:00
fa93e16224
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446
2019-08-07 08:42:02 +00:00
73c6477b7e
Changing badges to use parentheses not brackets
...
Previously, we used brackets to denote the tier badges,
but this made Kramdown, the docs site Markdown renderer,
show many warnings when building the site. This is now
fixed by using parentheses instead of square brackets.
This was caused by [PREMIUM] looking like a link to
Kramdown, which couldn't find a URL there.
See:
- https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/484
- https://gitlab.com/gitlab-org/gitlab-ce/issues/63800
2019-07-08 08:50:38 +00:00
4738c0ffb7
Docs: Convert remaining links in /user to relative
2019-05-31 11:26:18 +00:00
dc9e42b996
Edit email settings for SSOT
2019-05-23 15:42:33 +00:00
f3c4a7c1c2
Docs: Merge EE doc/user/admin_area to CE
2019-05-05 14:17:38 +00:00
c239452b47
User can keep their commit email private
...
The private commit email is automatically generated in the format:
id-username@noreply.HOSTNAME
GitLab instance admins are able to change the HOSTNAME portion,
that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 12:24:14 +00:00
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
GitLab Bot