summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Migrate Gitlab::Git::Commit.shas_with_signaturesgitaly-764-commit-filter-shas-with-signatureKim "BKC" Carlbäcker2017-12-052-5/+31
* Merge branch 'dm-application-worker' into 'master'Sean McGivern2017-12-052-2/+52
|\
| * Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-051-2/+2
| * Add ApplicationWorker and make every worker include itDouwe Maan2017-12-051-0/+50
* | Merge branch '32878-merge-request-from-email' into 'master'Sean McGivern2017-12-053-2/+73
|\ \
| * | Create merge request from emailJan Provaznik2017-12-053-2/+73
* | | Merge branch 'gitaly-conflict-file' into 'master'Sean McGivern2017-12-052-2/+2
|\ \ \
| * | | Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-fileAlejandro Rodríguez2017-12-041-1/+1
| * | | Add missing attr_accessor to Gitlab::Git::Conflict::FileAlejandro Rodríguez2017-12-041-1/+1
| |/ /
* | | Merge branch 'ce-gitaly-worktree-refactor' into 'master'Sean McGivern2017-12-051-8/+140
|\ \ \ | |_|/ |/| |
| * | Backport Squash/Rebase refactor from EEce-gitaly-worktree-refactorAlejandro Rodríguez2017-12-041-8/+140
| |/
* | Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'Robert Speicher2017-12-043-34/+105
|\ \
| * | Migrate Gitlab::Git::Repository#cherry_pick to GitalyAhmad Sherif2017-12-043-34/+105
* | | Merge branch 'backstage/gb/improve-pipeline-chain-reduce-side-effects' into '...40818-last-push-widget-does-not-appear-after-pushing-new-commit-to-a-branch-that-was-previously-merged-to-masterKamil Trzciński2017-12-041-7/+6
|\ \ \ | |_|/ |/| |
| * | Reduce pipeline chain life span to minimize side effectsbackstage/gb/improve-pipeline-chain-reduce-side-effectsGrzegorz Bizon2017-12-041-7/+6
* | | Merge branch 'git-fsck-worker-client-prep' into 'master'Douwe Maan2017-12-041-2/+10
|\ \ \ | |/ / |/| |
| * | Move SingleRepositoryWorker#fsck into Gitlab::Git::RepositoryKim "BKC" Carlbäcker2017-12-041-2/+10
* | | Merge branch '40711-fix-forking-hashed-projects' into 'master'Douwe Maan2017-12-041-8/+15
|\ \ \ | |_|/ |/| |
| * | Fix the fork project functionality for projects with hashed storageNick Thomas2017-12-041-8/+15
| |/
* | Merge branch 'bvl-circuitbreaker-keys-set' into 'master'Douwe Maan2017-12-043-23/+17
|\ \
| * | Keep track of all storage keys in a setbvl-circuitbreaker-keys-setBob Van Landuyt2017-12-013-23/+17
* | | Don't disable the Rails mailer when seeding the test environmentrs-test-seedRobert Speicher2017-12-011-1/+2
| |/ |/|
* | Ensure `Namespace`'s is namespaced in `Gitlab::Kubernetes::Helm#initialize` a...Rémy Coutable2017-12-011-1/+1
|/
* Merge branch 'backstage/gb/build-pipeline-in-a-separate-class' into 'master'Kamil Trzciński2017-12-011-0/+58
|\
| * Merge branch 'master' into backstage/gb/build-pipeline-in-a-separate-classGrzegorz Bizon2017-11-30235-1281/+6590
| |\
| * | Set pipeline config source attribute in a build stepGrzegorz Bizon2017-10-111-0/+2
| * | Extract class responsible for building a pipelineGrzegorz Bizon2017-10-091-0/+56
* | | Merge branch 'sh-fix-root-ref-repository' into 'master'Rémy Coutable2017-12-011-1/+5
|\ \ \
| * | | Gracefully handle case when repository's root ref does not existsh-fix-root-ref-repositoryStan Hu2017-11-301-1/+5
* | | | Add link to gitaly converationZeger-Jan van de Weg2017-11-301-0/+1
| |_|/ |/| |
* | | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master'Grzegorz Bizon2017-11-301-1/+1
|\ \ \
| * | | Replce kubernetes_service and deployment_service to deployment_platformShinya Maeda2017-11-281-1/+1
* | | | fix for special charecter in file nameshaseeb2017-11-301-2/+5
* | | | We could simply count the commitsLin Jen-Shin2017-11-301-1/+1
* | | | Merge branch 'remove-mr-diff-serialised-columns' into 'master'Yorick Peterse2017-11-294-18/+2
|\ \ \ \
| * | | | Remove serialised diff and commit columnsSean McGivern2017-11-284-18/+2
* | | | | Create fork networks for forks for which the source was deleted.Bob Van Landuyt2017-11-291-7/+71
* | | | | Add timeouts for Gitaly callsAndrew Newdigate2017-11-294-23/+62
* | | | | Merge branch 'dm-search-pattern' into 'master'Sean McGivern2017-11-291-6/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use fuzzy search with minimum length of 3 characters where appropriatedm-search-patternDouwe Maan2017-11-271-0/+6
| * | | | Modify fuzzy_arel_match to search for equality when a term shorter than 3 cha...Douwe Maan2017-11-271-5/+12
| * | | | Rename to_fuzzy_arel to fuzzy_arel_matchDouwe Maan2017-11-241-1/+1
| | |/ / | |/| |
* | | | Merge branch '40530-merge-request-generates-wrong-diff-when-branch-and-tag-ha...Rémy Coutable2017-11-281-1/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Ensure MRs always use branch refs for comparisonSean McGivern2017-11-281-1/+7
* | | | Add controller#action metrics on GitalyZeger-Jan van de Weg2017-11-281-7/+42
| |/ / |/| |
* | | Drastically improve project search performance by no longer searching namespa...dm-project-search-performanceDouwe Maan2017-11-241-1/+1
|/ /
* | 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
View Lorry Controller Status