summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-15105-635/+2322
|\
| * Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-151-1/+5
| |\
| | * moved lfs_blob_ids method into ExtractsPath modulelfs-badgePhil Hughes2017-12-141-0/+5
| | * moved lfs blob fetch from extractspath filePhil Hughes2017-12-141-4/+0
| | * fixed project homepage not having correct variablePhil Hughes2017-12-111-0/+3
| * | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-143-2/+19
| |\ \
| | * | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-133-2/+19
| * | | Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-141-8/+1
| |\ \ \
| | * | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-141-8/+1
| * | | | sorting for tags apihaseeb2017-12-141-1/+6
| * | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-143-13/+61
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use a dedicated queue for each workerDouwe Maan2017-12-123-13/+61
| * | | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-131-1/+3
| |\ \ \ \
| | * | | | Adds ordering to projects contributors in APIJacopo2017-12-131-1/+3
| * | | | | Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into '...Robert Speicher2017-12-131-1/+16
| |\ \ \ \ \
| | * | | | | Use class variable and add rubocop exceptionpawel/cache_feature_check_for_5_minutes_for_method_callPawel Chojnacki2017-12-121-0/+2
| | * | | | | Expire feature flag cache after 1minutePawel Chojnacki2017-12-121-1/+1
| | * | | | | use class variables instead of CONSTANTsPawel Chojnacki2017-12-121-6/+10
| | * | | | | move call_measurement_enabled? method to the bottom of the filePawel Chojnacki2017-12-121-11/+11
| | * | | | | Use AtomicFixNum to implement CAS isolated cache update.Pawel Chojnacki2017-12-121-10/+7
| | * | | | | Implemente measurement enabled cache using AtomicReferencePawel Chojnacki2017-12-121-18/+13
| | * | | | | Set cache expire only once the cache is filled,Pawel Chojnacki2017-12-121-1/+4
| | * | | | | Implement simple in memory cache that expires after 5 minutesPawel Chojnacki2017-12-121-7/+19
| | * | | | | Cache feature check for 5 minutes for MethodCall instrumentation togglePawel Chojnacki2017-12-121-1/+3
| * | | | | | Merge branch 'add-tcp-check-rake-task' into 'master'Rémy Coutable2017-12-132-0/+65
| |\ \ \ \ \ \
| | * | | | | | Add a gitlab:tcp_check rake taskNick Thomas2017-12-132-0/+65
| * | | | | | | 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
View Lorry Controller Status