<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/features, branch sql-guide</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Remove redundant integration tests</title>
<updated>2016-03-07T20:33:26+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-03-07T20:24:27+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=56c4f22c80b0555d5d7cfbc7f443122a8b70072c'/>
<id>56c4f22c80b0555d5d7cfbc7f443122a8b70072c</id>
<content type='text'>
These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.
</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://91.123.203.49/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 'rs-factory-nitpicks' into 'master'</title>
<updated>2016-03-07T09:02:49+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-07T09:02:49+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=eab7892dc1eaca0bcca0fc82fb7da79b81cad39d'/>
<id>eab7892dc1eaca0bcca0fc82fb7da79b81cad39d</id>
<content type='text'>

More Factory cleanup

Addresses nitpicks from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2847

See merge request !3108</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

More Factory cleanup

Addresses nitpicks from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2847

See merge request !3108</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://91.123.203.49/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://91.123.203.49/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>Add traits for each access_level to ProjectMember factory</title>
<updated>2016-03-06T21:53:22+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-03-06T21:53:22+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=de944c914b2a780a5e968cc32ef64cddd2b82c9b'/>
<id>de944c914b2a780a5e968cc32ef64cddd2b82c9b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add some spinach specs.</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-24T20:37:40+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=baa782ac9a29ba8fe162287511cbc9e4810fc4ee'/>
<id>baa782ac9a29ba8fe162287511cbc9e4810fc4ee</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Invalidate cache for builds badge</title>
<updated>2016-03-04T09:34:35+00:00</updated>
<author>
<name>Grzegorz Bizon</name>
<email>grzesiek.bizon@gmail.com</email>
</author>
<published>2016-03-04T09:34:35+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bf921d084e9f5e9e541d033db49c5c99eed1deb2'/>
<id>bf921d084e9f5e9e541d033db49c5c99eed1deb2</id>
<content type='text'>
Closes #13982
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #13982
</pre>
</div>
</content>
</entry>
<entry>
<title>Fixed failing ssh key tests</title>
<updated>2016-03-03T21:13:55+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-03-01T14:59:51+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1d4418bc5feb0f3ac2ac2f1a468e4c5b92f7b518'/>
<id>1d4418bc5feb0f3ac2ac2f1a468e4c5b92f7b518</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 'password-settings' into 'master'</title>
<updated>2016-03-03T19:37:20+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz1@gmail.com</email>
</author>
<published>2016-03-03T19:37:20+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ba869ae50d0c43867f7d34a4f7e08520c1e4c7f1'/>
<id>ba869ae50d0c43867f7d34a4f7e08520c1e4c7f1</id>
<content type='text'>

Password settings page

Closes #13858 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ebb9b67d69daa8872d79626b85f99b52/password-settings.png)

See merge request !3033</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Password settings page

Closes #13858 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ebb9b67d69daa8872d79626b85f99b52/password-settings.png)

See merge request !3033</pre>
</div>
</content>
</entry>
</feed>
