root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
67,435 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

482 Commits

Author SHA1 Message Date
Jacob Vosmaer (GitLab) f4de7309ab Remove unused methods from Gitlab::Git 2018-01-17 09:54:27 +00:00
Stan Hu 3228ac06a0 Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master' 
Prevent RevList failing on non utf8 paths

Closes #41627

See merge request gitlab-org/gitlab-ce!16440
 2018-01-16 20:47:17 +00:00
James Edwards-Jones c4dd7b8296 Prevent RevList failing on non utf8 paths 2018-01-16 13:27:59 +00:00
Sean McGivern b94b8aae29 Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master' 
Migrate Commit#uri_type to Gitaly

Closes gitaly#915

See merge request gitlab-org/gitlab-ce!16453
 2018-01-16 11:03:51 +00:00
Ahmad Sherif f32f04a50f Migrate Commit#uri_type to Gitaly 
Closes gitaly#915
 2018-01-15 14:16:22 +01:00
Ahmad Sherif 49d6ed9ded Migrate importing repository to Gitaly 
Closes gitaly#907
 2018-01-15 14:15:54 +01:00
Grzegorz Bizon 6277ef8e28 Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master' 
Migrate Repository#can_be_merged? to Gitaly

Closes gitaly#893

See merge request gitlab-org/gitlab-ce!16316
 2018-01-15 08:10:30 +00:00
Robert Speicher 16e895801e Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master' 
Migrate rebase_in_progress? to Gitaly

Closes gitaly#866

See merge request gitlab-org/gitlab-ce!16286
 2018-01-11 22:27:16 +00:00
Robert Speicher 587242656f Merge branch 'feature/migrate-rebase-to-gitaly' into 'master' 
Migrate Gitlab::Git::Repository#rebase to Gitaly

Closes gitaly#863

See merge request gitlab-org/gitlab-ce!16259
 2018-01-11 22:24:50 +00:00
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
Ahmad Sherif b4b267b739 Migrate Repository#can_be_merged? to Gitaly 2018-01-11 16:40:13 +01:00
Rémy Coutable ccb3fe1f42 Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master' 
Migrate merged_branch_names to Gitaly

Closes gitaly#851

See merge request gitlab-org/gitlab-ce!16157
 2018-01-11 15:22:49 +00:00
Ahmad Sherif 831019412f Migrate merged_branch_names to Gitaly 
Closes gitaly#851
 2018-01-11 14:52:15 +01:00
Robert Speicher 4fc0a09017 Merge branch 'git-write-ref-prep' into 'master' 
Gitlab::Git::Repository#write_ref client-prep take 2

Closes gitaly#793

See merge request gitlab-org/gitlab-ce!16287
 2018-01-10 19:13:50 +00:00
Ahmad Sherif 42265d445f Migrate Gitlab::Git::Repository#rebase to Gitaly 
Closes gitaly#863
 2018-01-10 13:28:10 +01:00
Ahmad Sherif 92d62ff69d Migrate rebase_in_progress? to Gitaly 
Closes gitaly#866
 2018-01-10 13:24:29 +01:00
Zeger-Jan van de Weg 58e17bf3b0
Migrate GitlabProject (re)move project endpoints 
Migration is done through a small refactoring, which makes us call
endpoins which are performing the same actions for namespaces.
Tests are added to ensure only the project is removed that should be
removed.

Closes gitlab-org/gitaly#873
 2018-01-09 19:23:18 +01:00
Kim "BKC" Carlbäcker 657065b73e Client-prep Gitlab::Git::Repository#write_ref 2018-01-09 15:20:44 +01:00
Sean McGivern 3013951c73 Merge branch 'remove-commit-tree' into 'master' 
Remove the Commit#tree method

See merge request gitlab-org/gitlab-ce!16236
 2018-01-08 11:31:10 +00:00
Sean McGivern d42c0ecc02 Merge branch 'gitaly-fetch-internal-remote' into 'master' 
Incorporate RemoteService.FetchInternalRemote Gitaly RPC

Closes gitaly#857

See merge request gitlab-org/gitlab-ce!16140
 2018-01-08 10:42:35 +00:00
Stan Hu c2b7147c2f Fix error 500 when viewing commit and merge request diffs 
Due to the refactoring in !16082, `Blob#batch` no longer falls back
to a default `blob_size_limit`. Since `Repository#batch_blobs` was using
a default `nil` value, this would cause issues in the `Blob#find_by_rugged`
method.

This fix here is to be consistent and use a non-nil default value in
`Repository#batch_blobs`.

The problem was masked in development and tests because Gitaly is always
enabled by default for all features.

Closes #41735
 2018-01-07 04:49:07 -08:00
Alejandro Rodríguez 9ff44c2986 Incorporate RemoteService.FetchInternalRemote Gitaly RPC 2018-01-05 15:45:24 -03:00
Alejandro Rodríguez 0b07be594e Move git operations for multi_action into Gitlab::Git 2018-01-05 15:17:53 -03:00
Lin Jen-Shin (godfat) 33c5630b02 Use --left-right and --max-count for counting diverging commits 2018-01-05 16:52:06 +00:00
Douwe Maan 3bb68efb7a Merge branch 'zj-blob-batch' into 'master' 
Reroute batch blobs to single blob RPC

See merge request gitlab-org/gitlab-ce!16082
 2018-01-05 10:47:28 +00:00
Sean McGivern 4dd0c55f05 Merge branch 'fix/prepare-rebase-to-be-migrated-to-gitaly' into 'master' 
Prepare Gitlab::Git::Repository#rebase for Gitaly migration

See merge request gitlab-org/gitlab-ce!16192
 2018-01-05 10:44:24 +00:00
Zeger-Jan van de Weg 6b15784ce7 Fix typos in a code comment 2018-01-05 09:41:05 +00:00
Jacob Vosmaer ac2cb65ab3 Remove the Commit#tree method 2018-01-04 18:00:28 +01:00
Dmitriy Zaporozhets 58a705aaac Merge branch 'ce-gitaly-remote-mirror-prep' into 'master' 
[CE] Move git operations for UpdateRemoteMirrorService into Gitlab::Git

See merge request gitlab-org/gitlab-ce!16023
 2018-01-04 16:02:22 +00:00
Ahmad Sherif 0ba0f9de08 Prepare Gitlab::Git::Repository#rebase for Gitaly migration 2018-01-04 12:39:45 +01:00
Rémy Coutable 062ea80e64 Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master' 
Add support for max_count option to Git::Repository#count_commits

See merge request gitlab-org/gitlab-ce!16145
 2018-01-04 10:58:47 +00:00
Alejandro Rodríguez 996becdcbb Move git operations for UpdateRemoteMirrorService into Gitlab::Git 2018-01-03 23:09:04 -03:00
Alejandro Rodríguez 1c458d17d7 Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository 2018-01-03 23:07:38 -03:00
Alejandro Rodríguez 43308bd826 Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository 2018-01-03 23:06:34 -03:00
Robert Speicher 946a3634bc Merge branch 'sh-optimize-commit-stats' into 'master' 
Speed up generation of commit stats by using Rugged native methods

See merge request gitlab-org/gitlab-ce!16186
 2018-01-03 17:39:24 +00:00
Robert Speicher f7cb21930a Merge branch 'migrate-fork-repo-to-gitaly' into 'master' 
Migrate repo forking to Gitaly

Closes gitaly#825

See merge request gitlab-org/gitlab-ce!16018
 2018-01-03 17:35:32 +00:00
Grzegorz Bizon 57906a5322 Merge branch 'gitaly-conflict-resolver' into 'master' 
Gitaly conflict resolver

Closes gitaly#813

See merge request gitlab-org/gitlab-ce!15755
 2018-01-03 08:39:16 +00:00
Stan Hu 25a868753b Speed up generation of commit stats by using Rugged native methods 
The previous implementation iterated across the entire patch set
to determine the number of lines added, deleted, and changed. Rugged
has a native method `Rugged::Diff#stat` that does this already,
which appears to be a little faster and require less RAM than doing
this ourselves.

Improves performance in #41524
 2018-01-02 23:48:19 -08:00
Alejandro Rodríguez 65e3a1e9e9 Simplify conflict resolution interface and code 
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly
 2018-01-02 16:22:02 -03:00
Ahmad Sherif 4b5b43383a Migrate repo forking to Gitaly 
Closes gitaly#825
 2018-01-02 17:20:01 +01:00
Zeger-Jan van de Weg 59e50e33b3
Reroute batch blobs to single blob RPC 
Given the priorities shifted for the Gitaly team, this endpoint does not
get a dedicated endpoint yet. To make it work in a cloud native
environment the request needs to go to Gitaly, not rugged. This is
achieved by rerouting to the generic TreeEntry endpoint.
 2018-01-02 10:00:24 +01:00
Stan Hu 0ea75205df Merge branch 'gitaly-opt-out' into 'master' 
Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed

Closes #38333

See merge request gitlab-org/gitlab-ce!16155
 2017-12-28 16:37:55 +00:00
Alejandro Rodríguez 7ed28b9069 Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed 2017-12-28 12:09:34 -03:00
Alejandro Rodríguez 04b987563a Fix feature flags for Gitaly's RemoteService RPCs 2017-12-27 20:14:36 +00:00
Alejandro Rodríguez 0aa87bbe13 Incorporate ConflictsService.ResolveConflicts Gitaly RPC 2017-12-27 15:14:25 -03:00
Alejandro Rodríguez 351f205c05 Incorporate ConflictsService.ListConflictFiles Gitaly RPC 2017-12-27 15:12:30 -03:00
Ahmad Sherif 13932b0b12 Add support for max_count option to Git::Repository#count_commits 2017-12-27 14:16:24 +01:00
Dmitriy Zaporozhets 87bae6d42f Merge branch 'gitaly-remotes' into 'master' 
Incorporate Gitaly's RemoteService RPCs

Closes gitaly#852

See merge request gitlab-org/gitlab-ce!16060
 2017-12-25 10:43:04 +00:00
Alejandro Rodríguez 2694355bb6 Incorporate Gitaly's RemoteService RPCs 2017-12-22 20:30:08 -03:00
Alejandro Rodríguez 7354c9f75d Remove unused method `remote_exists?` 2017-12-22 20:30:07 -03:00