summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'google-code-fixes' into 'master'Dmitriy Zaporozhets2015-04-212-4/+26
* Merge branch 'rs-issue-2212' into 'master'Dmitriy Zaporozhets2015-04-212-22/+36
* Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'Dmitriy Zaporozhets2015-04-201-7/+28
* Merge branch 'fix-label-color-input' into 'master'Dmitriy Zaporozhets2015-04-202-1/+3
* Merge branch 'google-code-import-performance' into 'master'Dmitriy Zaporozhets2015-04-173-5/+27
* Fix username period migration to preserve uniqueness of names and paths.Douwe Maan2015-04-171-0/+1
* Merge pull request #9089 from dsander/fix-merge-request-commentsMarin Jankovski2015-04-154-7/+10
|\
| * Fix merge request comments on files with multiple commitsDominik Sander2015-04-154-7/+10
* | Fix for snippets.fix-mention-notificationDouwe Maan2015-04-151-2/+4
* | Fix Mention notification level.Douwe Maan2015-04-151-24/+13
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1553-180/+714
|\
| * Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-151-16/+4
| |\
| | * Refactor key fingerprint generation.Douwe Maan2015-04-141-40/+4
| | * The new fingerprint format wis incompatible with the previous regex.Sašo Stanovnik2015-03-241-4/+11
| | * Use 2 spaces for indentation, not 4.Sašo Stanovnik2015-03-241-1/+1
| | * Fixed generating SSH key fingerprints in OpenSSH 6.8.Sašo Stanovnik2015-03-241-1/+18
| * | Merge branch 'emailsonpush-replyto' into 'master'Dmitriy Zaporozhets2015-04-152-12/+24
| |\ \
| | * | Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replytoDouwe Maan2015-04-142-12/+24
| * | | Merge branch 'emailsonpush-hellip' into 'master'Dmitriy Zaporozhets2015-04-151-2/+2
| |\ \ \
| | * | | Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellipDouwe Maan2015-04-141-2/+2
| * | | | Merge branch 'fix-repository-rescue' into 'master'Dmitriy Zaporozhets2015-04-151-1/+1
| |\ \ \ \
| | * | | | Don't crash when project repository doesn't exist.fix-repository-rescueDouwe Maan2015-04-141-1/+1
| * | | | | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-1549-149/+683
| |\ \ \ \ \
| | * | | | | 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-141-0/+2
| | * | | | | Follow newline guidelines.Douwe Maan2015-04-146-4/+25
| | * | | | | Remove duplication between Group and ProjectMember.Douwe Maan2015-04-144-41/+38
| | * | | | | 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-1417-1/+113
| | * | | | | 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-144-0/+32
| | * | | | | 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-1412-2/+143
| | * | | | | 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-143-38/+100
| | * | | | | Track who created a group or project member.Douwe Maan2015-04-149-28/+34
| | * | | | | Rename manage_group ability to admin_group for consistency with project.Douwe Maan2015-04-149-14/+14
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'search-information-leak' into 'master'Dmitriy Zaporozhets2015-04-151-5/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't leak existence of group or project via search.Douwe Maan2015-04-101-4/+11
| * | | | | Don't leak existence of project via search autocomplete.Douwe Maan2015-04-101-1/+6
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1510-15/+276
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-stuck-mr' into 'master'Douwe Maan2015-04-151-1/+3
| |\ \ \ \ \ \
| | * | | | | | fix stuck mrBen Bodenmiller2015-04-141-1/+3
View Lorry Controller Status