<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/features/projects, 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>Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into 'master'</title>
<updated>2016-12-09T19:27:09+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-12-09T19:27:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ffa1b67d2fe2ca00616837e477002142e8f6dcfa'/>
<id>ffa1b67d2fe2ca00616837e477002142e8f6dcfa</id>
<content type='text'>

Remove 'Leave Project' and 'Leave Group' from settings dropdowns

## What does this MR do?

Removes `Leave Project` and `Leave Group` from the settings dropdown.

Adds it to the `views/shared/members/access_request_buttons.html.haml`.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png)
![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.png)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [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 #23305

See merge request !7600</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Remove 'Leave Project' and 'Leave Group' from settings dropdowns

## What does this MR do?

Removes `Leave Project` and `Leave Group` from the settings dropdown.

Adds it to the `views/shared/members/access_request_buttons.html.haml`.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png)
![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.png)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [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 #23305

See merge request !7600</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'members-dropdowns' into 'master'</title>
<updated>2016-12-09T18:11:47+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-12-09T18:11:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5bb43bb9531422545f974df8a6cf5616b7631f51'/>
<id>5bb43bb9531422545f974df8a6cf5616b7631f51</id>
<content type='text'>

Updated members dropdowns

## What does this MR do?

EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts.

## Screenshots (if relevant)

![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png)

See merge request !7974</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Updated members dropdowns

## What does this MR do?

EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts.

## Screenshots (if relevant)

![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png)

See merge request !7974</pre>
</div>
</content>
</entry>
<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>remove unnecessary issues event filter on comments tab</title>
<updated>2016-12-08T20:46:45+00:00</updated>
<author>
<name>Rydkin Maxim</name>
<email>maks.rydkin@gmail.com</email>
</author>
<published>2016-12-03T20:26:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4af62042bb7ddeff742a62048438673811e5344a'/>
<id>4af62042bb7ddeff742a62048438673811e5344a</id>
<content type='text'>
fix features_visibility_spec.rb

remove strange part of spec

fix conditions of comments tab disappearing and fix spec

generate changelog

rewrite spec for more coplex check step-by-step

move conditional logic into helper and fix changelog

fix indentation in helper
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
fix features_visibility_spec.rb

remove strange part of spec

fix conditions of comments tab disappearing and fix spec

generate changelog

rewrite spec for more coplex check step-by-step

move conditional logic into helper and fix changelog

fix indentation in helper
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '25171-fix-mr-features-settings-hidden-when-builds-are-disabled' into 'master'</title>
<updated>2016-12-08T15:43:14+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-12-08T15:43:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=30daf78daf838382fee3e31f9e10d008cda48ccd'/>
<id>30daf78daf838382fee3e31f9e10d008cda48ccd</id>
<content type='text'>

Remove wrong '.builds-feature' class from the MR settings fieldset

Closes #25171

See merge request !7930</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Remove wrong '.builds-feature' class from the MR settings fieldset

Closes #25171

See merge request !7930</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'group-members-in-project-members-view' into 'master'</title>
<updated>2016-12-08T14:45:39+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-12-08T14:45:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=abb53bb6b718f56d44aa5480c85d29177f03e5c3'/>
<id>abb53bb6b718f56d44aa5480c85d29177f03e5c3</id>
<content type='text'>

Shows group members in the project members list

Closes #24122

See merge request !7899</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Shows group members in the project members list

Closes #24122

See merge request !7899</pre>
</div>
</content>
</entry>
<entry>
<title>Remove wrong '.builds-feature' class from the MR settings fieldset</title>
<updated>2016-12-07T11:42:09+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-05T15:00:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9cc19d9b2ce6af378dce67260c13f208ddc40bca'/>
<id>9cc19d9b2ce6af378dce67260c13f208ddc40bca</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>Handle an edge-case whith invitees</title>
<updated>2016-12-07T08:59:52+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-07T08:59:52+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=96f162125dabb3d3ff21cb95abf97e5af6ee5589'/>
<id>96f162125dabb3d3ff21cb95abf97e5af6ee5589</id>
<content type='text'>
When the project has invitees, no group members were
returned due to a `user_id NOT IN (42, NULL)` query which
always returned [] since a `user_id` would be NULL, thus the condition
could never match.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When the project has invitees, no group members were
returned due to a `user_id NOT IN (42, NULL)` query which
always returned [] since a `user_id` would be NULL, thus the condition
could never match.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Guests can read builds if those are public</title>
<updated>2016-12-04T14:48:50+00:00</updated>
<author>
<name>Z.J. van de Weg</name>
<email>zegerjan@gitlab.com</email>
</author>
<published>2016-10-13T07:38:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=617f43c74b967a085f6cd7afb1408cfa28187b52'/>
<id>617f43c74b967a085f6cd7afb1408cfa28187b52</id>
<content type='text'>
Fixes #18448
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fixes #18448
</pre>
</div>
</content>
</entry>
<entry>
<title>Shows group members in the project members list</title>
<updated>2016-12-02T16:49:53+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-12-02T14:34:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=89c22ed5af490f250800030ee4342c185dbc5358'/>
<id>89c22ed5af490f250800030ee4342c185dbc5358</id>
<content type='text'>
Closes #24122
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #24122
</pre>
</div>
</content>
</entry>
</feed>
