<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/CHANGELOG, branch fix/import-export-gitlab-errors</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>added changelog</title>
<updated>2016-06-23T12:16:14+00:00</updated>
<author>
<name>James Lopez</name>
<email>james@jameslopez.es</email>
</author>
<published>2016-06-23T12:16:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=79192a8437ddd2c909c01e024bdf0bb7a2212265'/>
<id>79192a8437ddd2c909c01e024bdf0bb7a2212265</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add clarifying comment and a Changelog entry.</title>
<updated>2016-06-22T22:25:59+00:00</updated>
<author>
<name>Connor Shea</name>
<email>connor.james.shea@gmail.com</email>
</author>
<published>2016-06-22T22:25:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bba1d2de3bc76bf65b4c2ded07e94ab0d7455bfd'/>
<id>bba1d2de3bc76bf65b4c2ded07e94ab0d7455bfd</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix CHANGELOG</title>
<updated>2016-06-22T14:14:27+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-06-22T14:14:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1d9bbb0b8ef4d67833fc99a5c6ffcdafa43a38d6'/>
<id>1d9bbb0b8ef4d67833fc99a5c6ffcdafa43a38d6</id>
<content type='text'>
[ci skip]

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
[ci skip]

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18855-wrap-code-in-activities-and-todos' into 'master'</title>
<updated>2016-06-22T10:56:43+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-06-22T10:56:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=93106e150d4810459d0fc82b8c552309db4431fc'/>
<id>93106e150d4810459d0fc82b8c552309db4431fc</id>
<content type='text'>

Wrap code blocks on Activies and Todos page

## What does this MR do?

wrap code blocks on Activities and Todos page

## Are there points in the code the reviewer needs to double check?

Can `white-space: pre-wrap` be used for code blocks everywhere?

## Why was this MR needed?

Content of code blocks is cut on small screen sizes.

## What are the relevant issue numbers?

closes #18855

## Screenshots

![activities-code](/uploads/83eb5100dbcc34ade8892e9f68bf767f/activities-code.png)

![todos-code](/uploads/80efbf4875c9f5db1f1a3790fc8afa3b/todos-code.png)


See merge request !4783</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Wrap code blocks on Activies and Todos page

## What does this MR do?

wrap code blocks on Activities and Todos page

## Are there points in the code the reviewer needs to double check?

Can `white-space: pre-wrap` be used for code blocks everywhere?

## Why was this MR needed?

Content of code blocks is cut on small screen sizes.

## What are the relevant issue numbers?

closes #18855

## Screenshots

![activities-code](/uploads/83eb5100dbcc34ade8892e9f68bf767f/activities-code.png)

![todos-code](/uploads/80efbf4875c9f5db1f1a3790fc8afa3b/todos-code.png)


See merge request !4783</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-auto-mr-close' into 'master'</title>
<updated>2016-06-22T01:18:12+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-06-22T01:18:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a3a8798a1bbc44c8055b2bf91ea94b2260480ef9'/>
<id>a3a8798a1bbc44c8055b2bf91ea94b2260480ef9</id>
<content type='text'>

Fix auto-MR-close text from branch name

## What does this MR do?

Fix the MR-auto-close feature if a branch name begins with an issue IID.

## Are there points in the code the reviewer needs to double check?

It's one line, so check that line thoroughly :smiley:

## Why was this MR needed?

When I create a new MR from a branch starting with an issue IID, the description doesn't get suffixed with the 'Closes #blahblah' that it should do.

## What are the relevant issue numbers?

Don't think there are any.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added

See merge request !4836</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix auto-MR-close text from branch name

## What does this MR do?

Fix the MR-auto-close feature if a branch name begins with an issue IID.

## Are there points in the code the reviewer needs to double check?

It's one line, so check that line thoroughly :smiley:

## Why was this MR needed?

When I create a new MR from a branch starting with an issue IID, the description doesn't get suffixed with the 'Closes #blahblah' that it should do.

## What are the relevant issue numbers?

Don't think there are any.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added

See merge request !4836</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into 18533-graphs-wiki-subnav</title>
<updated>2016-06-21T21:00:41+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-06-21T21:00:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ff84cc0b81c9b8783f9ef917de1dac03665ae454'/>
<id>ff84cc0b81c9b8783f9ef917de1dac03665ae454</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 'remove-banzai-pre-process' into 'master'</title>
<updated>2016-06-21T18:23:51+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-06-21T18:23:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ae63172dd22c245c3d2c0a509971dcb97622e55b'/>
<id>ae63172dd22c245c3d2c0a509971dcb97622e55b</id>
<content type='text'>

Move pre_process into render_result

This MR moves `Banzai::Renderer.pre_process` into `Banzai::Renderer.render_result`.

The `pre_process` method was called even when its output would be ignored. See 11a5a4f359ee57029dbfcc9185fc6b47243ea2aa for more details.

See merge request !4830</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Move pre_process into render_result

This MR moves `Banzai::Renderer.pre_process` into `Banzai::Renderer.render_result`.

The `pre_process` method was called even when its output would be ignored. See 11a5a4f359ee57029dbfcc9185fc6b47243ea2aa for more details.

See merge request !4830</pre>
</div>
</content>
</entry>
<entry>
<title>Fix auto-MR-close text from branch name</title>
<updated>2016-06-21T16:59:20+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-06-21T16:54:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b2f60bb9a118c366ad462241bd4842c52d872d5f'/>
<id>b2f60bb9a118c366ad462241bd4842c52d872d5f</id>
<content type='text'>
Rails's form helpers use the `$attr_before_type_cast` method where
available, and this value only appears to be updated on assignment, not
when the object is mutated in some other way:

    [1] pry(main)&gt; mr = MergeRequest.new
    =&gt; #&lt;MergeRequest:0x007fcf28395d88 ...&gt;
    [2] pry(main)&gt; mr.description = 'foo'
    =&gt; "foo"
    [3] pry(main)&gt; mr.description &lt;&lt; ' bar'
    =&gt; "foo bar"
    [4] pry(main)&gt; mr.description
    =&gt; "foo bar"
    [5] pry(main)&gt; mr.description_before_type_cast
    =&gt; "foo"
    [6] pry(main)&gt; mr.description += ' bar'
    =&gt; "foo bar bar"
    [7] pry(main)&gt; mr.description_before_type_cast
    =&gt; "foo bar bar"
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Rails's form helpers use the `$attr_before_type_cast` method where
available, and this value only appears to be updated on assignment, not
when the object is mutated in some other way:

    [1] pry(main)&gt; mr = MergeRequest.new
    =&gt; #&lt;MergeRequest:0x007fcf28395d88 ...&gt;
    [2] pry(main)&gt; mr.description = 'foo'
    =&gt; "foo"
    [3] pry(main)&gt; mr.description &lt;&lt; ' bar'
    =&gt; "foo bar"
    [4] pry(main)&gt; mr.description
    =&gt; "foo bar"
    [5] pry(main)&gt; mr.description_before_type_cast
    =&gt; "foo"
    [6] pry(main)&gt; mr.description += ' bar'
    =&gt; "foo bar bar"
    [7] pry(main)&gt; mr.description_before_type_cast
    =&gt; "foo bar bar"
</pre>
</div>
</content>
</entry>
<entry>
<title>Update CHANGELOG</title>
<updated>2016-06-21T16:15:49+00:00</updated>
<author>
<name>Annabel Dunstone</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-06-15T14:37:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=596b2f46c835e76748a3026ea080323406ad461c'/>
<id>596b2f46c835e76748a3026ea080323406ad461c</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 'master' of gitlab.com:gitlab-org/gitlab-ce</title>
<updated>2016-06-21T15:48:05+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-06-21T15:48:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=44fe4f63f9ea86253b386561a4d439227c53f50b'/>
<id>44fe4f63f9ea86253b386561a4d439227c53f50b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
