summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflictsStan Hu2019-06-101-8/+15
* Fix UTF-8 conversion issues when resolving conflictsStan Hu2019-06-101-1/+13
* Revert "Merge branch '50070-legacy-attachments' into 'master'"sh-revert-mr-24679Stan Hu2019-06-091-253/+0
* Fix migration specs using factoriesMarkus Koller2019-06-071-9/+25
* Merge branch '62418-project-default-git-depth' into 'master'Kamil Trzciński2019-06-072-0/+9
|\
| * Fix migration specs using factoriesKrasimir Angelov2019-06-072-2/+2
| * Add project level git depth settingKrasimir Angelov2019-06-062-0/+9
* | Merge branch '50070-legacy-attachments' into 'master'Kamil Trzciński2019-06-071-0/+237
|\ \
| * | Migrate legacy uploads to the project location50070-legacy-attachmentsJarka Košanová2019-06-061-0/+237
* | | Make OpenID Connect work without requiring a namesh-fix-openid-connect-defaultsStan Hu2019-06-061-0/+8
* | | Add pages domains acme ordersVladimir Shushlin2019-06-062-33/+23
* | | Show Test Automation Engineer for spec/feature asLin Jen-Shin2019-06-061-10/+37
|/ /
* | Ensure that template is used onceKamil Trzciński2019-06-061-0/+7
* | Merge branch 'ci-variable-expression-con-dis-junction' into 'master'Kamil Trzciński2019-06-0610-208/+730
|\ \
| * | && and || operators for CI Pipeline expressions.drew cimino2019-06-0410-208/+730
* | | Merge branch 'revert-86900f00' into 'master'Grzegorz Bizon2019-06-061-4/+4
|\ \ \ | |_|/ |/| |
| * | Revert "Merge branch..."revert-86900f00Kamil Trzciński2019-06-051-4/+4
* | | Merge branch '54140-non-ar-cache-commit-markdown' into 'master'Douwe Maan2019-06-054-0/+338
|\ \ \
| * | | Remove requirement for id for #markdown_cache_keyPatrick Bajao2019-06-052-8/+0
| * | | Use #cache_key of subject for generated redis keyPatrick Bajao2019-06-053-27/+37
| * | | Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-054-0/+336
| | |/ | |/|
* | | Merge branch 'graphql-file-entry-url' into 'master'Nick Thomas2019-06-051-0/+20
|\ \ \
| * | | Add web_url to tree entry in GraphQL APIPhil Hughes2019-06-051-0/+20
| |/ /
* | | Merge branch '11126-fix-repository-size-check-ce' into 'master'Stan Hu2019-06-052-0/+23
|\ \ \ | |_|/ |/| |
| * | Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-cePatrick Bajao2019-06-052-0/+23
| |/
* | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'Douglas Barbosa Alexandre2019-06-051-0/+24
|\ \
| * | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-051-0/+24
* | | Add multiple extends supportWolphin2019-06-053-11/+39
| |/ |/|
* | Merge branch '61964-unicorn-instrumentation' into 'master'Bob Van Landuyt2019-06-043-8/+71
|\ \ | |/ |/|
| * Merge branch 'master' into 61964-unicorn-instrumentationRyan Cobb2019-05-2910-83/+187
| |\
| * | Adds ruby and unicorn instrumentationRyan Cobb2019-05-203-8/+71
* | | Ignore Puma empty worker statsJan Provaznik2019-06-041-0/+27
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-033-1/+29
|\ \ \
| * \ \ Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'Robert Speicher2019-06-033-1/+29
| |\ \ \
| | * | | Remove unused fixture linesTiger2019-05-281-2/+0
| | * | | Add `html` to sensitive wordscharlieablett2019-05-011-1/+2
| | * | | Remove accidental regressionscharlieablett2019-04-301-5/+6
| | * | | Ensure Issue & MR note_html cannot be importedAsh McKenzie2019-04-302-16/+16
| | * | | Add disallowed fields to AttributeCleanercharlieablett2019-04-242-10/+8
| | * | | Re-stub stubbed method callscharlieablett2019-04-231-3/+9
| | * | | Exclude fields from note importcharlieablett2019-04-232-2/+26
* | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-0313-47/+386
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'security-fix_milestones_search_api_leak' into 'master'GitLab Release Tools Bot2019-06-031-0/+24
| |\ \ \ \
| | * | | | Resolve: Milestones leaked via search APIFelipe Artur2019-05-201-0/+24
| * | | | | Merge branch 'security-60039' into 'master'GitLab Release Tools Bot2019-06-032-27/+66
| |\ \ \ \ \
| | * | | | | Refactor spec to not use truthy or falseyMark Chao2019-05-031-58/+58
| | * | | | | Validate MR branch namesMark Chao2019-05-032-27/+66
| * | | | | | Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master'GitLab Release Tools Bot2019-06-031-0/+34
| |\ \ \ \ \ \
| | * | | | | | Hide password on import by url formIgor Drozdov2019-05-291-0/+34
| * | | | | | | Add DNS rebinding protection settingsOswaldo Ferreira2019-05-302-0/+67