<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch gitlab-grack-2.0.1</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 gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.</title>
<updated>2015-04-20T16:48:53+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2015-04-20T16:48:53+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5bbe2860bf3f9e24d2f658aa2a32baabbe997cea'/>
<id>5bbe2860bf3f9e24d2f658aa2a32baabbe997cea</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 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'</title>
<updated>2015-04-20T09:43:01+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-04-20T09:43:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=41f01dd3f4c13502483f59b754af8429abc6af39'/>
<id>41f01dd3f4c13502483f59b754af8429abc6af39</id>
<content type='text'>
Remove access control for uploaded images to fix broken images in emails

Replaces !530.

&gt; This MR removes the access control for uploaded images. This is needed to display the images in emails again.
&gt;
&gt; The previous solution to base64 encode the images had to be reverted, because not all email clients supported it.
&gt;
&gt; If possible this should go into the 7.10 release.

See merge request !533
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Remove access control for uploaded images to fix broken images in emails

Replaces !530.

&gt; This MR removes the access control for uploaded images. This is needed to display the images in emails again.
&gt;
&gt; The previous solution to base64 encode the images had to be reverted, because not all email clients supported it.
&gt;
&gt; If possible this should go into the 7.10 release.

See merge request !533
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce</title>
<updated>2015-04-20T09:36:41+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-04-20T09:36:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=457efe24463a92af5c98de2f399f7d5f601c4c76'/>
<id>457efe24463a92af5c98de2f399f7d5f601c4c76</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 'gitlab_git-7.1.10' into 'master'</title>
<updated>2015-04-20T09:34:54+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-04-20T09:34:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=61ebd14d5d8d07e0174f9cc76e3c973b9982050c'/>
<id>61ebd14d5d8d07e0174f9cc76e3c973b9982050c</id>
<content type='text'>
Ignore submodules that are defined in .gitmodules but are checked in as directories.

Pulls in gitlab_git 7.1.10 which contains gitlab-org/gitlab_git!26.

Fixes #1439 and https://github.com/gitlabhq/gitlabhq/issues/9140

See merge request !540
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Ignore submodules that are defined in .gitmodules but are checked in as directories.

Pulls in gitlab_git 7.1.10 which contains gitlab-org/gitlab_git!26.

Fixes #1439 and https://github.com/gitlabhq/gitlabhq/issues/9140

See merge request !540
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #9156 from hellerve/master</title>
<updated>2015-04-20T09:28:29+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-04-20T09:28:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4bd5aa26ca3a68397a3976a6beadb7fb29706a2c'/>
<id>4bd5aa26ca3a68397a3976a6beadb7fb29706a2c</id>
<content type='text'>
Fixed typo in deploy html</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fixed typo in deploy html</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #9150 from digitalmediacenter/master</title>
<updated>2015-04-20T09:01:59+00:00</updated>
<author>
<name>Jeroen van Baarsen</name>
<email>jeroenvanbaarsen@gmail.com</email>
</author>
<published>2015-04-20T09:01:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4f349fcb691bde95c50f7c92928be9e769308f2f'/>
<id>4f349fcb691bde95c50f7c92928be9e769308f2f</id>
<content type='text'>
do not prepend relative_url_root to avatar</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
do not prepend relative_url_root to avatar</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce</title>
<updated>2015-04-20T08:40:55+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-04-20T08:40:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0e9d52f33d9c5cfe859da80628b46338a39f1134'/>
<id>0e9d52f33d9c5cfe859da80628b46338a39f1134</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 'fix-label-color' into 'master'</title>
<updated>2015-04-20T08:40:13+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dzaporozhets@gitlab.com</email>
</author>
<published>2015-04-20T08:40:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bd97715a57d99f45332d726cf8e048f27302ef28'/>
<id>bd97715a57d99f45332d726cf8e048f27302ef28</id>
<content type='text'>
Parse GFM references after sanitizing

Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`.  See #2188.

See merge request !1745
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Parse GFM references after sanitizing

Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`.  See #2188.

See merge request !1745
</pre>
</div>
</content>
</entry>
<entry>
<title>Fixed typo in deploy html</title>
<updated>2015-04-20T08:38:38+00:00</updated>
<author>
<name>hellerve</name>
<email>veit.heller@student.htw-berlin.de</email>
</author>
<published>2015-04-20T08:38:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0afccd1dd83eceee3781827f5fc2ce34d240b355'/>
<id>0afccd1dd83eceee3781827f5fc2ce34d240b355</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 'fix-label-color-input' into 'master'</title>
<updated>2015-04-20T08:30:05+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-04-20T08:30:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d012648b4916917e2823c8674ae680fcd11183af'/>
<id>d012648b4916917e2823c8674ae680fcd11183af</id>
<content type='text'>
Fix label color input.

Because `value` was set, every label color would render as purple in the form.

Introduced by 83b5a9ae2bfb594bcb5a9a931d6781ba05c9b9ef between 7.9 and 7.10, so no changelog item.

See merge request !538
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix label color input.

Because `value` was set, every label color would render as purple in the form.

Introduced by 83b5a9ae2bfb594bcb5a9a931d6781ba05c9b9ef between 7.9 and 7.10, so no changelog item.

See merge request !538
</pre>
</div>
</content>
</entry>
</feed>
