summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitaly-764-commit-filter-shas-with-signature' into 'master'Robert Speicher2017-12-052-5/+31
|\
| * Migrate Gitlab::Git::Commit.shas_with_signaturesgitaly-764-commit-filter-shas-with-signatureKim "BKC" Carlbäcker2017-12-052-5/+31
* | add Gitlab::Database.replication_slots_supported?Brett Walker2017-12-051-0/+4
* | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-054-11/+9
|\ \ | |/ |/|
| * Store expire_at in ci_job_artifactsKamil Trzcinski2017-12-031-4/+5
| * Remove Ci::Build#artifacts_file?Zeger-Jan van de Weg2017-12-031-1/+1
| * Rename artifacts_* to legacy_artifacts_*Kamil Trzcinski2017-12-032-2/+2
| * Rename Artifact to JobArtifact, split metadata outZeger-Jan van de Weg2017-12-032-9/+6
| * Create Ci::ArtifactsZeger-Jan van de Weg2017-12-031-1/+1
* | Merge branch 'dm-application-worker' into 'master'Sean McGivern2017-12-053-4/+76
|\ \
| * | Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-052-4/+26
| * | 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 'user-agent-gke-api' into 'master'Kamil Trzciński2017-12-041-3/+9
|\ \ \ \
| * | | | Refactor GCP Client#user_agent_header to use #tapMatija Čupić2017-12-041-3/+3
| * | | | Test usage of custom user agent in GCP ClientMatija Čupić2017-12-041-3/+3
| * | | | Use RequestOptions in GCP Client user_agent_headerMatija Čupić2017-12-041-1/+3
| * | | | Generate user agent header for GCP ClientMatija Čupić2017-12-041-0/+4
| | |_|/ | |/| |
* | | | 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 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-044-14/+98
|\ \ \ \ | |_|/ / |/| | |
| * | | Not forcing to redefine preload_relationFrancisco Lopez2017-12-011-1/+1
| * | | Undoing the change to ForkNetworkMemberFrancisco Lopez2017-12-011-11/+7
| * | | Fixed BasicProjectDetail parentFrancisco Lopez2017-12-011-1/+1
| * | | Removed binding.pryFrancisco Lopez2017-12-011-1/+0
| * | | Removing blank lineFrancisco Lopez2017-12-011-1/+0
| * | | Changes after rebaseFrancisco Lopez2017-12-011-3/+14
| * | | Undoing debugging changeFrancisco Lopez2017-12-011-2/+2
| * | | Comments from code review applied. Also switched forked_from_project and Fork...Francisco Lopez2017-12-013-43/+52
| * | | Refactored /projects and /user/:user_id/projects endpointsFrancisco Lopez2017-12-014-25/+77
| * | | Code review comments appliedFrancisco Lopez2017-12-011-2/+2
| * | | Small renamingFrancisco Lopez2017-12-011-4/+4
| * | | More preloading improvement and added batch count servicesFrancisco Lopez2017-12-011-5/+20
| * | | Preload project route to avoid N+1 queryStan Hu2017-12-011-1/+1
| * | | Only serialize namespace essentials in group's projects API responseStan Hu2017-12-011-2/+4
| * | | Omit the `all` call after Project#project_group_links to avoid unnecessary loadsStan Hu2017-12-011-1/+1
| * | | Optimize API /groups/:id/projects by preloading associationsStan Hu2017-12-011-0/+1
| |/ /
* | | 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
|\ \