summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-273-3/+166
|\
| * Cache diff highlight in discussionsOswaldo Ferreira2018-12-213-3/+166
* | Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-m...Lin Jen-Shin2018-12-2613-184/+258
|\ \
| * \ Merge branch '42125-extend-override-check-to-also-check-arity' into 'master'Lin Jen-Shin2018-12-261-31/+78
| |\ \
| | * | Extend override check to also check arity42125-extend-override-check-to-also-check-arityJacopo2018-12-221-31/+78
| * | | Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rbJacob Wolen2018-12-241-111/+0
| |/ /
| * | Bump Gitaly version to v1.12.0Stan Hu2018-12-211-3/+5
| * | Merge branch 'support-gitaly-tls' into 'master'Lin Jen-Shin2018-12-211-6/+36
| |\ \ | | |/ | |/|
| | * Log certificate loading errors into sentryAhmad Hassan2018-12-201-4/+8
| | * Followups on reviewAhmad Hassan2018-12-191-17/+13
| | * Deduplicate certificatesAhmad Hassan2018-12-171-3/+13
| | * Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-1744-216/+255
| | |\
| | * \ Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-11543-2161/+4863
| | |\ \
| | * | | Rename load_certs and include default cert fileAhmad Hassan2018-12-111-3/+8
| | * | | Manually load the certificatesAhmad Hassan2018-11-271-1/+7
| | * | | Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-11-15321-502/+1925
| | |\ \ \
| | * | | | Add more specsAhmad Hassan2018-10-311-5/+1
| | * | | | Support tls communication in gitalyAhmad Hassan2018-10-301-4/+17
| * | | | | Merge branch 'security-import-symlink' into 'master'John Jarvis2018-12-211-3/+5
| |\ \ \ \ \
| | * | | | | Fix persistent symlink in project importJames Lopez2018-12-171-3/+5
| * | | | | | Merge branch 'ce-8333-add-related-epics-support' into 'master'Dmitriy Zaporozhets2018-12-203-26/+30
| |\ \ \ \ \ \
| | * | | | | | Rename GroupHierarchy into ObjectHierarchyJarka Košanová2018-12-193-26/+30
| * | | | | | | Prevent admins from attempting hashed storage migration on read only DBMichael Kozono2018-12-191-2/+8
| * | | | | | | Merge branch '54953-fix-commit_email_hostname-accessor-in-fake_application_se...Stan Hu2018-12-191-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Add FakeApplicationSettings#commit_email_hostnameRémy Coutable2018-12-191-0/+4
| * | | | | | | | Port Gitlab::JsonCache to CEDouglas Barbosa Alexandre2018-12-191-0/+87
| |/ / / / / / /
| * | | | | | | Merge branch 'zj-pool-destruction' into 'master'Kamil Trzciński2018-12-192-2/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Leave object pools when destroying projectsZeger-Jan van de Weg2018-12-192-2/+5
| | |/ / / / /
* | | | | | | Method `create_from_defaults` will never give nilLin Jen-Shin2018-12-191-2/+1
* | | | | | | Move schema aware defaults to build_from_defaultsLin Jen-Shin2018-12-191-8/+1
* | | | | | | Return fake if and only if there's no databaseLin Jen-Shin2018-12-191-21/+10
* | | | | | | Return an ApplicationSetting in CurrentSettingsRémy Coutable2018-12-191-1/+9
|/ / / / / /
* | | | | | Backfill project_repositories for legacy storage projectsDouglas Barbosa Alexandre2018-12-183-123/+238
* | | | | | Merge branch 'osw-revert-suggestions-ff' into 'master'Douwe Maan2018-12-181-1/+0
|\ \ \ \ \ \
| * | | | | | Remove feature flag for suggest changes featureOswaldo Ferreira2018-12-181-1/+0
* | | | | | | Merge branch 'zj-upgrade-gitaly-version' into 'master'Douwe Maan2018-12-181-7/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Upgrade Gitaly to 1.9.0Zeger-Jan van de Weg2018-12-171-7/+0
* | | | | | | Merge branch 'bvl-hide-confidential-events-take2' into 'master'Sean McGivern2018-12-181-30/+12
|\ \ \ \ \ \ \
| * | | | | | | Hide confidential events in rubyBob Van Landuyt2018-12-171-30/+12
* | | | | | | | Add "none" syntax highlighting "color" schemekhm2018-12-181-1/+2
* | | | | | | | Change SafeRequestStore#write to accept an options hashDouglas Barbosa Alexandre2018-12-171-0/+8
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'revert-1cccfca1' into 'master'Grzegorz Bizon2018-12-171-16/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"Thong Kuah2018-12-171-16/+10
| |/ / / / /
* | | | | | Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'Douwe Maan2018-12-171-0/+1
|\ \ \ \ \ \
| * | | | | | Fix repository cleanup with object storage onNick Thomas2018-12-151-0/+1
| |/ / / / /
* | | | | | Merge branch '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00...Yorick Peterse2018-12-172-21/+104
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Revert "Revert "LfsToken uses JSONWebToken::HMACToken by default""Ash McKenzie2018-12-172-21/+104
| |/ / / /
* | | | | Remove rails4 specific codeJasper Maes2018-12-1612-109/+23
|/ / / /
* | | | Merge branch '54786-mr-empty-file-display' into 'master'Nick Thomas2018-12-151-0/+4
|\ \ \ \
| * | | | Display empty files properly on MR diffsSean Nichols2018-12-111-0/+4