summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge branch 'api-refs-for-commit' into 'master'Douwe Maan2018-02-142-1/+26
|\ \ \ \ \ \
| * | | | | | Refactor commits/refs API to use hash and add pagination headersRobert Schilling2018-02-142-19/+8
| * | | | | | Separate branch and tag namesRobert Schilling2018-02-092-6/+10
| * | | | | | Incorporate feedbackRobert Schilling2018-02-092-21/+18
| * | | | | | Basic ref fetching for commitsRobert Schilling2018-02-092-3/+38
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-131-15/+0
|\ \ \ \ \ \
| * | | | | | Revert problematic LDAP person validation that threw exceptionsDrew Blessing2018-02-131-15/+0
* | | | | | | Merge branch 'whitelisting' into 'master'Yorick Peterse2018-02-131-7/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove Sentry reporting for query limitingYorick Peterse2018-02-131-7/+1
* | | | | | | Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'Douwe Maan2018-02-131-2/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix orphan temp table untracked_files_for_uploadsMichael Kozono2018-02-121-1/+10
| * | | | | | Fix last batch size equals max batch size errorMichael Kozono2018-02-121-1/+1
* | | | | | | Merge branch 'jivl-update-katex' into 'master'Clement Ho2018-02-121-2/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-1258-306/+874
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-05272-1839/+5328
| |\ \ \ \ \ \ \
| * | | | | | | | Removed the katex precompile steps from the application configurationJose Ivan Vargas2017-12-211-1/+0
| * | | | | | | | added katex.js and load it via webpackJose Ivan Vargas2017-12-211-1/+0
* | | | | | | | | Merge branch 'sh-disable-query-limiter' into 'master'Ian Baum2018-02-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable query limiting warnings for now on GitLab.comStan Hu2018-02-121-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ac/4878-fix-attachments-ext' into 'master'Nick Thomas2018-02-121-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Honour workhorse provided file nameac/4878-fix-attachments-extAlessio Caiazza2018-02-121-4/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | 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-22/+6
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Create an empty wiki when there is no wiki in the gitlab export bundleValery Sizov2018-02-122-2/+26
|/ / / / / / /
* | | | | | | Merge branch '42908-rename-scss-files-to-use-snake-case' into 'master'Filipa Lacerda2018-02-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Rename .scss files to use snake_case42908-rename-scss-files-to-use-snake-caseEric Eastwood2018-02-081-1/+1
* | | | | | | | Merge branch '42937-search-api-fix' into 'master'Grzegorz Bizon2018-02-121-4/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | API - fix searching in group/project specified by path42937-search-api-fixJarka Kadlecová2018-02-091-4/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix/encoding-to-unsupported-encodings' into 'master'Robert Speicher2018-02-091-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Return a warning string if we try to encode to unsupported encodingAhmad Sherif2018-02-091-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'sec...Robert Speicher2018-02-092-2/+2
* | | | | | | Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-02-091-12/+22
|/ / / / / /
* | | | | | Remove allow_n_plus_1 from Git::Repository#branches_filterAhmad Sherif2018-02-081-11/+8
* | | | | | Merge branch '40744-hashed-storage-specs' into 'master'Sean McGivern2018-02-081-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Use hashed storage in the specs40744-hashed-storage-specsNick Thomas2018-02-071-1/+1
* | | | | | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ceYorick Peterse2018-02-081-4/+11
|\ \ \ \ \ \
| * | | | | | Handle uniqueness on fork_network_member creationBob Van Landuyt2018-02-081-4/+11
* | | | | | | Merge branch 'zj-namespace-gitaly-opt-out' into 'master'Sean McGivern2018-02-081-4/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |