summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Use proper scope when accessting application settingsGrzegorz Bizon2018-12-031-1/+1
* Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r...Grzegorz Bizon2018-11-298-21/+120
|\
| * Merge branch '33705-merge-request-rebase-api' into 'master'Sean McGivern2018-11-292-1/+38
| |\
| | * Allow the status of a rebase to be determinedNick Thomas2018-11-282-1/+12
| | * Add a rebase API endpoint for merge requestsNick Thomas2018-11-271-0/+26
| * | Merge branch 'security-11-5-fix-webhook-ssrf-ipv6' into 'security-11-5'Steve Azzopardi2018-11-281-4/+8
| * | Merge branch 'security-fj-crlf-injection' into 'master'Cindy Pallares2018-11-281-5/+14
| * | Merge branch 'security-fix-pat-web-access' into 'master'Cindy Pallares2018-11-282-6/+47
| * | Merge branch 'security-xss-in-markdown-following-unrecognized-html-element' i...Cindy Pallares2018-11-282-1/+7
| * | Merge branch 'security-stored-xss-for-environments' into 'master'Cindy Pallares2018-11-281-2/+4
| * | Merge branch 'zj-object-pool-path' into 'master'Nick Thomas2018-11-281-2/+2
| |\ \
| | * | Rename the Repository table to PoolRepositoryZeger-Jan van de Weg2018-11-271-2/+2
* | | | Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-2850-335/+525
|\ \ \ \ | |/ / /
| * | | Merge branch '50341-cleanup-useless-project-import-attributes' into 'master'Douwe Maan2018-11-288-13/+17
| |\ \ \
| | * | | Removes all the irrelevant import related code and columnsTiago Botelho2018-11-278-13/+17
| | |/ /
| * | | Merge branch 'rs-to_h-deprecation' into 'master'Douwe Maan2018-11-281-5/+0
| |\ \ \
| | * | | Remove `options` assignment from ExtractsPathRobert Speicher2018-11-271-5/+0
| * | | | Ensure all Routables have a parentToon Claes2018-11-271-10/+17
| * | | | Disable the `type` STI column for the migrationToon Claes2018-11-271-0/+1
| * | | | Always run CleanUp before writing the git configToon Claes2018-11-271-1/+2
| * | | | Run repository cleanup on failureToon Claes2018-11-271-1/+8
| * | | | Retry the failing projectsToon Claes2018-11-271-9/+52
| * | | | Move code to a BackgroundMigrationToon Claes2018-11-271-0/+150
| * | | | Merge branch 'lock-trace-writes' into 'master'Stan Hu2018-11-274-38/+42
| |\ \ \ \
| | * | | | Lock writes to trace streamKamil Trzciński2018-11-274-38/+42
| * | | | | Merge branch '53763-fix-encrypt-columns-data-loss' into 'master'Stan Hu2018-11-271-0/+14
| |\ \ \ \ \
| | * | | | | Correctly handle data-loss scenarios when encrypting columnsNick Thomas2018-11-271-0/+14
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'issuable-suggestions' into 'master'Filipa Lacerda2018-11-271-0/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Suggests issues when typing titlePhil Hughes2018-11-271-0/+29
| * | | | | Merge branch 'json-logging-for-k8s' into 'master'Stan Hu2018-11-271-0/+11
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Use JSON logging for helm install servicesDylan Griffith2018-11-271-0/+11
| * | | | | Merge branch '51792-dont-delete-failed-install-pods' into 'master'Dmitriy Zaporozhets2018-11-271-0/+6
| |\ \ \ \ \
| | * | | | | Don't remove failed install podsDylan Griffith2018-11-271-0/+6
| | | |/ / / | | |/| | |
| * | | | | Merge branch '53778-remove-site-statistics' into 'master'Sean McGivern2018-11-271-15/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove Site Statistic53778-remove-site-statisticsGabriel Mazetto2018-11-261-15/+0
| * | | | | Merge branch 'bvl-use-shell-writeref' into 'master'Douwe Maan2018-11-272-10/+5
| |\ \ \ \ \
| | * | | | | Don't specify `shell` for Gitaly write-refBob Van Landuyt2018-11-262-5/+4
| | * | | | | Update gitaly and gitaly-protoBob Van Landuyt2018-11-261-5/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'sh-handle-string-null-bytes' into 'master'Douwe Maan2018-11-271-1/+5
| |\ \ \ \ \
| | * | | | | Gracefully handle references with null bytesStan Hu2018-11-261-1/+5
| | | |/ / / | | |/| | |
| * | | | | Merge branch '8584-move-ee-specific-code-from-gitbab-database-ee-gitlab-datab...Stan Hu2018-11-261-5/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | CE port of 'Move EE specific code from Gitbab::Database into ee'Douglas Barbosa Alexandre2018-11-261-5/+6
| * | | | | Merge branch 'fix-deadlock-chunked-io' into 'master'24280-last-commit-information-in-admin-project-view-is-not-accurateStan Hu2018-11-262-17/+20
| |\ \ \ \ \
| | * | | | | Fix deadlock on ChunkedIOfix-deadlock-chunked-ioKamil Trzciński2018-11-262-17/+20
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '54327-profiler-doesn-t-work-with-auth-now' into 'master'Stan Hu2018-11-261-12/+27
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Allow profiler to authenticate by stubbing users directly54327-profiler-doesn-t-work-with-auth-nowSean McGivern2018-11-261-12/+27
| * | | | | Merge branch 'ce-rd-extract-ee-specific-sidekiq-queue-config' into 'master'Robert Speicher2018-11-261-1/+8
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Backport of gitlab-ee!8470ce-rd-extract-ee-specific-sidekiq-queue-configRubén Dávila2018-11-191-1/+8
| * | | | | Merge branch 'dm-batch-loader-key' into 'master'Stan Hu2018-11-264-35/+17
| |\ \ \ \ \
| | * | | | | Treat Repository instances with the same disk path as the same hash keydm-batch-loader-keyDouwe Maan2018-11-262-2/+8