Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-37' into 'master' | Sean McGivern | 2019-01-01 | 1 | -1/+1 |
|\ | |||||
| * | Update lib/gitlab/ci/templates/Ruby.gitlab-ci.yml | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
* | | Skip per-commit validations which have already passed on another change/branch | Francisco Javier López | 2018-12-28 | 3 | -13/+28 |
* | | Merge branch '51970-correct-ordering-of-metrics' into 'master' | Kamil Trzciński | 2018-12-28 | 1 | -2/+8 |
|\ \ | |||||
| * | | Correct ordering of metrics | rpereira2 | 2018-12-21 | 1 | -2/+8 |
* | | | Fixing image lfs bug and also displaying text lfs | Francisco Javier López | 2018-12-27 | 3 | -18/+24 |
| |/ |/| | |||||
* | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master' | Douwe Maan | 2018-12-27 | 3 | -3/+166 |
|\ \ | |||||
| * | | Cache diff highlight in discussions | Oswaldo Ferreira | 2018-12-21 | 3 | -3/+166 |
* | | | Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-m... | Lin Jen-Shin | 2018-12-26 | 9 | -177/+243 |
|\ \ \ | |||||
| * \ \ | Merge branch '42125-extend-override-check-to-also-check-arity' into 'master' | Lin Jen-Shin | 2018-12-26 | 1 | -31/+78 |
| |\ \ \ | |||||
| | * | | | Extend override check to also check arity42125-extend-override-check-to-also-check-arity | Jacopo | 2018-12-22 | 1 | -31/+78 |
| * | | | | Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rb | Jacob Wolen | 2018-12-24 | 1 | -111/+0 |
| |/ / / | |||||
| * | | | Merge branch 'support-gitaly-tls' into 'master' | Lin Jen-Shin | 2018-12-21 | 1 | -6/+36 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Log certificate loading errors into sentry | Ahmad Hassan | 2018-12-20 | 1 | -4/+8 |
| | * | | Followups on review | Ahmad Hassan | 2018-12-19 | 1 | -17/+13 |
| | * | | Deduplicate certificates | Ahmad Hassan | 2018-12-17 | 1 | -3/+13 |
| | * | | Merge remote-tracking branch 'origin/master' into support-gitaly-tls | Ahmad Hassan | 2018-12-17 | 28 | -179/+138 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/master' into support-gitaly-tls | Ahmad Hassan | 2018-12-11 | 450 | -1733/+3995 |
| | |\ \ \ | |||||
| | * | | | | Rename load_certs and include default cert file | Ahmad Hassan | 2018-12-11 | 1 | -3/+8 |
| | * | | | | Manually load the certificates | Ahmad Hassan | 2018-11-27 | 1 | -1/+7 |
| | * | | | | Merge remote-tracking branch 'origin/master' into support-gitaly-tls | Ahmad Hassan | 2018-11-15 | 300 | -272/+1624 |
| | |\ \ \ \ | |||||
| | * | | | | | Add more specs | Ahmad Hassan | 2018-10-31 | 1 | -5/+1 |
| | * | | | | | Support tls communication in gitaly | Ahmad Hassan | 2018-10-30 | 1 | -4/+17 |
| * | | | | | | Merge branch 'security-import-symlink' into 'master' | John Jarvis | 2018-12-21 | 1 | -3/+5 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Fix persistent symlink in project import | James Lopez | 2018-12-17 | 1 | -3/+5 |
| * | | | | | | Merge branch 'ce-8333-add-related-epics-support' into 'master' | Dmitriy Zaporozhets | 2018-12-20 | 1 | -24/+28 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Rename GroupHierarchy into ObjectHierarchy | Jarka Košanová | 2018-12-19 | 1 | -24/+28 |
| * | | | | | | | Merge branch '54953-fix-commit_email_hostname-accessor-in-fake_application_se... | Stan Hu | 2018-12-19 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add FakeApplicationSettings#commit_email_hostname | Rémy Coutable | 2018-12-19 | 1 | -0/+4 |
| * | | | | | | | | Port Gitlab::JsonCache to CE | Douglas Barbosa Alexandre | 2018-12-19 | 1 | -0/+87 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'zj-pool-destruction' into 'master' | Kamil Trzciński | 2018-12-19 | 2 | -2/+5 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Leave object pools when destroying projects | Zeger-Jan van de Weg | 2018-12-19 | 2 | -2/+5 |
| | |/ / / / / | |||||
* | | | | | | | Method `create_from_defaults` will never give nil | Lin Jen-Shin | 2018-12-19 | 1 | -2/+1 |
* | | | | | | | Move schema aware defaults to build_from_defaults | Lin Jen-Shin | 2018-12-19 | 1 | -8/+1 |
* | | | | | | | Return fake if and only if there's no database | Lin Jen-Shin | 2018-12-19 | 1 | -21/+10 |
* | | | | | | | Return an ApplicationSetting in CurrentSettings | Rémy Coutable | 2018-12-19 | 1 | -1/+9 |
|/ / / / / / | |||||
* | | | | | | Backfill project_repositories for legacy storage projects | Douglas Barbosa Alexandre | 2018-12-18 | 3 | -123/+238 |
* | | | | | | Merge branch 'zj-upgrade-gitaly-version' into 'master' | Douwe Maan | 2018-12-18 | 1 | -7/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Upgrade Gitaly to 1.9.0 | Zeger-Jan van de Weg | 2018-12-17 | 1 | -7/+0 |
* | | | | | | | Add "none" syntax highlighting "color" scheme | khm | 2018-12-18 | 1 | -1/+2 |
* | | | | | | | Change SafeRequestStore#write to accept an options hash | Douglas Barbosa Alexandre | 2018-12-17 | 1 | -0/+8 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'revert-1cccfca1' into 'master' | Grzegorz Bizon | 2018-12-17 | 1 | -16/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'" | Thong Kuah | 2018-12-17 | 1 | -16/+10 |
| |/ / / / / | |||||
* | | | | | | Merge branch '55230-remove-project-cleanup-feature-flag' into 'master' | Douwe Maan | 2018-12-17 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix repository cleanup with object storage on | Nick Thomas | 2018-12-15 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00... | Yorick Peterse | 2018-12-17 | 2 | -21/+104 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Revert "Revert "LfsToken uses JSONWebToken::HMACToken by default"" | Ash McKenzie | 2018-12-17 | 2 | -21/+104 |
| |/ / / / | |||||
* | | | | | Remove rails4 specific code | Jasper Maes | 2018-12-16 | 9 | -99/+17 |
|/ / / / | |||||
* | | | | Merge branch '54786-mr-empty-file-display' into 'master' | Nick Thomas | 2018-12-15 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Display empty files properly on MR diffs | Sean Nichols | 2018-12-11 | 1 | -0/+4 |