delta/gitlab/gitlab-ce.git/doc, branch update-gitlab-com-settings-docs

Update GitLab.com settings with current state

2018-04-05T18:50:20+00:00

Merge branch 'bvl-override-import-params' into 'master'

2018-04-05T15:18:49+00:00

Allow passing params to import API to override project attributes

Closes gitlab-ee#4788

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

Merge branch 'direct-upload-of-uploads' into 'master'

2018-04-05T11:10:55+00:00

Allow to store uploads by default on Object Storage

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

Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'master'

2018-04-05T10:20:15+00:00

Add custom additional text to emails -- CE backport

Closes gitlab-ee#4474

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

Export LFS Objects when exporting a project

2018-04-05T08:21:51+00:00

The LFS files will be included in the `lfs-objects` directory in the archive.

Override values from JSON with import data

2018-04-05T07:18:12+00:00

This overrides values defined in the project JSON with the values
provided in project.import_data.data['override_params'].

These could be passed from the API.

Allow to store uploads by default on Object Storage

2018-04-04T21:13:45+00:00

Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data

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

Allow assigning and filtering issuables by ancestor group labels

2018-04-04T15:40:29+00:00

Merge branch 'pdeden/gitlab-ee-patch-7' into 'master'

2018-04-04T15:25:54+00:00

Fix syntax error in the `Envoy.blade.php` example

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