<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/features, branch patch-7</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>Group links spec update</title>
<updated>2016-12-09T16:39:00+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-12-09T11:35:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fcf332a4fa544d4a5eba200878a7b9298e5b6f6b'/>
<id>fcf332a4fa544d4a5eba200878a7b9298e5b6f6b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Updated members dropdowns</title>
<updated>2016-12-07T15:27:14+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-12-07T15:27:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=19fb84e3a897f5b251fb3f437fe365c6ec342c34'/>
<id>19fb84e3a897f5b251fb3f437fe365c6ec342c34</id>
<content type='text'>
This ports some code over from EE to reduce conflicts
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This ports some code over from EE to reduce conflicts
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master'</title>
<updated>2016-12-07T11:47:30+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-07T11:47:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=911c1601f81d8e0050766b533beaaf4e612c5592'/>
<id>911c1601f81d8e0050766b533beaaf4e612c5592</id>
<content type='text'>

Move admin hooks spinach to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request !7942</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Move admin hooks spinach to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request !7942</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master'</title>
<updated>2016-12-07T11:47:14+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-07T11:47:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0fc1e9a8e00926ba2c65f38a68ffd4e21c5844ba'/>
<id>0fc1e9a8e00926ba2c65f38a68ffd4e21c5844ba</id>
<content type='text'>

Move admin logs spinach test to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request !7945</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Move admin logs spinach test to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request !7945</pre>
</div>
</content>
</entry>
<entry>
<title>Move admin hooks spinach to rspec</title>
<updated>2016-12-06T17:58:15+00:00</updated>
<author>
<name>Semyon Pupkov</name>
<email>mail@semyonpupkov.com</email>
</author>
<published>2016-12-05T18:50:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d33b22f23890f5d67f1e88a41efc4d8adec6611c'/>
<id>d33b22f23890f5d67f1e88a41efc4d8adec6611c</id>
<content type='text'>
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
</pre>
</div>
</content>
</entry>
<entry>
<title>Move admin logs spinach test to rspec</title>
<updated>2016-12-06T17:16:32+00:00</updated>
<author>
<name>Semyon Pupkov</name>
<email>mail@semyonpupkov.com</email>
</author>
<published>2016-12-06T08:54:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e16bc50d363fe65bbceb8aed39a0e19ec91b3329'/>
<id>e16bc50d363fe65bbceb8aed39a0e19ec91b3329</id>
<content type='text'>
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
</pre>
</div>
</content>
</entry>
<entry>
<title>Update effected tests</title>
<updated>2016-12-04T16:32:33+00:00</updated>
<author>
<name>Z.J. van de Weg</name>
<email>git@zjvandeweg.nl</email>
</author>
<published>2016-11-29T12:43:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=10960400245ca338e32a3c55538ace976df962c6'/>
<id>10960400245ca338e32a3c55538ace976df962c6</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 '22781-user-generated-permalinks' into 'master'</title>
<updated>2016-12-01T20:58:08+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-12-01T20:58:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4d37be0fb874998325d2785e6934fd87a117c806'/>
<id>4d37be0fb874998325d2785e6934fd87a117c806</id>
<content type='text'>

Resolve "User-generated permalink IDs collide with GitLab interface"

## What does this MR do?

Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface.  This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM.

How this works:
* All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"`
* All anchor links which point to these IDs continue to use the non-namespaced hash `&lt;a href="#foo"&gt;...&lt;/a&gt;`
* When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead.

## Before

![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif)

## After:

![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif)  
![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif)  

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
  - [x] Added for this feature/bug
  - [ ] 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 #22781 

See also prior attempts to address this issue:
#3908, !2023, !2024


See merge request !7631</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Resolve "User-generated permalink IDs collide with GitLab interface"

## What does this MR do?

Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface.  This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM.

How this works:
* All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"`
* All anchor links which point to these IDs continue to use the non-namespaced hash `&lt;a href="#foo"&gt;...&lt;/a&gt;`
* When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead.

## Before

![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif)

## After:

![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif)  
![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif)  

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
  - [x] Added for this feature/bug
  - [ ] 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 #22781 

See also prior attempts to address this issue:
#3908, !2023, !2024


See merge request !7631</pre>
</div>
</content>
</entry>
<entry>
<title>remove underscore from user-content id namespace</title>
<updated>2016-11-30T21:28:11+00:00</updated>
<author>
<name>Mike Greiling</name>
<email>mike@pixelcog.com</email>
</author>
<published>2016-11-29T19:07:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=131a04d7962b01daa58b8e5efe3f1359a3e73fe1'/>
<id>131a04d7962b01daa58b8e5efe3f1359a3e73fe1</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>update gitlab flavored markdown tests to reflect namespaced ids</title>
<updated>2016-11-30T21:28:10+00:00</updated>
<author>
<name>Mike Greiling</name>
<email>mike@pixelcog.com</email>
</author>
<published>2016-11-21T19:48:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=567b8a99fe0e454a6d2c0b79cde86ee2dea806f3'/>
<id>567b8a99fe0e454a6d2c0b79cde86ee2dea806f3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
