<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/views, branch sql-guide</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 'cache-raw-2' into 'master'</title>
<updated>2016-03-07T22:05:15+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-07T22:05:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=afb8d76f3c7ce51fdab9cf05c4348ac89fc7ee38'/>
<id>afb8d76f3c7ce51fdab9cf05c4348ac89fc7ee38</id>
<content type='text'>

Set cache headers for raw blobs

This changes allows browsers and (in the case of public projects)
proxy caches to cache raw Git blob responses.

See merge request !3113</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Set cache headers for raw blobs

This changes allows browsers and (in the case of public projects)
proxy caches to cache raw Git blob responses.

See merge request !3113</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'issue_13621_2' into 'master'</title>
<updated>2016-03-07T17:18:25+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-07T17:18:25+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4'/>
<id>903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4</id>
<content type='text'>

Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'indicate-mr-diverged-from-target' into 'master'</title>
<updated>2016-03-07T09:01:26+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-07T09:01:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d43c778402b481569cb8b2fffed45a7c939e0c75'/>
<id>d43c778402b481569cb8b2fffed45a7c939e0c75</id>
<content type='text'>

Indicate when an MR diverged from the target branch

This adds an indicator to the "Merge MR" box, to tell if and how much an MR diverged from its target branch.

For instance, consider an MR to merge the branch `feature` into `master`. Some other commits were added to `master` since `feature` was created, and the two branches diverged.

```text
o master
|
o    o feature
|    |
o    o
|  /
o
```

In this case, there will be a label in the MR Merge box stating:

&gt; This MR is by 3 commits behind the target branch `master`.

## Screenshots

### The branch diverged from the target (UI Proposal)

![UI_suggestion_1](/uploads/cd5bee3959e68026ec7d5097259d53f4/UI_suggestion_1.png)

### The branch diverged from the target (alternative UI Proposal)

![UI_suggestion_2](/uploads/f36977101b59a610850e129837dfbc83/UI_suggestion_2.png)

## How is this useful?

- In a _rebase-workflow_ (MR are preferably rebased before being merged), the reviewer wants to know if an MR is rebased on the target branch before merging it. 
    
    _With this indicator, the reviewer knows immediately if the branch is rebased, or if she needs to ask the committer to rebase its branch._

&lt;br&gt;

- To keep the git history readable, a team prefers to avoid merging branches that really lag a lot behind the target branch. Merging an MR that is 10 commits behind is fine, but 200 is too much.

    _With this indicator, the reviewer can see on the MR page if the branch is really far behind the target – or only a few commits behind._

## Open questions

We've been using this at @captaintrain for a few months now, and found it quite useful.

I guess the open-questions are mostly: what UI would be the more adequate? Any thoughts on this, on the general usefulness and/or on the code?

See merge request !2217</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Indicate when an MR diverged from the target branch

This adds an indicator to the "Merge MR" box, to tell if and how much an MR diverged from its target branch.

For instance, consider an MR to merge the branch `feature` into `master`. Some other commits were added to `master` since `feature` was created, and the two branches diverged.

```text
o master
|
o    o feature
|    |
o    o
|  /
o
```

In this case, there will be a label in the MR Merge box stating:

&gt; This MR is by 3 commits behind the target branch `master`.

## Screenshots

### The branch diverged from the target (UI Proposal)

![UI_suggestion_1](/uploads/cd5bee3959e68026ec7d5097259d53f4/UI_suggestion_1.png)

### The branch diverged from the target (alternative UI Proposal)

![UI_suggestion_2](/uploads/f36977101b59a610850e129837dfbc83/UI_suggestion_2.png)

## How is this useful?

- In a _rebase-workflow_ (MR are preferably rebased before being merged), the reviewer wants to know if an MR is rebased on the target branch before merging it. 
    
    _With this indicator, the reviewer knows immediately if the branch is rebased, or if she needs to ask the committer to rebase its branch._

&lt;br&gt;

- To keep the git history readable, a team prefers to avoid merging branches that really lag a lot behind the target branch. Merging an MR that is 10 commits behind is fine, but 200 is too much.

    _With this indicator, the reviewer can see on the MR page if the branch is really far behind the target – or only a few commits behind._

## Open questions

We've been using this at @captaintrain for a few months now, and found it quite useful.

I guess the open-questions are mostly: what UI would be the more adequate? Any thoughts on this, on the general usefulness and/or on the code?

See merge request !2217</pre>
</div>
</content>
</entry>
<entry>
<title>Updates from last code review.</title>
<updated>2016-03-07T04:07:19+00:00</updated>
<author>
<name>Rubén Dávila</name>
<email>rdavila84@gmail.com</email>
</author>
<published>2016-03-07T04:07:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=95b06a62c0db5f8c285a1d24fa1994e10c70ff27'/>
<id>95b06a62c0db5f8c285a1d24fa1994e10c70ff27</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 'issue-sidebar-mobile' into 'master'</title>
<updated>2016-03-05T11:48:21+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-03-05T11:48:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=14df110b78e0fb7f6e45fff5e4ce65ef2d91ea60'/>
<id>14df110b78e0fb7f6e45fff5e4ce65ef2d91ea60</id>
<content type='text'>

Issue sidebar mobile

Fixes #13592 
Fixes #14037 

See merge request !3050</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Issue sidebar mobile

Fixes #13592 
Fixes #14037 

See merge request !3050</pre>
</div>
</content>
</entry>
<entry>
<title>Add link with filter by milestone for labels and avatar.</title>
<updated>2016-03-05T03:37:03+00:00</updated>
<author>
<name>Rubén Dávila</name>
<email>rdavila84@gmail.com</email>
</author>
<published>2016-02-24T22:45:49+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c91554de09cb2b19e1403fdf50f691004e6befdb'/>
<id>c91554de09cb2b19e1403fdf50f691004e6befdb</id>
<content type='text'>
Closes #13628
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #13628
</pre>
</div>
</content>
</entry>
<entry>
<title>Add missing partials!</title>
<updated>2016-03-05T03:37:03+00:00</updated>
<author>
<name>Rubén Dávila</name>
<email>rdavila84@gmail.com</email>
</author>
<published>2016-02-24T19:05:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3f2d82485ed84247d88cde6423c9df517c8962b5'/>
<id>3f2d82485ed84247d88cde6423c9df517c8962b5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Show some stats about Milestone according to the new UI.</title>
<updated>2016-03-05T03:37:03+00:00</updated>
<author>
<name>Rubén Dávila</name>
<email>rdavila84@gmail.com</email>
</author>
<published>2016-02-24T04:02:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=96058605c39ed2a7f6fdbdbbc3da05fdbe170681'/>
<id>96058605c39ed2a7f6fdbdbbc3da05fdbe170681</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Show Project name on Labels tab for Group and Dashboard context.</title>
<updated>2016-03-05T03:37:03+00:00</updated>
<author>
<name>Rubén Dávila</name>
<email>rdavila84@gmail.com</email>
</author>
<published>2016-02-24T03:21:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3c157b6bf7fa97cba769ecacd11cdcdba43adf4a'/>
<id>3c157b6bf7fa97cba769ecacd11cdcdba43adf4a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Use the same partial when rendering Issues or Merge Requests.</title>
<updated>2016-03-05T03:37:03+00:00</updated>
<author>
<name>Rubén Dávila</name>
<email>rdavila84@gmail.com</email>
</author>
<published>2016-02-24T02:17:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b6e5de2cfbc396ae4f59de2c2bb56432e705d695'/>
<id>b6e5de2cfbc396ae4f59de2c2bb56432e705d695</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
