summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-191-0/+12
|\
| * Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-dataStan Hu2018-02-181-0/+12
* | Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'Douwe Maan2018-02-191-1/+25
|\ \
| * | Fix Error 500 when viewing a commit with a GPG signature in GeoStan Hu2018-02-191-1/+25
| |/
* | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-191-3/+58
|\ \ | |/ |/|
| * Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-savingRubén Dávila2018-02-161-3/+23
| * Revert "Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-u...Rubén Dávila2018-02-151-0/+35
* | Allow oxford commas and spaces before commas in MR issue closing pattern.Vicky Chijwani2018-02-171-0/+14
* | Merge branch 'asciidoc_inter_document_cross_references' into 'master'Sean McGivern2018-02-161-0/+8
|\ \
| * | Set Asciidoctor outfilesuffix to default .adocTuro Soisenniemi2018-02-141-0/+8
| |/
* | Merge branch 'update-profiler-docs-explaining-how-to-provide-user' into 'master'Sean McGivern2018-02-161-0/+9
|\ \
| * | Improve error handling for Gitlab::Profiler and improve doc about providing a...update-profiler-docs-explaining-how-to-provide-userDylan Griffith2018-02-161-0/+9
* | | Fix specdm-escape-commit-messageDouwe Maan2018-02-151-1/+1
* | | Escape HTML entities in commit messagesDouwe Maan2018-02-151-7/+2
|/ /
* | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-152-0/+12
* | Merge branch 'jej/fix-slow-lfs-object-check' into 'master'Douwe Maan2018-02-151-2/+17
|\ \ | |/ |/|
| * Only check LFS integrity for first branch in pushjej/fix-slow-lfs-object-checkJames Edwards-Jones2018-02-151-2/+17
* | Merge branch '39885-ensure-users-cannot-create-environments-with-leading-slas...Kamil Trzciński2018-02-141-0/+5
|\ \
| * | Ensure users can't create environments with leading or trailing slashes (Fixe...39885-ensure-users-cannot-create-environments-with-leading-slashesDylan Griffith2018-02-131-0/+5
* | | Avoid dropping tables in testMichael Kozono2018-02-142-24/+9
* | | Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-131-9/+0
|\ \ \
| * | | Revert problematic LDAP person validation that threw exceptionsDrew Blessing2018-02-131-9/+0
* | | | Merge branch 'whitelisting' into 'master'Yorick Peterse2018-02-131-12/+0
|\ \ \ \
| * | | | Remove Sentry reporting for query limitingYorick Peterse2018-02-131-12/+0
* | | | | Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'Douwe Maan2018-02-131-116/+54
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Dry up specmk-fix-no-untracked-upload-files-errorMichael Kozono2018-02-121-107/+29
| * | | | Fix orphan temp table untracked_files_for_uploadsMichael Kozono2018-02-121-25/+17
| * | | | Fix last batch size equals max batch size errorMichael Kozono2018-02-121-0/+24
* | | | | Merge branch 'sh-no-cache-populate-migration' into 'master'Sean McGivern2018-02-131-1/+6
|\ \ \ \ \
| * | | | | Use the :migration metadata in migration specsRémy Coutable2018-02-121-1/+6
| * | | | | Disable caching of tables for migration spec that drops a temporary tableStan Hu2018-02-121-1/+1
| |/ / / /
* | | | | Merge branch 'sh-disable-query-limiter' into 'master'Ian Baum2018-02-121-4/+6
|\ \ \ \ \
| * | | | | Disable query limiting warnings for now on GitLab.comStan Hu2018-02-121-4/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'ac/4878-fix-attachments-ext' into 'master'Nick Thomas2018-02-121-3/+7
|\ \ \ \ \
| * | | | | Honour workhorse provided file nameac/4878-fix-attachments-extAlessio Caiazza2018-02-121-3/+7
| |/ / / /
* | | | | Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-s...rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-keyRubén Dávila2018-02-121-35/+0
| |/ / / |/| | |
* | | | Create an empty wiki when there is no wiki in the gitlab export bundleValery Sizov2018-02-121-0/+45
|/ / /
* | | Merge branch 'fix/encoding-to-unsupported-encodings' into 'master'Robert Speicher2018-02-091-0/+5
|\ \ \
| * | | Return a warning string if we try to encode to unsupported encodingAhmad Sherif2018-02-091-0/+5
| | |/ | |/|
* | | Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-02-091-3/+54
|/ /
* | Merge branch '40744-hashed-storage-specs' into 'master'Sean McGivern2018-02-0813-40/+57
|\ \
| * | Use hashed storage in the specs40744-hashed-storage-specsNick Thomas2018-02-0713-40/+57
* | | Migrate Git::Blob.batch to GitalyAhmad Sherif2018-02-082-42/+88
* | | Merge branch 'fix/cache-gitaly-find-commits' into 'master'Sean McGivern2018-02-071-0/+26
|\ \ \
| * | | Cache Gitaly FindCommit RPC responsefix/cache-gitaly-find-commitsAhmad Sherif2018-02-071-0/+26
* | | | Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master'Sean McGivern2018-02-072-8/+0
|\ \ \ \
| * | | | Reset column information after the schema is migrated in MigrationsHelpers.sc...ce-4813-fix-ee-projects-destroy_service_specRémy Coutable2018-02-072-8/+0
* | | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-073-9/+21
|\ \ \ \ \
| * | | | | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480Pawel Chojnacki2018-02-071-0/+10
| * | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0641-173/+1000
| |\ \ \ \ \