<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch api-remove-source-branch</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>API: Ability to remove source branch</title>
<updated>2016-12-04T15:52:42+00:00</updated>
<author>
<name>Robert Schilling</name>
<email>rschilling@student.tugraz.at</email>
</author>
<published>2016-11-28T20:33:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8b5c16e4b1d54745ba6ca65ecfbf14c1683db3b4'/>
<id>8b5c16e4b1d54745ba6ca65ecfbf14c1683db3b4</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 'api-expose-commiter-details' into 'master'</title>
<updated>2016-12-04T12:17:07+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-04T12:17:07+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bd67459131e22273b502eb27d97709827ff42262'/>
<id>bd67459131e22273b502eb27d97709827ff42262</id>
<content type='text'>

API: Expose committer details for a commit

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22312

See merge request !7849</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

API: Expose committer details for a commit

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22312

See merge request !7849</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'improve-patch-update-guide' into 'master'</title>
<updated>2016-12-03T12:56:31+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-12-03T12:56:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0819d093e9b4aa9d5af1f6bdde147462f0c7cb48'/>
<id>0819d093e9b4aa9d5af1f6bdde147462f0c7cb48</id>
<content type='text'>

Patch upgrade documentation should be consulted on stable branch

Closes #25245.

See merge request !7892</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Patch upgrade documentation should be consulted on stable branch

Closes #25245.

See merge request !7892</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'revert-918d30bf' into 'master'</title>
<updated>2016-12-03T12:56:03+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-12-03T12:56:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=52e33b49dd9c160ab48374be540cfdb3eb01a646'/>
<id>52e33b49dd9c160ab48374be540cfdb3eb01a646</id>
<content type='text'>

Revert "Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'"

Reverting in favor of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7892

See merge request !7911</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Revert "Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'"

Reverting in favor of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7892

See merge request !7911</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'"</title>
<updated>2016-12-03T12:54:51+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-12-03T12:54:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1e67ea815fee9f70f1a72c6b8f1e98bdb8bb2710'/>
<id>1e67ea815fee9f70f1a72c6b8f1e98bdb8bb2710</id>
<content type='text'>
This reverts merge request !7909</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts merge request !7909</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'</title>
<updated>2016-12-03T10:35:22+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-12-03T10:35:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=918d30bfaac3acc48b4d958c748cfac442e7e6ac'/>
<id>918d30bfaac3acc48b4d958c748cfac442e7e6ac</id>
<content type='text'>

Link to old patch update guide now that we install workhorse with a raketask

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25284

See merge request !7909</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Link to old patch update guide now that we install workhorse with a raketask

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25284

See merge request !7909</pre>
</div>
</content>
</entry>
<entry>
<title>Link to old patch update guide now that we install workhorse with a raketask</title>
<updated>2016-12-03T10:33:15+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-12-03T10:32:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=04c2bce07cb20a1b24f8befd94973e4fba953f5c'/>
<id>04c2bce07cb20a1b24f8befd94973e4fba953f5c</id>
<content type='text'>
[ci skip]
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
[ci skip]
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '23696-fix-diff-view-highlighting' into 'master'</title>
<updated>2016-12-03T08:59:19+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-12-03T08:59:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ff23636c5f3736ad16988119c48b9b9969082b1f'/>
<id>ff23636c5f3736ad16988119c48b9b9969082b1f</id>
<content type='text'>

Resolve "Highlighting lines is broken"

## What does this MR do?

Add line highlighting back to diff view.  This was working in the MR "changes" tab, but not on a commit page such as https://gitlab.com/winniehell/reproduction-area/commit/9101e66f5761929002956e0f2dd65d7f8643903d

~~This MR also fixes the `scrollToElement` method in `MergeRequestTabs` to account for the extra height of the tab links which are now fixed in place once they are scrolled to the top of the screen.~~ (removed in favor of !7051)

This MR also refactors much of the `Diff` and `MergeRequestTabs` classes to es6 syntax in an effort to increase readability.

## Are there points in the code the reviewer needs to double check?

Check out both MR "change" tabs and commit diff pages and ensure that line highlighting works and that loading a page with one of these permalink hashes correctly highlights and scrolls to the line.

Ensure I didn't break anything in the transition to es6 syntax.  Check the functionality of the tabs on MR pages, as well as diff page interactivity (unfolding hidden lines in diff files, adding comments to diffs, etc).  I have checked these myself, but another set of eyes would be a good idea.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #23696

See merge request !7090</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Resolve "Highlighting lines is broken"

## What does this MR do?

Add line highlighting back to diff view.  This was working in the MR "changes" tab, but not on a commit page such as https://gitlab.com/winniehell/reproduction-area/commit/9101e66f5761929002956e0f2dd65d7f8643903d

~~This MR also fixes the `scrollToElement` method in `MergeRequestTabs` to account for the extra height of the tab links which are now fixed in place once they are scrolled to the top of the screen.~~ (removed in favor of !7051)

This MR also refactors much of the `Diff` and `MergeRequestTabs` classes to es6 syntax in an effort to increase readability.

## Are there points in the code the reviewer needs to double check?

Check out both MR "change" tabs and commit diff pages and ensure that line highlighting works and that loading a page with one of these permalink hashes correctly highlights and scrolls to the line.

Ensure I didn't break anything in the transition to es6 syntax.  Check the functionality of the tabs on MR pages, as well as diff page interactivity (unfolding hidden lines in diff files, adding comments to diffs, etc).  I have checked these myself, but another set of eyes would be a good idea.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #23696

See merge request !7090</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled' into 'master'</title>
<updated>2016-12-03T01:25:47+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-12-03T01:25:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=668deeaee9401d67c908d8c5c46c8537b408e44f'/>
<id>668deeaee9401d67c908d8c5c46c8537b408e44f</id>
<content type='text'>

If SSH prototol is disabled don't say the user requires SSH keys

Closes #24921

See merge request !7840</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

If SSH prototol is disabled don't say the user requires SSH keys

Closes #24921

See merge request !7840</pre>
</div>
</content>
</entry>
<entry>
<title>satisfy eslint no-param-reassign rule</title>
<updated>2016-12-02T23:43:20+00:00</updated>
<author>
<name>Mike Greiling</name>
<email>mike@pixelcog.com</email>
</author>
<published>2016-12-02T23:43:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ed5f22cb93cbabcd2bcf38e7a6b22efb03d7e212'/>
<id>ed5f22cb93cbabcd2bcf38e7a6b22efb03d7e212</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
