summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Clarify config var and add to LDAP docs.ldap-block_auto_created_usersDouwe Maan2015-04-142-1/+8
| | * | | | | | Add config var to block auto-created LDAP users.Douwe Maan2015-04-146-9/+75
| | * | | | | | Non-persisted users already have the identity by way of build_new_user.Douwe Maan2015-04-141-0/+2
| | |/ / / / /
| * | | | | | Merge branch 'fix-repository-rescue' into 'master'Dmitriy Zaporozhets2015-04-152-1/+2
| |\ \ \ \ \ \
| | * | | | | | Don't crash when project repository doesn't exist.fix-repository-rescueDouwe Maan2015-04-142-1/+2
| * | | | | | | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-1564-179/+1042
| |\ \ \ \ \ \ \
| | * | | | | | | Add changelog item.Douwe Maan2015-04-151-0/+1
| | * | | | | | | 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
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-151-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #9039 from gemnasium/update-gemnasium-gitlab-service-to-0-2-6Dmitriy Zaporozhets2015-04-151-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Update gemnasium-gitlab-service to 0.2.6fabien2015-03-271-1/+1
* | | | | | | | | Merge branch 'search-information-leak' into 'master'Dmitriy Zaporozhets2015-04-152-5/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix a whoopsie daisy in the changelog.Douwe Maan2015-04-111-1/+0
| * | | | | | | | Don't leak existence of group or project via search.Douwe Maan2015-04-102-4/+12
| * | | | | | | | Don't leak existence of project via search autocomplete.Douwe Maan2015-04-102-1/+8
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1525-19/+1387
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fix-stuck-mr' into 'master'Douwe Maan2015-04-152-1/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix stuck mrBen Bodenmiller2015-04-142-1/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-1522-16/+1382
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Import Google Code issue assignee when mapped.google-code-importDouwe Maan2015-04-143-3/+26
| | * | | | | | | | | Skip issue comment when its content, updates and attachments are empty.Douwe Maan2015-04-141-39/+61
| | * | | | | | | | | "interpunction" -> "punctuation"Douwe Maan2015-04-141-1/+1
| | * | | | | | | | | Move Specify user map button to paragraph.Douwe Maan2015-04-141-1/+4
| | * | | | | | | | | Allow user map to be specified.Douwe Maan2015-04-1410-23/+150
| | * | | | | | | | | Add comment number to imported Google Code comments.Douwe Maan2015-04-142-3/+4
| | * | | | | | | | | Remove author link since all code.google.com links will be shut down.Douwe Maan2015-04-142-10/+6
| | * | | | | | | | | Show Google Code image attachments inline.Douwe Maan2015-04-043-3/+13