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
68,135 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

276 Commits

Author SHA1 Message Date
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
Grzegorz Bizon dacd9dbef4 Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master' 
Move Repository#can_be_merged? to Gitlab::Git::Repository

Closes #42544

See merge request gitlab-org/gitlab-ce!16771
 2018-01-31 11:02:09 +00:00
Ahmad Sherif 1ebb781f6a Migrate Git::Repository#delete_refs to Gitaly 
Closes gitaly#967
 2018-01-30 23:48:51 +01:00
Douwe Maan 40e128730f Merge branch 'gitaly-784-repo-write-ref' into 'master' 
Migrate Git::Repository#write_ref to Gitaly

Closes gitaly#784

See merge request gitlab-org/gitlab-ce!16513
 2018-01-30 18:48:56 +00:00
Ahmad Sherif 11191f938c Move Repository#can_be_merged? to Gitlab::Git::Repository 
Fixes #42544
 2018-01-30 19:05:34 +01:00
Jacob Vosmaer (GitLab) 5c2fe2d3d7 Decouple more of Repository from Rugged 2018-01-30 16:21:55 +00:00
Kim "BKC" Carlbäcker 10fb904d63 Migrate Git::Repository#write_ref to Gitaly 2018-01-30 12:22:31 +01:00
Jacob Vosmaer (GitLab) e407c2d18f Don't allow Repository#log with limit zero 2018-01-29 15:27:46 +00:00
Jacob Vosmaer (GitLab) 3f79376c76 Set alternate object directories in run_git 2018-01-29 08:51:25 +00:00
Robert Speicher af95ba2fb4 Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master' 
Migrate restoring repo from bundle to Gitaly

Closes gitaly#946

See merge request gitlab-org/gitlab-ce!16623
 2018-01-25 19:03:51 +00:00
Rémy Coutable 26c4dea7ad Merge branch 'lint-rugged' into 'master' 
Add a lint check to restrict use of Rugged

See merge request gitlab-org/gitlab-ce!16656
 2018-01-25 17:52:01 +00:00
Rémy Coutable 5c68c839c0 Merge branch 'contrain-run-git' into 'master' 
Make Gitlab::Git::Repository#run_git private

See merge request gitlab-org/gitlab-ce!16622
 2018-01-25 16:17:02 +00:00
Jacob Vosmaer (GitLab) 9e6ce87727 Make Gitaly RepositoryExists opt-out 2018-01-25 13:59:35 +00:00
Jacob Vosmaer 6d6f7536bd Look for rugged with static analysis 2018-01-25 14:05:11 +01:00
Douwe Maan eab9ffeff6 Merge branch 'revert-430b3f0e' into 'master' 
Revert "Merge branch 'remove-rugged-walk' into 'master'"

See merge request gitlab-org/gitlab-ce!16676
 2018-01-25 11:15:07 +00:00
Rémy Coutable d2bf53942f Merge branch 'jej/gitattributes-check-at-ref' into 'master' 
Can parse root .gitattributes file for a ref

See merge request gitlab-org/gitlab-ce!16418
 2018-01-25 11:01:36 +00:00
Jacob Vosmaer (GitLab) 7363aa0b9d Revert "Merge branch 'remove-rugged-walk' into 'master'" 
This reverts merge request !16525
 2018-01-25 11:03:29 +01:00
Jacob Vosmaer 49e9347e73 Make Gitlab::Git::Repository#run_git private 2018-01-25 11:00:15 +01:00
Ahmad Sherif 29fa930baf Migrate .batch_lfs_pointers to Gitaly 
Closes gitaly#921
 2018-01-24 19:02:51 +01:00
Ahmad Sherif 6a28967c14 Migrate restoring repo from bundle to Gitaly 
Closes gitaly#946
 2018-01-24 19:02:32 +01:00
Ahmad Sherif 24625323a8 Migrate repository bundling to Gitaly 
Closes gitaly#929
 2018-01-24 12:10:31 +01:00
James Edwards-Jones 0683d31ab1 Can parse root .gitattributes file for a ref 2018-01-24 05:15:37 +00:00
Douwe Maan 09fc32173f Merge branch 'gitaly-user-commit-files' into 'master' 
Incorporate Gitaly's OperationService.UserCommitFiles RPC

Closes gitaly#890

See merge request gitlab-org/gitlab-ce!16307
 2018-01-23 09:34:59 +00:00
Alejandro Rodríguez 2e0951e93f Incorporate Gitaly's OperationService.UserCommitFiles RPC 2018-01-22 13:34:51 -03:00
Robert Speicher f344f7cecc Merge branch 'gitaly-write-ref-error-handling' into 'master' 
Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref

See merge request gitlab-org/gitlab-ce!16570
 2018-01-22 16:09:45 +00:00
Kim "BKC" Carlbäcker 728d7e0cf7 Move error-handling to lib/gitlab/git 2018-01-22 15:40:38 +01:00
Kim "BKC" Carlbäcker 31268b1b1a _never_ unset gitlab.full_path 2018-01-19 18:08:07 +01:00
Kim "BKC" Carlbäcker e1925f6d68 Move rugged-call from Project#write_repository_config to Git::Repository#write_config 2018-01-19 11:45:06 +01:00
Kim "BKC" Carlbäcker 58aa32bcea Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref 2018-01-18 21:31:40 +01:00
Jacob Vosmaer (GitLab) fa52038731 Remove Rugged::Walker from Repository#log 2018-01-18 14:05:14 +00:00
Jacob Vosmaer (GitLab) f4de7309ab Remove unused methods from Gitlab::Git 2018-01-17 09:54:27 +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
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
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
Kim "BKC" Carlbäcker 657065b73e Client-prep Gitlab::Git::Repository#write_ref 2018-01-09 15:20:44 +01: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
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
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 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