summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-fix-registry-with-sudo-token' into 'master'Sean McGivern2017-11-241-15/+10
|\
| * Fix pulling and pushing using a personal access token with the sudo scopedm-fix-registry-with-sudo-tokenDouwe Maan2017-11-231-15/+10
* | Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'Douwe Maan2017-11-242-24/+15
|\ \
| * | Use feature flag instead of application settigns to control if method calls s...pawel/update_prometheus_gem_to_well_tested_versionPawel Chojnacki2017-11-231-3/+3
| * | Use only real duration to measure method call performance via PrometheusPawel Chojnacki2017-11-231-21/+6
| * | check method timing threshold when observing method performancePawel Chojnacki2017-11-231-2/+2
| * | Reenable prometheus metricsPawel Chojnacki2017-11-231-3/+3
| * | Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-231-2/+8
* | | Fix hashed storage for attachments bugsJames Lopez2017-11-231-2/+1
* | | Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'Sean McGivern2017-11-235-41/+47
|\ \ \
| * | | Rename fetch_refs to refmapDouwe Maan2017-11-234-22/+23
| * | | Clean up repository fetch and mirror methodsDouwe Maan2017-11-235-38/+43
| | |/ | |/|
* | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-231-3/+13
|\ \ \
| * | | Move identical merged branch check to merged_branch_namesLin Jen-Shin2017-11-231-3/+13
| | |/ | |/|
* | | Merge branch 'reviewing-db-changes' into 'master'Rémy Coutable2017-11-2313-0/+104
|\ \ \
| * | | Added Rubocop config for background migrationsreviewing-db-changesYorick Peterse2017-11-2313-0/+104
* | | | Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-231-0/+2
|\ \ \ \
| * | | | Use latest_merge_request_diff associationSean McGivern2017-11-231-0/+2
* | | | | Allow password authentication to be disabled entirelyMarkus Koller2017-11-232-5/+11
| |/ / / |/| | |
* | | | Merge branch '40463-ee-compatibility-check-job-fails-unexpectedly' into 'master'Sean McGivern2017-11-231-6/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | In EeCompatCheck, always reset to canonical-ee/master when applying a patch40463-ee-compatibility-check-job-fails-unexpectedlyRémy Coutable2017-11-231-4/+4
| * | | Generate the patch against `origin/#{branch}` instead of just `#{branch}`Rémy Coutable2017-11-221-1/+1
| * | | Try to always find the merge base using `origin/#{branch}` instead of just `#...Rémy Coutable2017-11-221-1/+1
| | |/ | |/|
* | | Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer (GitLab)2017-11-232-2/+11
|/ /
* | Merge branch '32620-speed-up-unicorn-specs' into 'master'Rémy Coutable2017-11-221-1/+0
|\ \
| * | Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-221-1/+0
* | | Merge branch 'pawel/disable_prometheus_metrics' into 'master'Stan Hu2017-11-221-3/+3
|\ \ \ | |/ / |/| |
| * | Force disable Prometheus metricsPawel Chojnacki2017-11-221-3/+3
* | | Try to find the merge-base against the canonical masterRémy Coutable2017-11-221-31/+38
| |/ |/|
* | Add FetchSourceBranch Gitaly callJacob Vosmaer (GitLab)2017-11-223-8/+43
* | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-211-2/+1
|/
* Merge branch 'sh-optimize-read-only-check' into 'master'Douwe Maan2017-11-211-1/+7
|\
| * Revert "check for `read_only?` first before seeing if request is disallowed"digitalMoksha2017-11-211-1/+1
| * check for `read_only?` first before seeing if request is disallowedsh-optimize-read-only-checkdigitalMoksha2017-11-211-1/+1
| * use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_he...digitalMoksha2017-11-211-1/+1
| * Optimize read-only middleware so that it does not consume as much CPUStan Hu2017-11-201-0/+6
* | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-214-14/+16
* | Memoize GitlabShellAdapter for performance and ease of testingStan Hu2017-11-201-1/+1
|/
* Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-201-2/+2
|\
| * Fix bitbucket wiki import with hashed storage enabledNick Thomas2017-11-201-2/+2
* | Clarify wording of protected branch settings for the default branchSean McGivern2017-11-201-3/+3
* | Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-202-1/+16
|\ \ | |/ |/|
| * Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-172-1/+16
* | Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-202-3/+17
|\ \
| * | Don't move project repository/attachments when using hashed storageBob Van Landuyt2017-11-202-3/+17
* | | Clean up schema of the "merge_requests" tableYorick Peterse2017-11-201-1/+1
* | | Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan2017-11-201-0/+4
|\ \ \
| * | | Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-171-0/+4
* | | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-2032-0/+37
|\ \ \ \
| * | | | Adds Rubocop rule for line break after guard clauseJacopo2017-11-1632-0/+37