summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| | |/ / /
| * | | | Merge branch 'ci_fork' into 'master'Dmitriy Zaporozhets2015-04-093-1/+44
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | CI forking: testsValery Sizov2015-04-063-1/+44
* | | | | Move lib/gitlab/oauth to lib/gitlab/o_authRobert Speicher2015-04-092-0/+0
|/ / / /
* | | | Merge branch 'rs-issue-2152' into 'master'Dmitriy Zaporozhets2015-04-081-0/+41
|\ \ \ \
| * | | | Render a 404 when RefsController#logs_tree gets an HTML requestRobert Speicher2015-04-061-0/+41
| |/ / /
* | | | Merge remote-tracking branch 'github.com/master'Douwe Maan2015-04-042-20/+20
|\ \ \ \
| * | | | Fix and improve help renderingSullivan SENECHAL2015-04-032-20/+20
| |/ / /
* | | | Merge branch 'custom-email-reply-to' into 'master'Douwe Maan2015-04-031-0/+8
|\ \ \ \
| * | | | Add ability to configure Reply-To address in gitlab.ymlStan Hu2015-04-031-0/+8
* | | | | Merge branch 'feature_expose_project_labels' into 'master'Hannes Rosenögger2015-04-031-1/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Modified lib/api/entities.rb to expose Project class tag_list property to the...Cristian Medina2015-04-031-1/+8
| | |/ / | |/| |
* | | | Merge branch 'fix-backup-spec-regexp' into 'master'Douwe Maan2015-04-031-1/+1
|\ \ \ \
| * | | | Improve regexp to prevent false positivesStan Hu2015-04-021-1/+1
| | |/ / | |/| |
* | | | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-032-0/+53
|\ \ \ \ | |_|/ / |/| | |
| * | | Support configurable attachment size via Application SettingsStan Hu2015-04-022-0/+53
| | |/ | |/|
* | | Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-023-34/+281
|\ \ \
| * | | Add tests.import-current-userDouwe Maan2015-04-013-34/+281
* | | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-023-0/+238
|\ \ \ \
| * | | | Add tests.Douwe Maan2015-03-313-0/+238
| |/ / /
* | | | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-025-24/+22
|\ \ \ \
| * | | | Move files for moved namespaces.Douwe Maan2015-03-311-2/+0
| * | | | Fix tests.Douwe Maan2015-03-273-11/+11