summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove superfluous info from invite accepted/declined mails.invitationDouwe Maan2015-04-148-12/+8
* Add spinach tests around accepting and declining invitations.Douwe Maan2015-04-144-1/+129
* Follow newline guidelines.Douwe Maan2015-04-147-7/+25
* Remove duplication between Group and ProjectMember.Douwe Maan2015-04-145-43/+75
* Clear up InvitesController member lookup logic.Douwe Maan2015-04-141-5/+4
* Remove duplication from InvitesController.Douwe Maan2015-04-141-25/+22
* Consistently use "invitation" rather than "invite" in text.Douwe Maan2015-04-147-20/+24
* Let invites be declined.Douwe Maan2015-04-1419-1/+131
* Add feature tests for inviting members.Douwe Maan2015-04-144-0/+46
* Use "Sign out" instead of "Logout" for consistency.Douwe Maan2015-04-141-1/+1
* Correctly import invited members.Douwe Maan2015-04-141-1/+1
* Use notice flash type rather than nonexistent info.Douwe Maan2015-04-141-2/+2
* Let membership invitations be resent.Douwe Maan2015-04-145-0/+37
* Let members be invited from Add members pane.Douwe Maan2015-04-148-25/+72
* Add emails around invitation.Douwe Maan2015-04-145-4/+82
* Add invites controller.Douwe Maan2015-04-1413-2/+152
* Only show invited users to people who can admin group.Douwe Maan2015-04-142-0/+3
* Correctly render invite members without user.Douwe Maan2015-04-147-33/+74
* Reference project members by id instead of user_id.Douwe Maan2015-04-143-9/+5
* Add invite logic to Member.Douwe Maan2015-04-144-38/+179
* Track who created a group or project member.Douwe Maan2015-04-1411-31/+35
* Add invite data to member.Douwe Maan2015-04-142-1/+18
* Use through-relation instead of manually mapping.Douwe Maan2015-04-141-2/+1
* Rename manage_group ability to admin_group for consistency with project.Douwe Maan2015-04-1411-18/+18
* Revert "Merge branch 'fix-stuck-mr' into 'master'"Douwe Maan2015-04-142-2/+1
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1420-137/+22
|\
| * Merge branch 'revert_fix_email_images' into 'master'Douwe Maan2015-04-145-107/+6
| |\
| | * Revert "Merge branch 'fix_email_images' into 'master'"Hannes Rosenögger2015-04-135-107/+6
| * | Merge branch 'fix_changelog' into 'master'Douwe Maan2015-04-141-2/+3
| |\ \
| | * | Remove superseeded changelog entry for commit calendarRobert Schilling2015-04-131-1/+0
| | * | Fix wrong merged changelog entriesRobert Schilling2015-04-131-4/+3
| * | | Merge branch 'fix-stuck-mr' into 'master'Douwe Maan2015-04-142-1/+2
| |\ \ \
| | * | | fix stuck MRBen Bodenmiller2015-04-142-1/+2
| | |/ /
| * | | Merge branch 'fix_tests_help_link_2' into 'master'Hannes Rosenögger2015-04-132-0/+7
| |\ \ \
| | * | | fix failing testHannes Rosenögger2015-04-132-0/+7
| |/ / /
| * | | Merge branch 'fix_tests_help_link' into 'master'Douwe Maan2015-04-133-19/+0
| |\ \ \
| | * | | The help link has been removed. The commit removes the test for it.Hannes Rosenögger2015-04-133-19/+0
| |/ / /
| * | | Merge branch 'empty-avatar-alt-text' into 'master'Hannes Rosenögger2015-04-139-9/+10
| |\ \ \
| | * | | Explicitly set image alt to prevent graphical glitchesSven Strickroth2015-04-139-9/+10
| * | | | Merge branch 'remove-sidebar-help-link' into 'master'Hannes Rosenögger2015-04-131-5/+0
| |\ \ \ \
| | * | | | Removed help link from sidebarPhil Hughes2015-03-311-5/+0
| * | | | | Merge branch 'master' into 'master'Hannes Rosenögger2015-04-131-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | gitlab 7.9.2Igor Kostenko2015-04-071-1/+1
| | | |/ / | | |/| |
* | | | | Merge branch 'rs-remove-invalid-key-factories' into 'master'Dmitriy Zaporozhets2015-04-143-22/+9
|\ \ \ \ \
| * | | | | Remove the invalid key factoriesRobert Speicher2015-04-113-22/+9
* | | | | | Merge branch 'rs-link-to-performance' into 'master'Dmitriy Zaporozhets2015-04-142-32/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use `start_with?` instead of String slicing to check for external linksRobert Speicher2015-04-121-1/+1
| * | | | | Speed up the overridden `link_to` helperRobert Speicher2015-04-122-32/+38
* | | | | | Merge branch 'ldap_migration'Dmitriy Zaporozhets2015-04-138-20/+48
|\ \ \ \ \ \
| * | | | | | Call your existing LDAP server 'main'Jacob Vosmaer2015-04-132-4/+9
View Lorry Controller Status