<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/views/groups, 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 '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>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>using request dot path instead</title>
<updated>2016-06-17T17:17:06+00:00</updated>
<author>
<name>barthc</name>
<email>mackintosh02@gmail.com</email>
</author>
<published>2016-06-17T17:17:06+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=00ac4b8e57980607bea9949ae8febaf9f5decdca'/>
<id>00ac4b8e57980607bea9949ae8febaf9f5decdca</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix wrong partial path in JS view</title>
<updated>2016-06-15T15:27:37+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-06-15T11:42:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=56ca4859552cc23d5fee88f056952535034e99c7'/>
<id>56ca4859552cc23d5fee88f056952535034e99c7</id>
<content type='text'>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>UI and copywriting improvements</title>
<updated>2016-06-14T11:18:14+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-06-02T16:05:06+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=515205d3c1c6655302ed0ae44cc5954dead7ae79'/>
<id>515205d3c1c6655302ed0ae44cc5954dead7ae79</id>
<content type='text'>
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Add request access for groups</title>
<updated>2016-06-14T11:07:26+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-04-18T16:53:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d26f81239a33b80694783ee35f0da0e2ed082c9b'/>
<id>d26f81239a33b80694783ee35f0da0e2ed082c9b</id>
<content type='text'>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Don't try to count a relation with aliases</title>
<updated>2016-06-10T13:29:08+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-06-10T13:22:50+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c7941acd1e410fedb431efe13dc3b74dfa7f9f8a'/>
<id>c7941acd1e410fedb431efe13dc3b74dfa7f9f8a</id>
<content type='text'>
98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML,
but not MRs or Atom feeds.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML,
but not MRs or Atom feeds.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'dz-improve-ui-consistency-2' into 'master'</title>
<updated>2016-06-09T21:07:47+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-09T21:07:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5fcb0919220c7b2ebe73c8dbece38ecf3472ed5d'/>
<id>5fcb0919220c7b2ebe73c8dbece38ecf3472ed5d</id>
<content type='text'>

Improve ui consistency. Part 2

* Use responsive top-area on project branches and tags pages
* Use default button size in the content list controls
* Improve button margin for btn-grouped css class

For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324

See merge request !4536</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Improve ui consistency. Part 2

* Use responsive top-area on project branches and tags pages
* Use default button size in the content list controls
* Improve button margin for btn-grouped css class

For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324

See merge request !4536</pre>
</div>
</content>
</entry>
<entry>
<title>Improved the UX of issue &amp; milestone date picker</title>
<updated>2016-06-09T20:24:40+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-06-06T08:26:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cc971f03096b8298567caf0b9e0ae738bead03a7'/>
<id>cc971f03096b8298567caf0b9e0ae738bead03a7</id>
<content type='text'>
Closes #18198
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #18198
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18333-layout-bug' into 'master'</title>
<updated>2016-06-08T21:28:36+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-08T21:28:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8578f4011a0575717ca5eee02b77bf90bd9e21e0'/>
<id>8578f4011a0575717ca5eee02b77bf90bd9e21e0</id>
<content type='text'>

Use container helper instead of hard coded container

## What does this MR do?
Add `container_class` helper class to fix layout bug

## What are the relevant issue numbers?
#18333 
## Screenshots (if relevant)
Fixed:    
![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png)
Fluid:     
![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png)

See merge request !4543</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Use container helper instead of hard coded container

## What does this MR do?
Add `container_class` helper class to fix layout bug

## What are the relevant issue numbers?
#18333 
## Screenshots (if relevant)
Fixed:    
![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png)
Fluid:     
![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png)

See merge request !4543</pre>
</div>
</content>
</entry>
</feed>
