delta/gitlab/gitlab-ce.git/doc/user/admin_area, branch fix-diff-comment-alignment

Users can accept terms during registration

2018-06-08T17:17:00+00:00

When a user checks the `accept` checkbox, we will track that
acceptance as usual. That way they don't need to accept again after
they complete the registration.

When an unauthenticated user visits the `/-/users/terms` page, there
is no button to accept, decline or continue. The 'current-user menu'
is also hidden from the top bar.

Chmod 644 on offending files

2018-05-18T17:29:17+00:00

Docs: fix duplicate titles

2018-05-09T16:11:28+00:00

Enforces terms in the web application

2018-05-04T11:54:43+00:00

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.

Fixed typos

2018-04-27T08:50:05+00:00

Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'

2018-04-05T18:34:00+00:00

Resolve "Allow HTTPS cloning by Runners if it is disabled for users"

Closes #44389

See merge request gitlab-org/gitlab-ce!18021

Update documentation

2018-04-05T14:43:52+00:00

Add custom additonal email text to all emails

2018-04-04T17:29:03+00:00

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

Clarify version check in admin settings

2018-03-07T10:55:20+00:00

Revert "Merge branch 'tc-info-version-check' into 'master'"

2018-02-21T16:54:56+00:00

This reverts merge request !17257