summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Guard against nil Sidekiq metrics serversh-guard-against-nil-sidekiq-metrics-serverStan Hu2018-02-201-1/+1
* Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'Douwe Maan2018-02-201-2/+3
|\
| * Only use features for eventsPawel Chojnacki2018-02-201-3/+3
| * Put all event metrics exposed to prometheus behind a feature flagPawel Chojnacki2018-02-201-0/+1
* | [GH Import] Create an empty wiki if wiki import failedValery Sizov2018-02-191-0/+1
* | Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'Sean McGivern2018-02-192-3/+8
|\ \
| * | Avoid slow File Lock checks when not usedJames Edwards-Jones2018-02-192-3/+8
* | | 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 'asciidoc_inter_document_cross_references' into 'master'Sean McGivern2018-02-161-1/+2
|\ \ \ \
| * | | | Set Asciidoctor outfilesuffix to default .adocTuro Soisenniemi2018-02-141-1/+2
| |/ / /
* | | | 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
| |_|/ |/| |
* | | 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 '42934-search-api-fix' into 'master'Sean McGivern2018-02-143-5/+8
|\ \ \
| * | | API - Include project in commits&blobs search resultsJarka Kadlecová2018-02-143-5/+8
* | | | 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-1242-250/+656
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-05175-1353/+4471
| |\ \ \ \ \
| * | | | | | 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
| |_|_|/ / / |/| | | | |