delta/gitlab/gitlab-ce.git/doc/administration, branch ide-improve-commit-panel

Copyedit plugins docs

2018-04-06T12:20:38+00:00

[ci skip]

Add note about contributing back to GitLab to plugins.md

2018-04-06T09:17:35+00:00

Merge branch 'nathan.jones/gitlab-ce-patch-24' into 'master'

2018-04-06T09:07:41+00:00

Update index.md to describe leaving out the host in prometheus['listen_address']…

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

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

2018-04-05T20:59:40+00:00

Direct upload of artifacts

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

Update index.md to describe leaving out the host in prometheus['listen_address'] to allow public access.

2018-04-05T16:38:29+00:00

Signed-off-by: Rémy Coutable

Add `direct_upload` setting for artifacts

2018-04-05T13:01:14+00:00

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

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

Add support for Sidekiq JSON logging

2018-04-04T12:04:00+00:00

Closes #20060