18 Commits

Include renames

Author	SHA1	Message	Date
Douwe MaanandRémy Coutable	b791f98f2e	Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master' ... Display group/project access requesters separately in admin ## What does this MR do? It displays the access requesters in a separate list in group & project members pages. It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin & 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 | | --------- | ---- | |  |  | ### Project members | Before | After | | --------- | ---- | |  |  | ### Admin group members | Before | After | | --------- | ---- | |  |  | ### Admin project members | Before | After | | --------- | ---- | |  |  | ## 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 Signed-off-by: Rémy Coutable <remy@rymai.me>	2016-06-22 15:51:50 +02:00
Dmitriy Zaporozhets	55ceda1204	Bring shared project feature tests from EE ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2016-03-12 14:45:14 +01:00
Douglas Barbosa Alexandre	9ab7bdf773	Signed in admin should be able to add/remove himself to a group	2015-12-01 20:53:43 -02:00
Stan Hu	3715a0f29b	Fix bug preventing invite by e-mail ... This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320	2015-08-21 13:47:56 -07:00
Robert Speicher	fb6dc1f07d	Add Group#add_* convenience methods ... Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.	2015-08-07 00:20:02 -04:00
Robert Speicher	584f8601ef	Change within to page.within in feature steps	2015-06-12 05:12:42 -04:00
Robert Speicher	69bbc413fe	Update all should-style syntax to expect in features	2015-06-12 05:12:09 -04:00
Douwe Maan	31fc73f0a9	Use project_member instead of team_member.	2015-03-15 13:50:38 +01:00
Dmitriy Zaporozhets	c5be267e40	Refactor issuable sorting a bit	2015-02-05 20:21:21 -08:00
Sytse Sijbrandij	7b233ea853	Spelling improvement, add in a group, not into group.	2015-02-03 16:55:31 -08:00
Dmitriy Zaporozhets	d0b1bc222e	Fix spinach test ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2014-12-22 16:48:40 +02:00
Dmitriy Zaporozhets	2064a14724	Add tests for remove group member feature in admin area ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2014-10-20 13:18:07 +03:00
Dmitriy Zaporozhets	c31c8c55a4	Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/markdown_render.rb	2014-09-22 20:56:12 +03:00
Dmitriy Zaporozhets	fbdf34d7ab	Merge pull request #7821 from cirosantilli/factor-spinach-classes ... [factor] Prefix Spinach features with Spinach::Features::.	2014-09-22 20:54:37 +03:00
Ciro Santilli	de6c8778f7	Prefix Spinach features with Spinach::Features::.	2014-09-22 16:30:25 +02:00
Ciro Santilli	ef6e94e37e	Replace old spinach step definitions with step.	2014-09-22 10:01:50 +02:00
Dmitriy Zaporozhets	4f1bb91a75	Fix finder and tests for new membership models ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2014-09-15 16:45:28 +03:00
Ciro Santillli	170340e6b1	Remove dir prefix and suffix from tests inside dir.	2014-02-23 10:34:39 +01:00