Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | Non-persisted users already have the identity by way of build_new_user. | Douwe Maan | 2015-04-14 | 1 | -0/+2 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge branch 'fix-repository-rescue' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 2 | -1/+2 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Don't crash when project repository doesn't exist.fix-repository-rescue | Douwe Maan | 2015-04-14 | 2 | -1/+2 | |
| * | | | | | | | Merge branch 'invitation' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 64 | -179/+1042 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Add changelog item. | Douwe Maan | 2015-04-15 | 1 | -0/+1 | |
| | * | | | | | | | Remove superfluous info from invite accepted/declined mails.invitation | Douwe Maan | 2015-04-14 | 8 | -12/+8 | |
| | * | | | | | | | Add spinach tests around accepting and declining invitations. | Douwe Maan | 2015-04-14 | 4 | -1/+129 | |
| | * | | | | | | | Follow newline guidelines. | Douwe Maan | 2015-04-14 | 7 | -7/+25 | |
| | * | | | | | | | Remove duplication between Group and ProjectMember. | Douwe Maan | 2015-04-14 | 5 | -43/+75 | |
| | * | | | | | | | Clear up InvitesController member lookup logic. | Douwe Maan | 2015-04-14 | 1 | -5/+4 | |
| | * | | | | | | | Remove duplication from InvitesController. | Douwe Maan | 2015-04-14 | 1 | -25/+22 | |
| | * | | | | | | | Consistently use "invitation" rather than "invite" in text. | Douwe Maan | 2015-04-14 | 7 | -20/+24 | |
| | * | | | | | | | Let invites be declined. | Douwe Maan | 2015-04-14 | 19 | -1/+131 | |
| | * | | | | | | | Add feature tests for inviting members. | Douwe Maan | 2015-04-14 | 4 | -0/+46 | |
| | * | | | | | | | Use "Sign out" instead of "Logout" for consistency. | Douwe Maan | 2015-04-14 | 1 | -1/+1 | |
| | * | | | | | | | Correctly import invited members. | Douwe Maan | 2015-04-14 | 1 | -1/+1 | |
| | * | | | | | | | Use notice flash type rather than nonexistent info. | Douwe Maan | 2015-04-14 | 1 | -2/+2 | |
| | * | | | | | | | Let membership invitations be resent. | Douwe Maan | 2015-04-14 | 5 | -0/+37 | |
| | * | | | | | | | Let members be invited from Add members pane. | Douwe Maan | 2015-04-14 | 8 | -25/+72 | |
| | * | | | | | | | Add emails around invitation. | Douwe Maan | 2015-04-14 | 5 | -4/+82 | |
| | * | | | | | | | Add invites controller. | Douwe Maan | 2015-04-14 | 13 | -2/+152 | |
| | * | | | | | | | Only show invited users to people who can admin group. | Douwe Maan | 2015-04-14 | 2 | -0/+3 | |
| | * | | | | | | | Correctly render invite members without user. | Douwe Maan | 2015-04-14 | 7 | -33/+74 | |
| | * | | | | | | | Reference project members by id instead of user_id. | Douwe Maan | 2015-04-14 | 3 | -9/+5 | |
| | * | | | | | | | Add invite logic to Member. | Douwe Maan | 2015-04-14 | 4 | -38/+179 | |
| | * | | | | | | | Track who created a group or project member. | Douwe Maan | 2015-04-14 | 11 | -31/+35 | |
| | * | | | | | | | Add invite data to member. | Douwe Maan | 2015-04-14 | 2 | -1/+18 | |
| | * | | | | | | | Use through-relation instead of manually mapping. | Douwe Maan | 2015-04-14 | 1 | -2/+1 | |
| | * | | | | | | | Rename manage_group ability to admin_group for consistency with project. | Douwe Maan | 2015-04-14 | 11 | -18/+18 | |
| | | |_|/ / / / | | |/| | | | | | ||||||
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-04-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge pull request #9039 from gemnasium/update-gemnasium-gitlab-service-to-0-2-6 | Dmitriy Zaporozhets | 2015-04-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Update gemnasium-gitlab-service to 0.2.6 | fabien | 2015-03-27 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'search-information-leak' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 2 | -5/+19 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix a whoopsie daisy in the changelog. | Douwe Maan | 2015-04-11 | 1 | -1/+0 | |
| * | | | | | | | | Don't leak existence of group or project via search. | Douwe Maan | 2015-04-10 | 2 | -4/+12 | |
| * | | | | | | | | Don't leak existence of project via search autocomplete. | Douwe Maan | 2015-04-10 | 2 | -1/+8 | |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-15 | 25 | -19/+1387 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'fix-stuck-mr' into 'master' | Douwe Maan | 2015-04-15 | 2 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | fix stuck mr | Ben Bodenmiller | 2015-04-14 | 2 | -1/+4 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'google-code-import' into 'master' | Douwe Maan | 2015-04-15 | 22 | -16/+1382 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Import Google Code issue assignee when mapped.google-code-import | Douwe Maan | 2015-04-14 | 3 | -3/+26 | |
| | * | | | | | | | | | Skip issue comment when its content, updates and attachments are empty. | Douwe Maan | 2015-04-14 | 1 | -39/+61 | |
| | * | | | | | | | | | "interpunction" -> "punctuation" | Douwe Maan | 2015-04-14 | 1 | -1/+1 | |
| | * | | | | | | | | | Move Specify user map button to paragraph. | Douwe Maan | 2015-04-14 | 1 | -1/+4 | |
| | * | | | | | | | | | Allow user map to be specified. | Douwe Maan | 2015-04-14 | 10 | -23/+150 | |
| | * | | | | | | | | | Add comment number to imported Google Code comments. | Douwe Maan | 2015-04-14 | 2 | -3/+4 | |
| | * | | | | | | | | | Remove author link since all code.google.com links will be shut down. | Douwe Maan | 2015-04-14 | 2 | -10/+6 | |
| | * | | | | | | | | | Show Google Code image attachments inline. | Douwe Maan | 2015-04-04 | 3 | -3/+13 | |
| | * | | | | | | | | | Fix tests. | Douwe Maan | 2015-04-03 | 2 | -4/+2 | |
| | * | | | | | | | | | Mask owner email when updated. | Douwe Maan | 2015-04-03 | 1 | -14/+10 |