summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using...Robert Speicher2017-12-121-1/+1
|\
| * Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-121-1/+1
* | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-122-5/+17
|\ \
| * | Use memoization for commits on diffsZeger-Jan van de Weg2017-12-122-5/+17
* | | Merge branch 'repo-write-ref-client-prep' into 'master'Robert Speicher2017-12-121-3/+8
|\ \ \
| * | | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prepKim "BKC" Carlbäcker2017-12-121-3/+8
* | | | Merge branch 'jprovazn-description' into 'master'Sean McGivern2017-12-121-1/+3
|\ \ \ \
| * | | | Use message body for merge request descriptionjprovazn-descriptionJan Provaznik2017-12-111-1/+3
| | |/ / | |/| |
* | | | Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-112-35/+42
|\ \ \ \ | |_|_|/ |/| | |
| * | | Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prepAlejandro Rodríguez2017-12-062-17/+19
| * | | Add feature flag to use gitaly-ssh mirroring when cloning internal reposAlejandro Rodríguez2017-12-062-20/+25
* | | | Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'Yorick Peterse2017-12-112-51/+0
|\ \ \ \
| * | | | Remove RubySampler#sample_objects for performance as wellStan Hu2017-12-111-27/+0
| * | | | Remove allocation tracking code from InfluxDB sampler for performancesh-remove-allocation-tracking-influxdbStan Hu2017-12-101-24/+0
| | |/ / | |/| |
* | | | Keep track of storage check timingsBob Van Landuyt2017-12-111-1/+23
* | | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-112-2/+17
|\ \ \ \
| * | | | Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-081-0/+2
| * | | | Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-081-2/+15
| |/ / /
* | | | Simplify normalizing of pathsStan Hu2017-12-101-4/+3
* | | | Fix failing importer test case on MySQL due to missing trailing slash in root...sh-fix-import-rake-taskStan Hu2017-12-081-1/+4
* | | | Fix gitlab:import:repos Rake task moving repositories into the wrong locationStan Hu2017-12-081-0/+1
|/ / /
* | | Merge branch 'docs/improve-limit-conflicts-with-ee' into 'master'Robert Speicher2017-12-081-3/+3
|\ \ \ | |_|/ |/| |
| * | Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"Rémy Coutable2017-12-051-3/+3
* | | Allow git pull/push on project redirectsMayra Cabrera2017-12-084-14/+86
* | | Merge branch 'jprovazn-ignore-anchors' into 'master'Sean McGivern2017-12-081-0/+1
|\ \ \
| * | | Use prefix for TableOfContents filter hrefsJan Provaznik2017-12-081-0/+1
* | | | Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-086-62/+79
|\ \ \ \
| * | | | Add Chain::Command specsfix/gb/fix-pipeline-build-chain-tag-evaluationKamil Trzcinski2017-12-081-1/+1
| * | | | Fix a bug of before_sha being inproperly evaluated to `checkout_sha`Kamil Trzcinski2017-12-081-5/+1
| * | | | Implement and use Gitlab::Ci::Pipeline::Chain::CommandKamil Trzcinski2017-12-086-70/+83
| * | | | Fix invalid pipeline build chain tag evaluationGrzegorz Bizon2017-12-082-6/+14
* | | | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-0811-118/+396
* | | | | Migrate Git::Repository#fsck to GitalyKim Carlbäcker2017-12-082-2/+27
* | | | | Merge branch '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-071-0/+3
|\ \ \ \ \
| * | | | | Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-071-0/+3
* | | | | | Merge branch 'fix_39233' into 'master'Sean McGivern2017-12-071-1/+1
|\ \ \ \ \ \
| * | | | | | fix #39233 - 500 in merge requestMartin Nowak2017-12-071-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into '...Stan Hu2017-12-071-3/+3
|\ \ \ \ \ \
| * | | | | | Update prometheus-client-mmap gem to highly optimized versionPawel Chojnacki2017-12-071-3/+3
| |/ / / / /
* | | | | | Merge branch 'fix/push-read-only-message-ce' into 'master'Douwe Maan2017-12-072-2/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | refactor code to match EE changesJames Lopez2017-12-072-2/+10
* | | | | | Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'Douwe Maan2017-12-075-27/+54
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix the missing reference to #references_per_projectmicael.bergeron2017-12-071-1/+1
| * | | | | adding view and feature specsmicael.bergeron2017-12-071-0/+1
| * | | | | add support for the commit reference filtermicael.bergeron2017-12-075-35/+51
| * | | | | add support for commit (in mr) to reference filtermicael.bergeron2017-12-072-10/+20
* | | | | | Remove Rugged::Repository#empty?Zeger-Jan van de Weg2017-12-075-32/+19
|/ / / / /
* | | | | Merge branch 'jej/per-user-protected-branches-api-ce' into 'master'Sean McGivern2017-12-071-10/+8
|\ \ \ \ \
| * | | | | CE backport of ProtectedBranches API changesJames Edwards-Jones2017-12-071-10/+8
* | | | | | Merge branch 'ce-backport-3615' into 'master'Sean McGivern2017-12-0714-133/+164
|\ \ \ \ \ \