Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Add TrackUntrackedUploads post-deploy migration | Michael Kozono | 2017-12-01 | 1 | -0/+35 | |
| | | | | | | | | | | | | To create the table, and schedule the background migration that begins the work. | |||||
* | | | Merge branch 'feature/migrate-revert-to-gitaly' into 'master' | Robert Speicher | 2017-12-05 | 2 | -19/+66 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#revert to Gitaly Closes gitaly#780 See merge request gitlab-org/gitlab-ce!15717 | |||||
| * | | | Migrate Gitlab::Git::Repository#revert to Gitalyfeature/migrate-revert-to-gitaly | Ahmad Sherif | 2017-12-05 | 2 | -19/+66 | |
| | | | | | | | | | | | | | | | | Closes gitaly#780 | |||||
* | | | | Merge branch 'gitaly-764-commit-filter-shas-with-signature' into 'master' | Robert Speicher | 2017-12-05 | 2 | -5/+31 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Commit.shas_with_signature Closes gitaly#764 See merge request gitlab-org/gitlab-ce!15621 | |||||
| * | | | | Migrate Gitlab::Git::Commit.shas_with_signaturesgitaly-764-commit-filter-shas-with-signature | Kim "BKC" Carlbäcker | 2017-12-05 | 2 | -5/+31 | |
| | | | | | | | | | | | | | | | | | | | | - Added tests for Git::Commit.shas_with_signatures | |||||
* | | | | | add Gitlab::Database.replication_slots_supported? | Brett Walker | 2017-12-05 | 1 | -0/+4 | |
| | | | | | ||||||
* | | | | | Merge branch 'zj-multiple-artifacts' into 'master' | Grzegorz Bizon | 2017-12-05 | 4 | -11/+9 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Multiple artifacts See merge request gitlab-org/gitlab-ce!14367 | |||||
| * | | | | Store expire_at in ci_job_artifacts | Kamil Trzcinski | 2017-12-03 | 1 | -4/+5 | |
| | | | | | ||||||
| * | | | | Remove Ci::Build#artifacts_file? | Zeger-Jan van de Weg | 2017-12-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Rename artifacts_* to legacy_artifacts_* | Kamil Trzcinski | 2017-12-03 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Rename Artifact to JobArtifact, split metadata out | Zeger-Jan van de Weg | 2017-12-03 | 2 | -9/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two things at ones, as there was no clean way to seperate the commit and give me feedback from the tests. But the model Artifact is now JobArtifact, and the table does not have a type anymore, but the metadata is now its own model: Ci::JobArtifactMetadata. | |||||
| * | | | | Create Ci::Artifacts | Zeger-Jan van de Weg | 2017-12-03 | 1 | -1/+1 | |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow jobs/builds to have multiple artifacts, and to start seperating concerns from Ci::Build a new model is created: Ci::Artifact. Changes include the updating of the ArtifactUploader to adapt to a slightly different interface. The uploader expects to be initialized with a `Ci::Build`. Futher a migration with the minimal fields, the needed foreign keys and an index. Last, the way this works is by prepending a module to Ci::Build so we can basically override behaviour but if needed use `super` to get the original behaviour. | |||||
* | | | | Merge branch 'dm-application-worker' into 'master' | Sean McGivern | 2017-12-05 | 3 | -4/+76 | |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Add ApplicationWorker and make every worker include it See merge request gitlab-org/gitlab-ce!15632 | |||||
| * | | | Consistently schedule Sidekiq jobsdm-application-worker | Douwe Maan | 2017-12-05 | 2 | -4/+26 | |
| | | | | ||||||
| * | | | Add ApplicationWorker and make every worker include it | Douwe Maan | 2017-12-05 | 1 | -0/+50 | |
| | |/ | |/| | ||||||
* | | | Merge branch '32878-merge-request-from-email' into 'master' | Sean McGivern | 2017-12-05 | 3 | -2/+73 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Create merge request from email Closes #32878 See merge request gitlab-org/gitlab-ce!13817 | |||||
| * | | | Create merge request from email | Jan Provaznik | 2017-12-05 | 3 | -2/+73 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new merge request can be created by sending an email to the specific email address (similar to creating issues by email) * for the first iteration, source branch must be specified in the mail subject, other merge request parameters can not be set yet * user should enable "Receive notifications about your own activity" in user settings to receive a notification about created merge request Part of #32878 | |||||
* | | | | Merge branch 'gitaly-conflict-file' into 'master' | Sean McGivern | 2017-12-05 | 2 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Small Gitlab::Git fixes for Gitaly See merge request gitlab-org/gitlab-ce!15675 | |||||
| * | | | | Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-file | Alejandro Rodríguez | 2017-12-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | The former is in Ruby's core lib, so is more flexible. | |||||
| * | | | | Add missing attr_accessor to Gitlab::Git::Conflict::File | Alejandro Rodríguez | 2017-12-04 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge branch 'ce-gitaly-worktree-refactor' into 'master' | Sean McGivern | 2017-12-05 | 1 | -8/+140 | |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | [CE] Move git operations for squash and rebase into Gitlab::Git See merge request gitlab-org/gitlab-ce!15673 | |||||
| * | | | Backport Squash/Rebase refactor from EEce-gitaly-worktree-refactor | Alejandro Rodríguez | 2017-12-04 | 1 | -8/+140 | |
| |/ / | ||||||
* | | | Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master' | Robert Speicher | 2017-12-04 | 3 | -34/+105 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#cherry_pick to Gitaly Closes gitaly#737 See merge request gitlab-org/gitlab-ce!15517 | |||||
| * | | | Migrate Gitlab::Git::Repository#cherry_pick to Gitaly | Ahmad Sherif | 2017-12-04 | 3 | -34/+105 | |
| | | | | | | | | | | | | | | | | Closes gitaly#737 | |||||
* | | | | Merge branch 'user-agent-gke-api' into 'master' | Kamil Trzciński | 2017-12-04 | 1 | -3/+9 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use custom User-Agent header in GCP Client requests Closes #40583 See merge request gitlab-org/gitlab-ce!15705 | |||||
| * | | | | Refactor GCP Client#user_agent_header to use #tap | Matija Čupić | 2017-12-04 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Test usage of custom user agent in GCP Client | Matija Čupić | 2017-12-04 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Use RequestOptions in GCP Client user_agent_header | Matija Čupić | 2017-12-04 | 1 | -1/+3 | |
| | | | | | ||||||
| * | | | | Generate user agent header for GCP Client | Matija Čupić | 2017-12-04 | 1 | -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-master | Kamil Trzciński | 2017-12-04 | 1 | -7/+6 | |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | 'master' Reduce pipeline chain life span to minimize side effects See merge request gitlab-org/gitlab-ce!15716 | |||||
| * | | | Reduce pipeline chain life span to minimize side effectsbackstage/gb/improve-pipeline-chain-reduce-side-effects | Grzegorz Bizon | 2017-12-04 | 1 | -7/+6 | |
| | | | | ||||||
* | | | | Merge branch 'git-fsck-worker-client-prep' into 'master' | Douwe Maan | 2017-12-04 | 1 | -2/+10 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move SingleRepositoryWorker#fsck into Gitlab::Git::Repository Closes gitaly#802 See merge request gitlab-org/gitlab-ce!15710 | |||||
| * | | | | Move SingleRepositoryWorker#fsck into Gitlab::Git::Repository | Kim "BKC" Carlbäcker | 2017-12-04 | 1 | -2/+10 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'sh-optimize-groups-api' into 'master' | Douwe Maan | 2017-12-04 | 4 | -14/+98 | |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475 | |||||
| * | | | Not forcing to redefine preload_relation | Francisco Lopez | 2017-12-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Undoing the change to ForkNetworkMember | Francisco Lopez | 2017-12-01 | 1 | -11/+7 | |
| | | | | ||||||
| * | | | Fixed BasicProjectDetail parent | Francisco Lopez | 2017-12-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Removed binding.pry | Francisco Lopez | 2017-12-01 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Removing blank line | Francisco Lopez | 2017-12-01 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Changes after rebase | Francisco Lopez | 2017-12-01 | 1 | -3/+14 | |
| | | | | ||||||
| * | | | Undoing debugging change | Francisco Lopez | 2017-12-01 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Comments from code review applied. Also switched forked_from_project and ↵ | Francisco Lopez | 2017-12-01 | 3 | -43/+52 | |
| | | | | | | | | | | | | | | | | ForkedProjectLinks to ForkNetworkMember | |||||
| * | | | Refactored /projects and /user/:user_id/projects endpoints | Francisco Lopez | 2017-12-01 | 4 | -25/+77 | |
| | | | | ||||||
| * | | | Code review comments applied | Francisco Lopez | 2017-12-01 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Small renaming | Francisco Lopez | 2017-12-01 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | More preloading improvement and added batch count services | Francisco Lopez | 2017-12-01 | 1 | -5/+20 | |
| | | | | ||||||
| * | | | Preload project route to avoid N+1 query | Stan Hu | 2017-12-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Only serialize namespace essentials in group's projects API response | Stan Hu | 2017-12-01 | 1 | -2/+4 | |
| | | | | ||||||
| * | | | Omit the `all` call after Project#project_group_links to avoid unnecessary loads | Stan Hu | 2017-12-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Optimize API /groups/:id/projects by preloading associations | Stan Hu | 2017-12-01 | 1 | -0/+1 | |
| |/ / | | | | | | | | | | Closes #40308 |