summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'google-code-fixes' into 'master'Dmitriy Zaporozhets2015-04-211-3/+4
* Merge branch 'rs-issue-2212' into 'master'Dmitriy Zaporozhets2015-04-213-38/+84
* Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'Dmitriy Zaporozhets2015-04-201-0/+223
* Merge branch 'google-code-import-performance' into 'master'Dmitriy Zaporozhets2015-04-171-1/+5
* Make sure user has access to namespace in import tests.Douwe Maan2015-04-155-5/+25
* Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-151-0/+12
|\
| * Refactor key fingerprint generation.Douwe Maan2015-04-141-0/+12
* | Merge branch 'emailsonpush-replyto' into 'master'Dmitriy Zaporozhets2015-04-151-0/+15
|\ \
| * | Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replytoDouwe Maan2015-04-141-0/+15
* | | Merge branch 'emailsonpush-hellip' into 'master'Dmitriy Zaporozhets2015-04-151-1/+1
|\ \ \
| * | | Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellipDouwe Maan2015-04-141-1/+1
| |/ /
* | | Merge branch 'ldap-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-04-151-7/+60
|\ \ \
| * | | Add config var to block auto-created LDAP users.Douwe Maan2015-04-141-7/+60
| |/ /
* | | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-153-22/+148
|\ \ \
| * | | Follow newline guidelines.Douwe Maan2015-04-141-3/+0
| * | | Remove duplication between Group and ProjectMember.Douwe Maan2015-04-141-2/+37
| * | | Let invites be declined.Douwe Maan2015-04-141-0/+17
| * | | Add invite logic to Member.Douwe Maan2015-04-141-0/+79
| * | | Track who created a group or project member.Douwe Maan2015-04-141-2/+0
| |/ /
* | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-156-2/+592
|\ \ \ | |/ / |/| |
| * | Import Google Code issue assignee when mapped.google-code-importDouwe Maan2015-04-142-3/+12
| * | Allow user map to be specified.Douwe Maan2015-04-141-2/+9
| * | Add comment number to imported Google Code comments.Douwe Maan2015-04-141-0/+1
| * | Remove author link since all code.google.com links will be shut down.Douwe Maan2015-04-141-2/+0
| * | Show Google Code image attachments inline.Douwe Maan2015-04-042-1/+7
| * | Fix tests.Douwe Maan2015-04-032-4/+2
| * | Allow projects to be imported from Google Code.Douwe Maan2015-04-036-0/+571
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-141-79/+3
|\ \ \
| * \ \ Merge branch 'revert_fix_email_images' into 'master'Douwe Maan2015-04-141-79/+3
| |\ \ \
| | * | | Revert "Merge branch 'fix_email_images' into 'master'"Hannes Rosenögger2015-04-131-79/+3
* | | | | 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-141-11/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Speed up the overridden `link_to` helperRobert Speicher2015-04-121-11/+15
* | | | | | Merge branch 'ldap_migration'Dmitriy Zaporozhets2015-04-131-14/+0
|\ \ \ \ \ \
| * | | | | | Remove test for 'ldap' provider special caseJacob Vosmaer2015-04-131-14/+0
* | | | | | | Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-133-112/+121
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Update tests.Douwe Maan2015-04-032-48/+54
| * | | | | | Fix errors.Douwe Maan2015-04-022-79/+82
* | | | | | | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-133-8/+25
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add admin deploy keys tests.public-deploy-keysDouwe Maan2015-04-031-0/+3
| * | | | | | Fix failing specs.Douwe Maan2015-04-031-2/+1
| * | | | | | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-031-6/+21
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs-issue-1942' into 'master'Dmitriy Zaporozhets2015-04-121-10/+33
|\ \ \ \ \ \
| * | | | | | Upon successful login, clear `reset_password_token` fieldRobert Speicher2015-04-081-10/+33
* | | | | | | Rename last uses of Buildbox to BuildkiteRobert Speicher2015-04-111-2/+2
* | | | | | | Move buildbox_service files to buildkite_serviceRobert Speicher2015-04-111-0/+0
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-104-1/+79
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'fix-submodules-with-relative-links' into 'master'Douwe Maan2015-04-101-0/+35
| |\ \ \ \ \
| | * | | | | Fix broken file browsing with a submodule that has a relative linkStan Hu2015-04-091-0/+35
| | |/ / / /