Commit graph

18 commits

Author SHA1 Message Date
Dennis Tang
fe268175a2 Resolve "Disable GCP free credit banner at instance level" 2018-07-10 13:20:05 +00:00
Marcel Amirault
1285135926 Updated products links to pricing 2018-07-03 00:37:24 +00:00
Alexis Reigel
5e78ac2a4f
document custom favicon 2018-06-06 11:28:14 +02:00
Marcia Ramos
f703ba3f85 Docs: add custom descriptions to most relevant docs 2018-05-09 11:07:11 +00:00
Bob Van Landuyt
7684217d68 Enforces terms in the web application
This enforces the terms in the web application. These cases are
specced:

- Logging in: When terms are enforced, and a user logs in that has not
  accepted the terms, they are presented with the screen. They get
  directed to their customized root path afterwards.
- Signing up: After signing up, the first screen the user is presented
  with the screen to accept the terms. After they accept they are
  directed to the dashboard.
- While a session is active:
  - For a GET: The user will be directed to the terms page first,
    after they accept the terms, they will be directed to the page
    they were going to
  - For any other request: They are directed to the terms, after they
    accept the terms, they are directed back to the page they came
    from to retry the request. Any information entered would be
    persisted in localstorage and available on the page.
2018-05-04 13:54:43 +02:00
Marcia Ramos
a9c32fe099 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-add-badges 2018-04-17 12:38:04 -03:00
Marcia Ramos
d1e0e6815f add "core only" badge to admin/readme 2018-04-16 14:57:50 -03:00
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