summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add 7.9.4 to CHANGELOGupdate-changelogDmitriy Zaporozhets2015-04-161-0/+5
* Merge pull request #9089 from dsander/fix-merge-request-commentsMarin Jankovski2015-04-155-7/+11
|\
| * Fix merge request comments on files with multiple commitsDominik Sander2015-04-155-7/+11
* | Merge branch 'fix-mention-notification' into 'master'Dmitriy Zaporozhets2015-04-151-24/+15
|\ \ | |/ |/|
| * Fix for snippets.fix-mention-notificationDouwe Maan2015-04-151-2/+4
| * Fix Mention notification level.Douwe Maan2015-04-151-24/+13
* | Merge branch 'fix-gitorious-test' into 'master'Marin Jankovski2015-04-157-37/+62
|\ \ | |/
| * Make sure user has access to namespace in import tests.Douwe Maan2015-04-157-37/+62
|/
* No tabs in code!Dmitriy Zaporozhets2015-04-151-1/+1
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1578-220/+1246
|\
| * Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-154-16/+74
| |\
| | * Simplify regex.sstanovnik-openssh_fixDouwe Maan2015-04-141-3/+3
| | * Refactor key fingerprint generation.Douwe Maan2015-04-143-40/+71
| | * Add changelog entry.Douwe Maan2015-04-141-0/+1
| | * 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-154-12/+40
| |\ \
| | * | Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replytoDouwe Maan2015-04-144-12/+40
| * | | Merge branch 'emailsonpush-hellip' into 'master'Dmitriy Zaporozhets2015-04-153-3/+4
| |\ \ \
| | * | | Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellipDouwe Maan2015-04-143-3/+4
| * | | | Merge branch 'ldap-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-04-157-9/+84
| |\ \ \ \
| | * | | | 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
View Lorry Controller Status