<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch update-docker</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>Update docker guide and add docker-compose.yml</title>
<updated>2015-09-30T12:24:39+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2015-09-30T12:24:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f9e5a30d039026616d12b74d9b1d96efed8f9468'/>
<id>f9e5a30d039026616d12b74d9b1d96efed8f9468</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 'move-ci-settings' into 'master'</title>
<updated>2015-09-30T08:49:46+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-09-30T08:49:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=34431d8ecb1c3d3082c3e391db70b33ca7dbf056'/>
<id>34431d8ecb1c3d3082c3e391db70b33ca7dbf056</id>
<content type='text'>

Move CI project settings page to CE project settings area

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

Part of #2594 

See merge request !1465</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Move CI project settings page to CE project settings area

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

Part of #2594 

See merge request !1465</pre>
</div>
</content>
</entry>
<entry>
<title>Move CI project settings page to CE project settings area</title>
<updated>2015-09-29T14:07:44+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-09-29T14:07:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=87240e989ba913bad787d8bc81da1a9b87f1da53'/>
<id>87240e989ba913bad787d8bc81da1a9b87f1da53</id>
<content type='text'>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master'</title>
<updated>2015-09-29T13:33:09+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-09-29T13:33:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2e8a3e3996f47a5b436bce9a6bbb61ca0a351cab'/>
<id>2e8a3e3996f47a5b436bce9a6bbb61ca0a351cab</id>
<content type='text'>

Link directly to the projects page instead of the root controller

If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. 

Fixes bug introduced by !1446.


See merge request !1459</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Link directly to the projects page instead of the root controller

If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. 

Fixes bug introduced by !1446.


See merge request !1459</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ci-commits-to-projects' into 'master'</title>
<updated>2015-09-29T11:44:07+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-09-29T11:44:07+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2c3355f9584a1a22d91806b8b49d441f22c0c286'/>
<id>2c3355f9584a1a22d91806b8b49d441f22c0c286</id>
<content type='text'>

Make Ci::Commits belong to Project instead of Ci::Project



See merge request !1455</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Make Ci::Commits belong to Project instead of Ci::Project



See merge request !1455</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'move-triggers-page' into 'master'</title>
<updated>2015-09-29T11:43:27+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-09-29T11:43:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bdf466858653c3599f4c9bc0c514fb25018f77aa'/>
<id>bdf466858653c3599f4c9bc0c514fb25018f77aa</id>
<content type='text'>

Move CI triggers page to project settings area

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

Part of #2594 

See merge request !1461</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Move CI triggers page to project settings area

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

Part of #2594 

See merge request !1461</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into 'master'</title>
<updated>2015-09-29T10:31:42+00:00</updated>
<author>
<name>Jacob Vosmaer</name>
<email>contact@jacobvosmaer.nl</email>
</author>
<published>2015-09-29T10:31:42+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=958af6f5c220731a2ee274c343d818751d388762'/>
<id>958af6f5c220731a2ee274c343d818751d388762</id>
<content type='text'>

Add support for AWS S3 Server-Side Encryption support

This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console.

## Points to double check
I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages

I also think I've managed to catch all of the documentation for this change as well.

### Why is this required
Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of.

Relates to issue #2478.


See merge request !1280</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add support for AWS S3 Server-Side Encryption support

This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console.

## Points to double check
I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages

I also think I've managed to catch all of the documentation for this change as well.

### Why is this required
Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of.

Relates to issue #2478.


See merge request !1280</pre>
</div>
</content>
</entry>
<entry>
<title>Make ensure_gitlab_ci_project return ci_project or create a new one</title>
<updated>2015-09-29T08:47:04+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2015-09-29T08:44:53+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0d877d91e7556edfcdc29ad77491740da3cc7661'/>
<id>0d877d91e7556edfcdc29ad77491740da3cc7661</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix migrations</title>
<updated>2015-09-29T08:47:04+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2015-09-28T14:49:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9498a40052603a0687a0fa6370e50e97bc078301'/>
<id>9498a40052603a0687a0fa6370e50e97bc078301</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix tests</title>
<updated>2015-09-29T08:47:04+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2015-09-28T14:49:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0f3deac362cf2800ceaf17f4cded765f6c9d577c'/>
<id>0f3deac362cf2800ceaf17f4cded765f6c9d577c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
