summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix squash with renamed filesfix-squash-with-renamed-filesSean McGivern2018-02-191-1/+1
* Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-191-1/+1
|\
| * Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-191-10/+1
| * applying feedback32564-fix-double-system-closing-notesMicaël Bergeron2018-02-161-1/+2
| * fix specsMicaël Bergeron2018-02-161-0/+8
* | Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-191-0/+1
|\ \
| * | Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-dataStan Hu2018-02-181-0/+1
| |/
* | Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'Douwe Maan2018-02-191-1/+3
|\ \
| * | Fix Error 500 when viewing a commit with a GPG signature in GeoStan Hu2018-02-191-1/+3
| |/
* | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-191-6/+22
|\ \ | |/ |/|
| * Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-savingRubén Dávila2018-02-161-1/+1
| * Revert "Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-u...Rubén Dávila2018-02-151-6/+22
* | Merge branch '42050-combine-all-rake-based-lints-in-one-rake-process-in-ci' i...Robert Speicher2018-02-161-0/+49
|\ \
| * | Run lint:all tasks in forks42050-combine-all-rake-based-lints-in-one-rake-process-in-ciRémy Coutable2018-02-141-11/+32
| * | Combine all rake tasks in the static-analysis jobRémy Coutable2018-02-141-0/+28
* | | Fix project import API after import service refactorJames Lopez2018-02-161-2/+6
* | | Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'Sean McGivern2018-02-163-0/+73
|\ \ \
| * | | update docsJames Lopez2018-02-161-1/+1
| * | | refactor code based on feedback41899-api-endpoint-for-importing-a-project-exportJames Lopez2018-02-141-1/+1
| * | | refactor code based on feedbackJames Lopez2018-02-141-7/+10
| * | | refactor api classJames Lopez2018-02-131-3/+5
| * | | add docs and changelogJames Lopez2018-02-131-1/+1
| * | | add more specsJames Lopez2018-02-131-6/+4
| * | | fix entityJames Lopez2018-02-131-1/+3
| * | | add import status endpointJames Lopez2018-02-131-8/+18
| * | | fix file uploadJames Lopez2018-02-131-3/+4
| * | | update import API and specJames Lopez2018-02-131-2/+2
| * | | update import API and specJames Lopez2018-02-131-2/+5
| * | | add post import API endpointJames Lopez2018-02-131-0/+48
| * | | add entity and update specJames Lopez2018-02-132-0/+6
* | | | Merge branch 'asciidoc_inter_document_cross_references' into 'master'Sean McGivern2018-02-161-1/+2
|\ \ \ \
| * | | | Set Asciidoctor outfilesuffix to default .adocTuro Soisenniemi2018-02-141-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'update-profiler-docs-explaining-how-to-provide-user' into 'master'Sean McGivern2018-02-161-0/+1
|\ \ \ \
| * | | | Improve error handling for Gitlab::Profiler and improve doc about providing a...update-profiler-docs-explaining-how-to-provide-userDylan Griffith2018-02-161-0/+1
* | | | | Merge branch 'dm-escape-commit-message' into 'master'Sean McGivern2018-02-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Escape HTML entities in commit messagesDouwe Maan2018-02-151-1/+1
* | | | | Fixed bug with the user synced attributes when the user doesn't existfj-fixed-bug-17054Francisco Javier López2018-02-151-1/+1
|/ / / /
* | | | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-152-2/+8
* | | | Merge branch 'jej/fix-slow-lfs-object-check' into 'master'Douwe Maan2018-02-153-7/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Only check LFS integrity for first branch in pushjej/fix-slow-lfs-object-checkJames Edwards-Jones2018-02-153-7/+11
* | | | Merge branch '39885-ensure-users-cannot-create-environments-with-leading-slas...Kamil Trzciński2018-02-141-2/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Ensure users can't create environments with leading or trailing slashes (Fixe...39885-ensure-users-cannot-create-environments-with-leading-slashesDylan Griffith2018-02-131-2/+6
* | | | Merge branch 'mk-fix-pg-undefined-table-ci-errors' into 'master'Rémy Coutable2018-02-142-3/+5
|\ \ \ \
| * | | | Avoid dropping tables in testMichael Kozono2018-02-142-3/+5
* | | | | Merge branch 'fix/template-project-visibility' into 'master'Douwe Maan2018-02-141-23/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove Gitlab::ImportExport::ProjectCreator classGeorge Tsiolis2018-02-141-23/+0
* | | | | Merge branch 'feature/include-custom-attributes-in-api' into 'master'Douwe Maan2018-02-145-7/+83
|\ \ \ \ \
| * | | | | Allow including custom attributes in API responsesMarkus Koller2018-02-085-7/+83
* | | | | | Merge branch '42934-search-api-fix' into 'master'Sean McGivern2018-02-145-13/+14
|\ \ \ \ \ \
| * | | | | | API - Include project in commits&blobs search resultsJarka Kadlecová2018-02-145-13/+14
| | |_|_|_|/ | |/| | | |
View Lorry Controller Status