<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/doc/administration, branch 44296-commit-path</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Merge branch 'nathan.jones/gitlab-ce-patch-24' into 'master'</title>
<updated>2018-04-06T09:07:41+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2018-04-06T09:07:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6cad73439b3850e2ed7e5f09357cff43f73e47fb'/>
<id>6cad73439b3850e2ed7e5f09357cff43f73e47fb</id>
<content type='text'>
Update index.md to describe leaving out the host in prometheus['listen_address']…

See merge request gitlab-org/gitlab-ce!18207</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Update index.md to describe leaving out the host in prometheus['listen_address']…

See merge request gitlab-org/gitlab-ce!18207</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'direct-upload-of-artifacts' into 'master'</title>
<updated>2018-04-05T20:59:40+00:00</updated>
<author>
<name>Grzegorz Bizon</name>
<email>grzegorz@gitlab.com</email>
</author>
<published>2018-04-05T20:59:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=dd271e246001a06609592eef109d154291305d32'/>
<id>dd271e246001a06609592eef109d154291305d32</id>
<content type='text'>
Direct upload of artifacts

See merge request gitlab-org/gitlab-ce!18160</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Direct upload of artifacts

See merge request gitlab-org/gitlab-ce!18160</pre>
</div>
</content>
</entry>
<entry>
<title>Update index.md to describe leaving out the host in prometheus['listen_address'] to allow public access.</title>
<updated>2018-04-05T16:38:29+00:00</updated>
<author>
<name>Nathan Jones</name>
<email>nathan.jones@ironmail.org</email>
</author>
<published>2017-07-10T23:33:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=33c163b347ca37ae91240be40a05c881c89c7135'/>
<id>33c163b347ca37ae91240be40a05c881c89c7135</id>
<content type='text'>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Add `direct_upload` setting for artifacts</title>
<updated>2018-04-05T13:01:14+00:00</updated>
<author>
<name>Kamil Trzciński</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2018-04-03T16:47:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=678620cce67cc283b19b75137f747f9415aaf942'/>
<id>678620cce67cc283b19b75137f747f9415aaf942</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'direct-upload-of-uploads' into 'master'</title>
<updated>2018-04-05T11:10:55+00:00</updated>
<author>
<name>Grzegorz Bizon</name>
<email>grzegorz@gitlab.com</email>
</author>
<published>2018-04-05T11:10:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=21488c74223524aee9ee6e1fb5274a2d8dec7cb2'/>
<id>21488c74223524aee9ee6e1fb5274a2d8dec7cb2</id>
<content type='text'>
Allow to store uploads by default on Object Storage

See merge request gitlab-org/gitlab-ce!18156</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Allow to store uploads by default on Object Storage

See merge request gitlab-org/gitlab-ce!18156</pre>
</div>
</content>
</entry>
<entry>
<title>Allow to store uploads by default on Object Storage</title>
<updated>2018-04-04T21:13:45+00:00</updated>
<author>
<name>Kamil Trzciński</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2018-04-03T15:34:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9dde7df2470cc3fe7989de163fe3985d53262a0d'/>
<id>9dde7df2470cc3fe7989de163fe3985d53262a0d</id>
<content type='text'>
Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data
</pre>
</div>
</content>
</entry>
<entry>
<title>Add custom additonal email text to all emails</title>
<updated>2018-04-04T17:29:03+00:00</updated>
<author>
<name>Eric Eastwood</name>
<email>contact@ericeastwood.com</email>
</author>
<published>2018-04-04T17:11:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a6c7d8050eb6eeb0373f69a3f99c7f7b64f77e07'/>
<id>a6c7d8050eb6eeb0373f69a3f99c7f7b64f77e07</id>
<content type='text'>
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
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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
</pre>
</div>
</content>
</entry>
<entry>
<title>Add support for Sidekiq JSON logging</title>
<updated>2018-04-04T12:04:00+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2018-04-01T07:46:52+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6415ac9e994640474eaa5b0fee3914934d85b35b'/>
<id>6415ac9e994640474eaa5b0fee3914934d85b35b</id>
<content type='text'>
Closes #20060
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #20060
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'dz-improve-app-settings-4' into 'master'</title>
<updated>2018-04-04T07:41:48+00:00</updated>
<author>
<name>Grzegorz Bizon</name>
<email>grzegorz@gitlab.com</email>
</author>
<published>2018-04-04T07:41:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b61e00eaf7a4f9316fac4c77347e7865aeffea29'/>
<id>b61e00eaf7a4f9316fac4c77347e7865aeffea29</id>
<content type='text'>
Redesign application settings to match project settings (part 4)

See merge request gitlab-org/gitlab-ce!18100</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Redesign application settings to match project settings (part 4)

See merge request gitlab-org/gitlab-ce!18100</pre>
</div>
</content>
</entry>
<entry>
<title>Move Sidekiq exporter logs to log/sidekiq_exporter.log</title>
<updated>2018-04-02T15:58:17+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2018-04-02T04:06:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=05e1cbc4cae3032eca371e09f35a451628a4e9c6'/>
<id>05e1cbc4cae3032eca371e09f35a451628a4e9c6</id>
<content type='text'>
The Sidekiq exporter logs were mixing with the normal Sidekiq logs. In order
to support structured logging in Sidekiq, we either need to split this data
out or convert the exporter to produce structured logs. Since Sidekiq job
processing is fundamentally different information from Web server traffic,
it seems cleaner to move the metrics traffic into a separate file, where they
can be parsed by a different filter if needed.

Relates to #20060
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The Sidekiq exporter logs were mixing with the normal Sidekiq logs. In order
to support structured logging in Sidekiq, we either need to split this data
out or convert the exporter to produce structured logs. Since Sidekiq job
processing is fundamentally different information from Web server traffic,
it seems cleaner to move the metrics traffic into a separate file, where they
can be parsed by a different filter if needed.

Relates to #20060
</pre>
</div>
</content>
</entry>
</feed>
