summaryrefslogtreecommitdiff
path: root/app/controllers/groups/group_members_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ce/8-2-stable' into ce-stable-to-ee-stableRobert Speicher2015-11-191-2/+0
|\
| * Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' Robert Speicher2015-11-171-15/+15
| * Refactor global and group milestones logicDmitriy Zaporozhets2015-11-161-5/+0
* | Resolve conflictsDouwe Maan2015-11-191-23/+6
* | Merge 8-2-stable into 8-2-stable-eeRobert Speicher2015-11-191-7/+23
* | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-eeDouwe Maan2015-07-311-0/+4
|\ \ | |/
| * Use before_actionsDouwe Maan2015-07-311-4/+1
| * Add specific ability for managing group membersDouwe Maan2015-07-281-0/+7
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-051-1/+5
|\ \ | |/
| * User should be able to leave group. If not - show him proper messageDmitriy Zaporozhets2015-05-291-1/+5
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-eeDouwe Maan2015-05-051-2/+0
|\ \ | |/
| * Remove an old determine_layout call.Douwe Maan2015-04-301-2/+0
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-241-4/+4
|\ \ | |/
| * Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-6/+6
* | Fix conflictDmitriy Zaporozhets2015-04-151-4/+0
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-151-2/+21
|\ \ | |/
| * Follow newline guidelines.Douwe Maan2015-04-141-2/+5
| * Consistently use "invitation" rather than "invite" in text.Douwe Maan2015-04-141-2/+2
| * Use notice flash type rather than nonexistent info.Douwe Maan2015-04-141-2/+2
| * Let membership invitations be resent.Douwe Maan2015-04-141-0/+11
| * Only show invited users to people who can admin group.Douwe Maan2015-04-141-0/+1
| * Track who created a group or project member.Douwe Maan2015-04-141-1/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-03-161-37/+46
|\ \ | |/
| * Move group leave action from dashboard/groups to groups/group_members.Douwe Maan2015-03-151-0/+11
| * Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-151-4/+19
| * Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-151-3/+3
* | Web hook: controller refactoringValery Sizov2015-03-121-4/+0
* | Merge remote-tracking branch 'dev/master' into ce_upstream1Valery Sizov2015-03-121-7/+1
|\ \ | |/
| * group controller refactoringValery Sizov2015-03-121-7/+1
| * Add tests for remove group member feature in admin areaDmitriy Zaporozhets2014-10-201-0/+1
* | Add removal and addition of the user to the group membership to audit events.Marin Jankovski2014-11-211-2/+28
* | Move event creation to service.Marin Jankovski2014-11-211-6/+1
* | Add group audit events.Marin Jankovski2014-11-201-1/+18
* | Add tests for remove group member feature in admin areaDmitriy Zaporozhets2014-10-201-0/+1
|/
* Fix STI+polymorphic for Group <-> GroupMemberDmitriy Zaporozhets2014-09-141-0/+48
View Lorry Controller Status