<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/views/shared, 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>Merge branch 'arrow-nav-bug' into 'master'</title>
<updated>2016-06-22T16:14:53+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-22T16:14:53+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=36e645c31ec2b663b4fdd9a263b26b80528be5fe'/>
<id>36e645c31ec2b663b4fdd9a263b26b80528be5fe</id>
<content type='text'>

Hide nav arrows by default

## What does this MR do?
- Fixes the arrow icon flashing on page load
- Removes settings dropdown at higher breakpoint
- Removes unneeded CSS

Closes #18941

## Screenshots (if relevant)
Arrow flashing bug:    
![icon](/uploads/3db95626acd0adb37438bdbc2c4aa154/icon.gif)

Settings dropdown breaking nav:    
&lt;img src="/uploads/4351035f4cf8cb9fd892b621e6339e50/Screen_Shot_2016-06-21_at_4.25.50_PM.png" width="800px"&gt;

@alfredo1 would you mind double checking this to make sure the arrow flashing is definitely not happening? 

See merge request !4843</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Hide nav arrows by default

## What does this MR do?
- Fixes the arrow icon flashing on page load
- Removes settings dropdown at higher breakpoint
- Removes unneeded CSS

Closes #18941

## Screenshots (if relevant)
Arrow flashing bug:    
![icon](/uploads/3db95626acd0adb37438bdbc2c4aa154/icon.gif)

Settings dropdown breaking nav:    
&lt;img src="/uploads/4351035f4cf8cb9fd892b621e6339e50/Screen_Shot_2016-06-21_at_4.25.50_PM.png" width="800px"&gt;

@alfredo1 would you mind double checking this to make sure the arrow flashing is definitely not happening? 

See merge request !4843</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master'</title>
<updated>2016-06-22T01:17:08+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-06-22T01:17:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4dcf107b26e4e31a103b0c3097ae9cac6918c68b'/>
<id>4dcf107b26e4e31a103b0c3097ae9cac6918c68b</id>
<content type='text'>

Display group/project access requesters separately in admin

## What does this MR do?

It displays the access requesters in a separate list in group &amp; project members pages.

It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin &amp; non-admin members views).

## Are there points in the code the reviewer needs to double check?

No.

## Why was this MR needed?

To not confuse access requesters with actual members.

## What are the relevant issue numbers?

Closes #18871.

## Screenshots

### Group members

| Before | After |
| --------- | ---- |
| ![group-members-before](/uploads/2f15137e073fd3a63bc2cb7b2217cb6c/group-members-before.png) | ![group-members-after](/uploads/5b643974505cfa57783fa0320d3bf8b2/group-members-after.png) |

### Project members

| Before | After |
| --------- | ---- |
| ![project-members-before](/uploads/9c48dcd3736e42de84061b1201ee0b06/project-members-before.png) | ![project-members-after](/uploads/8e04c92ef0bba3de7e2405618632b27d/project-members-after.png) |

### Admin group members

| Before | After |
| --------- | ---- |
| ![admin-group-members-before](/uploads/7fda8c2c94b697bea6655ba892ba45e7/admin-group-members-before.png) | ![admin-group-members-after](/uploads/ea25717001794f75939c679b80308c3a/admin-group-members-after.png) |

### Admin project members

| Before | After |
| --------- | ---- |
| ![admin-project-members-before](/uploads/ba9d3ec52adbda6bb3d45ad9ac5243d3/admin-project-members-before.png) | ![admin-project-members-after](/uploads/3b889a029a9756e9ed2781b45c4dd9cb/admin-project-members-after.png) |

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG since this is related to the original "request access" MR.
- [ ] All builds are passing
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4798</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Display group/project access requesters separately in admin

## What does this MR do?

It displays the access requesters in a separate list in group &amp; project members pages.

It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin &amp; non-admin members views).

## Are there points in the code the reviewer needs to double check?

No.

## Why was this MR needed?

To not confuse access requesters with actual members.

## What are the relevant issue numbers?

Closes #18871.

## Screenshots

### Group members

| Before | After |
| --------- | ---- |
| ![group-members-before](/uploads/2f15137e073fd3a63bc2cb7b2217cb6c/group-members-before.png) | ![group-members-after](/uploads/5b643974505cfa57783fa0320d3bf8b2/group-members-after.png) |

### Project members

| Before | After |
| --------- | ---- |
| ![project-members-before](/uploads/9c48dcd3736e42de84061b1201ee0b06/project-members-before.png) | ![project-members-after](/uploads/8e04c92ef0bba3de7e2405618632b27d/project-members-after.png) |

### Admin group members

| Before | After |
| --------- | ---- |
| ![admin-group-members-before](/uploads/7fda8c2c94b697bea6655ba892ba45e7/admin-group-members-before.png) | ![admin-group-members-after](/uploads/ea25717001794f75939c679b80308c3a/admin-group-members-after.png) |

### Admin project members

| Before | After |
| --------- | ---- |
| ![admin-project-members-before](/uploads/ba9d3ec52adbda6bb3d45ad9ac5243d3/admin-project-members-before.png) | ![admin-project-members-after](/uploads/3b889a029a9756e9ed2781b45c4dd9cb/admin-project-members-after.png) |

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG since this is related to the original "request access" MR.
- [ ] All builds are passing
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4798</pre>
</div>
</content>
</entry>
<entry>
<title>Hide nav arrows by default; remove settings dropdown btn at larger breakpoint; remove unneccessary CSS</title>
<updated>2016-06-21T22:27:34+00:00</updated>
<author>
<name>Annabel Dunstone</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-06-21T22:27:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=94ac45cf0ec9ec6736c4c24e8dd693ab81fe3f22'/>
<id>94ac45cf0ec9ec6736c4c24e8dd693ab81fe3f22</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 '17671-private-forks-list-ui-issues' into 'master'</title>
<updated>2016-06-21T18:45:14+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-06-21T18:45:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=63d411d755a77564f74140392327321a01318817'/>
<id>63d411d755a77564f74140392327321a01318817</id>
<content type='text'>

Fixed private forks notice position in forks list

Moves the private forks notification item into the list on the forks page.

Closes #17671.

See merge request !4573</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fixed private forks notice position in forks list

Moves the private forks notification item into the list on the forks page.

Closes #17671.

See merge request !4573</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'li-fade'</title>
<updated>2016-06-21T16:01:37+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-06-21T16:01:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5ecae728e3ca6e64b29edd485640771adc683fa9'/>
<id>5ecae728e3ca6e64b29edd485640771adc683fa9</id>
<content type='text'>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4799
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4799
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18881-horizontal-nav-arrow'</title>
<updated>2016-06-21T15:47:12+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-06-21T15:47:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=dcf8304b6c2ac71ef9ffaa57c9cf39159c4af69e'/>
<id>dcf8304b6c2ac71ef9ffaa57c9cf39159c4af69e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add arrow in horizontal scroll fade</title>
<updated>2016-06-20T17:11:22+00:00</updated>
<author>
<name>Annabel Dunstone</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-06-20T17:11:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=07195358839a43ab4bae8bd8f112a45af13a79a5'/>
<id>07195358839a43ab4bae8bd8f112a45af13a79a5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add fade divs as li elements</title>
<updated>2016-06-20T14:32:01+00:00</updated>
<author>
<name>Annabel Dunstone</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-06-20T14:32:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7c41f35953494f5f7372a434c8c62a7b466c8212'/>
<id>7c41f35953494f5f7372a434c8c62a7b466c8212</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Display group/project access requesters separately in admin</title>
<updated>2016-06-20T14:12:46+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-06-20T13:50:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=043522a8aed5e598f3cfe97480a5b169fe0786f3'/>
<id>043522a8aed5e598f3cfe97480a5b169fe0786f3</id>
<content type='text'>
Also, reuse partials from the non-admin views.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Also, reuse partials from the non-admin views.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Fixed Ruby to use exclude</title>
<updated>2016-06-18T20:49:20+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-06-16T13:23:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c240cad59a84e090e12d7ce6db94983405aa1813'/>
<id>c240cad59a84e090e12d7ce6db94983405aa1813</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
