1731934398
Add `Gitlab::Git::Repository#fetch` command
2017-10-09 18:25:24 -03:00
4656283c5c
Gitaly namespace service enabled for GitLab
2017-10-05 14:11:32 +02:00
e25abf5be6
Use simple path for tmp ref, avoiding extra dir
...
So that we don't have to worry about cleaning empty
directories later. This was brought up at:
https://gitlab.com/gitlab-org/gitlab-ce/issues/38689#note_42242988
2017-10-05 17:30:44 +08:00
4a0f720a50
Merge branch 'capture-rev-list-errors' into 'master'
...
Include RevList error messages in exceptions
See merge request gitlab-org/gitlab-ce!14658
2017-10-04 12:07:23 +00:00
27e18f182f
Merge branch 'gitaly-fetch-ref' into 'master'
...
Let fetch_ref pull from Gitaly instead of from disk
Closes gitaly#585
See merge request gitlab-org/gitlab-ce!14588
2017-10-04 12:07:17 +00:00
147e2b21be
Let fetch_ref pull from Gitaly instead of from disk
2017-10-04 12:57:41 +02:00
45c5311a8b
Add missing exception variable
2017-10-04 12:29:06 +02:00
c6e5a77e51
Merge branch 'gitaly-delete-branch' into 'master'
...
Implement OperationService.UserDeleteBranch Gitaly RPC
See merge request gitlab-org/gitlab-ce!14603
2017-10-04 07:34:33 +00:00
79719cf003
Add OperationService.UserDeleteBranch Gitaly RPC
2017-10-03 21:06:34 -03:00
5dd26d4e5a
Hide Gollum inside Gitlab::Git::Wiki
2017-10-03 16:58:33 +00:00
bfd53aa6d0
Restore User.from_gitaly
2017-10-03 16:53:11 +00:00
f6966d8922
Include RevList error messages in exceptions
2017-10-03 16:33:32 +02:00
1440342fcf
Merge branch 'log-update-ref-errors' into 'master'
...
Log update-ref errors in OperationService
See merge request gitlab-org/gitlab-ce!14627
2017-10-02 15:32:59 +00:00
4716e81f9d
Merge branch 'revert-configurable-size-limits' into 'master'
...
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
See merge request gitlab-org/gitlab-ce!14628
2017-10-02 14:39:55 +00:00
a5d47bb063
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
...
This reverts commit 1d3c33b57e
2017-10-02 13:54:40 +01:00
581272f6d4
Log update-ref errors in OperationService
2017-10-02 14:39:09 +02:00
0a69abdb28
Merge branch 'gitaly-add-branch' into 'master'
...
Implement OperationService.UserAddBranch Gitaly RPC
Closes gitaly#544
See merge request gitlab-org/gitlab-ce!14522
2017-10-02 09:27:23 +00:00
fa5f0164eb
Implement OperationService.UserAddBranch Gitaly RPC
2017-09-30 00:58:56 -03:00
16f850033f
Populate `Gitlay::Repository`'s `gl_repository` field
2017-09-30 00:58:56 -03:00
01ce58bde4
add username to authorized result, so that gitlab-shell can pass it to hooks
2017-09-29 18:16:55 -04:00
dbcf48af8b
Add username as GL_USERNAME in hooks (http)
...
When calling pre-receive, post-receive, and update hooks, add the GitLab
username as the GL_USERNAME environment variable.
This patch only handles cases where pushes are over http, or via
the web interface. Later, we will address the ssh case.
2017-09-29 18:12:03 -04:00
999b7e553b
remove unused from_gitaly method
2017-09-29 18:12:02 -04:00
e5fecc3a37
Create repositories via Gitaly
2017-09-29 18:27:06 +02:00
403712f06e
Make Repository#has_visible_content more efficient
2017-09-29 13:08:44 +00:00
4f5be9ec7b
Migrate Gitlab::Git::Repository#add_tag to Gitaly
...
Closes gitaly#601
2017-09-29 00:53:49 +02:00
07c3112ef5
Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master'
...
Migrate Git::Repository#rm_tag to Gitaly
Closes gitaly#562
See merge request gitlab-org/gitlab-ce!14388
2017-09-28 22:43:37 +00:00
3944e16b4b
Migrate Git::Repository#rm_tag to Gitaly
...
Closes gitaly#562
2017-09-28 23:36:40 +02:00
b63e8d64c1
Handle error when fetching ref for MR with deleted source branch
...
If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.
2017-09-28 11:11:10 +01:00
a02881dfda
RepositoryExists is always called with #gitaly_migration
2017-09-26 19:40:49 -03:00
9c16958c30
Migrate Gitlab::Git::Repository#log to Gitaly
2017-09-25 11:34:10 +02:00
239332eed3
Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules
...
* upstream/master: (168 commits)
Update CHANGELOG.md for 10.0.1
Remove Grit settings from default settings
Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration
Workaround for #38259
Workaround for n+1 in Projects::TreeController#show
Removed old icons from project page
Make branches page translatable
fix typo in icons section
Don't show it if there's no project.
Update CHANGELOG.md for 10.0.0
Inform user that current shared projects will remain shared
Allow the git circuit breaker to correctly handle missing repository storages
Reserve refs/replace cos `git-replace` is using it
Resolve "Better SVG Usage in the Frontend"
Replace the 'project/service.feature' spinach test with an rspec analog
Replace the 'project/shortcuts.feature' spinach test with an rspec analog
Removed two legacy config options
Fix rendering double note issue.
IssueNotes: Switch back to Write pane when note cancel or submit.
Upgrade Nokogiri because of CVE-2017-9050
...
2017-09-25 15:42:34 +08:00
7cf8e0981a
Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'
...
Allow the git circuit breaker to correctly handle missing repository storages
Closes #36549
See merge request gitlab-org/gitlab-ce!14417
2017-09-22 20:24:22 +00:00
604f176bf8
Merge branch 'feature/migrate-repository-diff' into 'master'
...
Migrate Gitlab::Git::Repository#diff to Gitaly
Closes gitaly#524
See merge request gitlab-org/gitlab-ce!14251
2017-09-22 11:43:11 +00:00
408c595292
Merge branch 'sh-blob-raw-check' into 'master'
...
Ensure that Blob.raw returns always returns a valid blob object
See merge request gitlab-org/gitlab-ce!14412
2017-09-22 10:40:27 +00:00
ba0ebbb510
Allow the git circuit breaker to correctly handle missing repository storages
2017-09-22 10:05:28 +01:00
794b4c5579
Ensure that Blob.raw returns always returns a valid blob object
...
In gitlab-org/gitlab-ee!2976 , we saw that a given OID could point
to a commit, which would cause the delta size check to fail.
Gitaly already returns nil if the OID isn't a blob, so this change
makes the Rugged implementation consistent.
2017-09-21 14:49:51 -04:00
fbe205f92f
Display full pre-receive and post-receive hook output in GitLab UI
2017-09-21 09:13:00 -04:00
eb36fa17a6
Migrate Gitlab::Git::Repository#diff to Gitaly
...
Closes gitaly#524
2017-09-21 11:05:06 +02:00
34eeac6108
Use Gitlab::Git's Popen on that module's code
...
This allows the current Gitaly migration to depend on less code outside
of the Gitlab::Git module
2017-09-20 13:21:54 +02:00
75509fac17
Prepare cherry-pick and revert for migration to Gitaly
2017-09-19 17:09:10 +00:00
64d7ec0a9e
Detect n+1 issues involving Gitaly
2017-09-19 10:55:37 +00:00
9ae92b8caa
Add cop to make sure we don't use ivar in a module
2017-09-18 21:23:45 +08:00
902b5347dc
Prepare Repository#merge for migration to Gitaly
2017-09-15 16:39:20 +02:00
9e40baba1e
Rename Gitlab::Git::Committer to User
2017-09-14 17:42:02 +02:00
25c34608b9
Migrate Git::CommitStats to Gitaly
2017-09-11 21:00:58 +02:00
c2e99b40f7
Implement fix for n+1 issue on `flatten_tree` helper
2017-09-06 17:47:25 -03:00
86cbf60cbb
Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'
...
Migrate creating/deleting a branch to Gitaly
See merge request !13864
2017-09-06 17:26:05 +00:00
41ef94e777
Migrate creating/deleting a branch to Gitaly
2017-09-06 17:25:17 +02:00
a6af5522d7
renames ambiguous methods and add spec
2017-09-06 09:01:53 -04:00
dbaed90c8d
fix refactoring error with Blob.binary?
...
remove some lint
2017-09-06 09:01:53 -04:00
c9aa793215
revert to using a simple representation
2017-09-06 09:01:53 -04:00
bca72f5906
wip: fake its a binary diff
2017-09-06 09:01:53 -04:00
e10437de40
Migrate Gitlab::Git::Repository#find_branch to Gitaly
2017-09-05 17:29:45 +00:00
9d88ad45d2
Add Gitaly migration points for branch/tag create/delete
2017-09-05 12:00:13 +02:00
4efdb451b5
Merge branch 'move-git-operation-service' into 'master'
...
Move GitOperationService to Gitlab::Git
See merge request !13984
2017-09-04 11:06:12 +00:00
dabce2c571
Merge branch 'git-operation-service-to-git' into 'master'
...
Prepare GitOperationService for moving to Gitlab::Git
See merge request !13773
2017-09-04 10:56:26 +00:00
6cdaa27a53
Move GitOperationService to Gitlab::Git
2017-09-01 14:37:56 +02:00
0187018e48
Simplify Git interactions in AfterImportService
2017-09-01 12:01:50 +00:00
254f5ab62b
Add Gitlab::Git::Repository#==
2017-09-01 11:40:07 +02:00
8ad690b0d4
Prepare GitOperationService for move to Gitlab::Git
2017-08-31 15:35:59 +02:00
91a55ed6a1
Merge branch 'gitaly-440-shell-fetch-remote' into 'master'
...
Migrate Repository.FetchRemote to Gitaly
See merge request !13625
2017-08-31 11:08:45 +00:00
b77176d11a
Migrate Repository.FetchRemote to Gitaly
...
- `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead
2017-08-30 20:51:56 +02:00
c5553ce772
Use `git update-ref --stdin -z` to delete refs
2017-08-30 22:01:23 +08:00
86149a8216
Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-after-import
...
* upstream/master: (225 commits)
Add changelog entry
Backports EE 2756 logic to CE.
Make rubocop happy
Make profile settings dropdown consistent
Add filter by my reaction
Update spec initialization with it being a shared component
Update identicon path and selector
Renamed to `identicon` and make shared component
Merge branch 'master-i18n' into 'master'
Fix broken Frontend JS guide
Replace 'project/star.feature' spinach test with an rspec analog
Adds position fixed to right sidebar
Fixes the margin of the top buttons of the pipeline page
Remove commented out code
Better align fallback image emojis
Decrease Metrics/CyclomaticComplexity threshold to 15
Add changelog
Respect the default visibility level when creating a group
Further break with_repo_branch_commit into parts
Make sure inspect doesn't generate crazy string
...
2017-08-30 21:13:19 +08:00
9954dafda5
Just use a block
2017-08-29 16:23:12 +08:00
10ae0d8316
replace `is_ancestor` with `ancestor?`
2017-08-29 11:14:42 +03:00
87467127b6
replace `is_ancestor?` with `ancestor?`
2017-08-29 11:14:41 +03:00
d1054bd3dd
Resolve feedback on the MR:
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13766
* Rename AfterImportService
* Use constants
* Move Git operations to Gitlab::Git::Repository
* Use Regexp.union
2017-08-25 22:38:07 +08:00
e46a3d2fda
Merge branch 'git-operation-user' into 'master'
...
Move GitHooksService into Gitlab::Git
See merge request !13739
2017-08-24 14:32:17 +00:00
fb49c94e49
Delegate Repository::branch_exists? and ref_exists? to Gitlab::Git
2017-08-24 09:20:04 +00:00
93ad83443a
Merge branch 'sh-fix-branch-count' into 'master'
...
Fix inconsistent number of branches when remote branches are present
Closes #36934
See merge request !13784
2017-08-24 07:42:30 +00:00
37904108b9
Fix inconsistent number of branches when remote branches are present
...
Users of project mirrors would see that the number of branches did not
match the number in the branch dropdown because remote branches were
counted when Rugged was in use. With Gitaly, only local branches
are counted.
Closes #36934
2017-08-23 22:07:32 -07:00
d546f7d36e
Merge branch 'gitaly-commit-patch' into 'master'
...
Incorporate DiffService.CommitPatch Gitaly RPC
Closes gitaly#463
See merge request !13441
2017-08-23 10:39:01 +00:00
da769135fe
Rubocop whitespace
2017-08-23 10:45:20 +02:00
dc7c6bede2
Move GitHooksService to Gitlab::Git
2017-08-23 10:45:20 +02:00
65f83941c3
Make gl_repository a G::G::Repository attribute
2017-08-23 10:45:20 +02:00
9b93093292
Decouple GitOperationService from User
2017-08-23 10:45:20 +02:00
258d5a50e6
Incorporate DiffService.CommitPatch Gitaly RPC
2017-08-22 16:31:59 -03:00
3049dfaf48
Simplify return values
2017-08-18 16:03:27 +02:00
df7f2b135a
Simplify method arguments
2017-08-18 15:59:17 +02:00
a902166475
More annotations
2017-08-18 15:55:30 +02:00
faaed0aa1f
Delete unused Gitlab::Git methods
2017-08-18 14:12:17 +02:00
66afd1ee1c
Add Gitaly annotation
2017-08-18 14:07:51 +02:00
aaa887feba
Client Implementation: RefService::RefExists
2017-08-18 09:43:58 +01:00
c463a83405
Incorporate RepositoryService.ApplyGitattributes Gitaly RPC
2017-08-17 14:44:30 -03:00
ec34b2d051
Merge branch 'dm-gpg-signature-performance' into 'master'
...
Only create commit GPG signature when necessary
See merge request !13561
2017-08-16 18:34:55 +00:00
ba7251fefd
Only create commit GPG signature when necessary
2017-08-16 18:57:50 +02:00
fcce6c3168
Merge branch 'rs-more-public-send-whitelists' into 'master'
...
Whitelist or fix additional `Gitlab/PublicSend` cop violations
See merge request !13467
2017-08-16 11:25:26 +00:00
7b68bdce15
Merge branch 'rs-trailingwhitespace-cop' into 'master'
...
Enable Layout/TrailingWhitespace cop and auto-correct offenses
See merge request !13573
2017-08-16 10:27:46 +00:00
4edfad9678
Enable Layout/TrailingWhitespace cop and auto-correct offenses
2017-08-15 13:44:37 -04:00
5fc871381a
Speed up project creation by inlining repository creation
2017-08-15 18:33:07 +01:00
0da644072f
Merge branch 'malformed-submodule' into 'master'
...
Handle missing .gitmodules when getting submodule urls
See merge request !13509
2017-08-15 09:00:44 +00:00
260c8da060
Whitelist or fix additional `Gitlab/PublicSend` cop violations
...
An upcoming update to rubocop-gitlab-security added additional
violations.
2017-08-14 12:14:11 -04:00
a64760d6d0
Merge branch 'gitaly-404-commit-list-files' into 'master'
...
Migrate `Git::Repository.ls_files` to Gitaly
Closes gitaly#404
See merge request !13302
2017-08-14 15:44:36 +00:00
d9b6fd4fba
Handle missing .gitmodules when getting submodule urls
2017-08-14 10:53:02 +02:00
7b10885046
Migrate Git::Repository.ls_files to Gitaly
2017-08-10 16:10:47 +02:00
b21539cc57
Expose the raw_log method
2017-08-09 15:37:05 +02:00
9770c57fab
Re-enable SqlInjection and CommandInjection
2017-08-08 10:50:54 -04:00
1439115183
Merge branch 'gitaly-find-commit' into 'master'
...
Incorporate Gitaly's CommitService.FindCommit RPC
Closes gitaly#402
See merge request !13094
2017-08-08 14:27:22 +00:00
3ce6f03f14
Incorporate Gitaly's CommitService.FindCommit RPC
2017-08-07 23:33:43 -04:00
e363fbf71a
Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit
...
This helps keep the abstraction layers simpler, and also keep the
interface of those methods consistent, in case of implementation
changes.
2017-08-07 23:33:40 -04:00
c21ae07e33
Refactor Gitlab::Git::Commit to include a repository
2017-08-07 22:34:34 -04:00
6085ce1352
Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Repository#size to Gitaly
Closes gitaly#437
See merge request !13259
2017-08-07 21:29:32 +00:00
942bd5b411
Merge branch 'blob-batch-methods' into 'master'
...
Add Gitlab::Git::Blob.batch method
See merge request !13225
2017-08-07 19:57:25 +00:00
c4f55ce32d
Migrate Gitlab::Git::Repository#size to Gitaly
...
Closes gitaly#437
2017-08-07 18:53:32 +02:00
f278e5fb3e
Set default options outside the raw_log method
...
The raw_log method is meant to become the Gitaly RPC boundary. By
setting the defaults before doing the RPC we keep the RPC
implementation simpler. We also sidestep the unfortunate subtleties of
what happens when options[:limit] is not set, or nil.
2017-08-07 18:05:06 +02:00
29a1c5a126
Rename 'limit' to 'blob_size_limit'
2017-08-07 16:26:50 +02:00
727b6d16e5
Merge branch 'master' into 'bvl-nfs-circuitbreaker'
...
# Conflicts:
# app/models/repository.rb
# spec/models/repository_spec.rb
2017-08-07 09:13:10 +00:00
9b21668663
Merge branch 'gitaly-renames-annotations' into 'master'
...
Gitaly deletions and annotations
See merge request !13280
2017-08-07 08:40:53 +00:00
e299d595c7
Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'
...
Migrate Repository#last_commit_for_path to Gitaly
Closes gitaly#433
See merge request !13200
2017-08-04 15:46:36 +00:00
4b34720c0c
Use ruby's `File.stat` to check storage availability
2017-08-04 15:38:50 +02:00
3a2aaed881
Use a Struct to keep track of failure info
2017-08-04 15:38:50 +02:00
0dd4c306ca
Only track accessibility once
2017-08-04 15:38:50 +02:00
022c38e63e
Use `keys` instead of `scan_each`
2017-08-04 15:38:49 +02:00
3899d07f9e
Move hostname to Gitlab::Environment
2017-08-04 15:38:49 +02:00
0fa94a0ddd
Make sure the check works for paths with spaces.
2017-08-04 15:38:49 +02:00
3598e60bf2
Add a Circuitbreaker for storage paths
2017-08-04 15:38:48 +02:00
f81c07eacc
Migrate Repository#last_commit_for_path to Gitaly
...
Closes gitaly#433
2017-08-03 19:26:46 +02:00
03440eed20
Migrate blame loading to Gitaly
...
Closes gitaly#421
2017-08-03 19:20:46 +02:00
8f9b658e3a
Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Repository#count_commits to Gitaly
Closes gitaly#415
See merge request !13121
2017-08-03 15:25:03 +00:00
25a6a0725c
Migration link for Repository#log
2017-08-03 16:48:11 +02:00
00c9c6b458
Remove unused methods
2017-08-03 16:03:37 +02:00
3a8f4a3460
Remove unnecessary 'raw' alias
2017-08-03 15:52:14 +02:00
29a07fd3a1
Rename 'commits_between' to 'rugged_commits_between'
2017-08-03 15:48:10 +02:00
215e0911e5
Migrate Gitlab::Git::Repository#count_commits to Gitaly
...
Closes gitaly#415
2017-08-02 00:33:04 +02:00
d3ddc69b54
Add rugged_is_ancestor method
2017-08-01 17:24:37 +02:00
5e20e448ce
Add Gitlab::Git::Blob.batch method
2017-08-01 13:49:57 +02:00
67de82cf5f
Add option to use CommitLanguages RPC
2017-08-01 10:48:46 +02:00
8e3f2ecfa9
Incorporate RefsService.FindAllBranches Gitaly RPC
2017-07-27 15:40:54 -04:00
432bb22308
Remove unused Gitlab::Git operations
2017-07-27 15:39:31 -04:00
cd5ae5cb2b
Migrate Repository#tags to Gitaly
...
Closes gitaly#411
2017-07-27 20:07:40 +02:00
a01eabc19f
update rugged
...
the rugged versions up to 0.26.0b3 had a bug concerning the signature
extraction. The extracted signature was not always the same, probably
due to a buffer (overflow) issue in libgit.
see https://github.com/libgit2/rugged/issues/608
2017-07-27 15:43:36 +02:00
28bb5e3d53
commit signature with spec
2017-07-27 15:40:40 +02:00
817d9558fe
Prototype key verification
2017-07-27 15:40:40 +02:00
acf4a36b3e
Implement GRPC call to RepositoryService
2017-07-26 09:32:34 +02:00
8efc884166
Merge branch 'gitaly-tree-entries' into 'master'
...
Incorporate CommitService.GetTreeEntries Gitaly call
Closes gitaly#372
See merge request !12941
2017-07-21 15:47:36 +00:00
b043100b65
Migrate Gitlab::Git::Commit.find_all to Gitaly
...
Closes gitaly#396
2017-07-20 22:03:55 +02:00
9eb5cdd73f
Incorporate CommitService.GetTreeEntries Gitaly call
2017-07-20 12:47:00 -04:00
ef2b81adb4
Migrate DiffCollection limiting logic to Gitaly
2017-07-19 18:05:22 +02:00
25b01b4c85
Incorporate Gitaly's Commits#between RPC
2017-07-18 16:20:27 -04:00
90f8feae46
Adapt to new Gitaly commit message format
2017-07-18 16:11:44 -04:00
a89f18bf2c
Renamed Gitaly services
2017-07-18 07:59:36 +00:00
8b31ecd3d9
Merge branch 'remove-git-search-files' into 'master'
...
Remove Repository#search_files
See merge request !12879
2017-07-17 11:13:49 +00:00
682b328787
Remove Repository#search_files
2017-07-14 18:17:31 +02:00
8ca394b8d7
Gitaly migration annotations
2017-07-14 17:08:54 +02:00
48a2c680b6
Use helper instead of ad-hoc regex
2017-07-14 17:08:53 +02:00
b304fd790b
Make commit lookups explicit
2017-07-14 17:08:53 +02:00
08b462b9b0
Remove deprecated #heads method
2017-07-14 15:11:42 +02:00
000ec95399
Make branch filter support private
2017-07-14 15:08:33 +02:00
5b18f73364
Indirectly migrate count_commits_between to Gitaly
2017-07-13 18:05:56 +02:00
a87cca5f9c
More Gitaly annotations
2017-07-13 18:05:55 +02:00
b2ecf0aa35
Change Git::Repository#log to return Commits
2017-07-13 14:54:21 +02:00
e0ce648d5c
Merge branch 'lib-git-gitaly' into 'master'
...
Add Gitaly notes to Gitlab::Git, delete diff options
See merge request !12814
2017-07-13 09:32:36 +00:00
0b0e89ef7b
Try to eliminate unused diff options
2017-07-12 18:28:29 +02:00
47c844bf34
Add Gitaly notes and annotations to Gitlab::Git
2017-07-12 17:06:31 +02:00
8119c444b3
Add namespace for Blob
2017-07-11 16:06:38 -05:00
17d7d3de5d
Add git_blob_load_all_data feature flag
2017-07-07 18:36:14 +02:00
06b9449224
Add gitaly_git_blob_raw feature
2017-07-07 18:33:59 +02:00
1dab640357
Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Repository#commit_count to Gitaly
Closes gitaly#355
See merge request !12688
2017-07-07 15:21:05 +00:00
c393d88df3
Migrate Gitlab::Git::Repository#commit_count to Gitaly
...
Closes gitaly#355
2017-07-07 13:47:34 +02:00
793ce6fef6
Merge branch '32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui' into 'master'
...
Make filename and path creation compatible with UNIX in web UI
Closes #21362
See merge request !12608
2017-07-05 20:21:58 +00:00
1207d451ed
Removes file_name_regex from Gitlab::Regex
2017-07-05 19:10:14 +01:00
9e4aef263a
Merge branch 'gitaly-submodule-url-for' into 'master'
...
Migrate #submodule_url_for to Gitaly
See merge request !12629
2017-07-05 11:25:39 +00:00
b67d1d64cc
Migrate #submodule_url_for to Gitaly
2017-07-05 11:09:03 +02:00
82614f8675
Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths
2017-07-04 15:16:34 -05:00
f4e6aba1bb
Set the GL_REPOSITORY env variable on Gitlab::Git::Hook
2017-06-29 15:22:40 -04:00
d3bcf8ac2a
Fix gitaly ref encoding bugs
2017-06-28 16:15:59 +02:00
5dd6d9a9ec
Merge branch 'submodules-private' into 'master'
...
Make Gitlab::Git::Repository#submodules private
See merge request !12479
2017-06-28 09:25:45 +00:00
cf131bf713
Make Gitlab::Ggit::Repository#submodules private
2017-06-27 16:03:35 +02:00
43c3a65062
Remove 'contains' option from Commit.find_all
2017-06-27 12:38:58 +02:00
144e37c667
Remove Gitlab::Git::Repository#find_all
2017-06-27 12:30:51 +02:00
2bad43f5ee
Remove unused Gitlab::Git::Commit#to_diff argument
2017-06-26 18:50:26 +02:00
826d5b7b51
Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'
...
Encode Gitaly diff patches properly
See merge request !12368
2017-06-22 16:50:30 +00:00
5b092d21cc
Encode Gitaly diff patches properly
2017-06-22 03:12:23 +02:00
0284f01716
Migrate Gitlab::Git::Blob.find to Gitaly
2017-06-21 17:31:20 +02:00
3656f6cc40
Merge branch 'remove-git-commit-attribute' into 'master'
...
Remove unused attr_accessor from Gitlab::Git::Commit
See merge request !12311
2017-06-21 08:30:36 +00:00
d66d126382
Remove unused attr_accessor from Gitlab::Git::Commit
2017-06-20 17:20:02 +02:00
2a39280db0
Merge branch 'moved-submodules' into 'master'
...
repository: index submodules by path
See merge request !10798
2017-06-19 17:51:55 +00:00
b30c16aa32
repository: index submodules by path
...
Submodules have a name in the configuration, but this name is simply
the path at which the submodule was initially checked in (by default
-- the name is totally arbitrary). If a submodule is moved, it
retains its original name, but its path changes. Since we discover
submodules inside trees, we have their path but not necessarily their
name.
Make the submodules() function return the submodule hash indexed by
path rather than name, so that renamed submodules can be looked up.
Signed-off-by: David Turner <novalis@novalis.org>
2017-06-16 14:37:13 -04:00
9a73b634ab
Add table for files in merge request diffs
...
This adds an ID-less table containing one row per file, per merge request
diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised
currently, with the advantage that we can easily query the attributes of this
new table.
It does not migrate existing data, so we have fallback code when the legacy
st_diffs column is present instead. For a merge request diff to be valid, it
should have at most one of:
* Rows in this new table, with the correct merge_request_diff_id.
* A non-NULL st_diffs column.
It may have neither, if the diff is empty.
2017-06-16 18:30:01 +01:00
7944254563
Implement diff viewers
2017-06-14 10:12:21 -05:00
e4038cb508
Merge branch 'cache-diff-size-limits' into 'master'
...
Only look up diff size limit flags once per request
See merge request !12048
2017-06-09 20:16:58 +00:00
9b42be02ab
Only look up diff size limit flags once per request
2017-06-09 17:21:27 +01:00
370bc86fb0
Detect if file that appears to be text in the first 1024 bytes is actually binary afer loading all data
2017-06-08 12:49:03 -05:00
ffbbd4112e
Move diffable? method from Repository to Diff::File
2017-06-08 09:32:57 -05:00
3a5d375e49
Fix Diff::Position#diff_file for positions on straight diffs
2017-06-06 14:48:05 -05:00
07e7ce31e3
Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening' into 'master'
...
Increase diff limits to 100 KB for collapse and 200 KB overall
Closes #31983
See merge request !11875
2017-06-05 13:58:54 +00:00
993412f9de
Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'
...
Use the new Gitaly CommitDiff RPC
See merge request !11826
2017-06-02 19:39:02 +00:00
1d3c33b57e
Increase diff limits to 100 KB for collapse and 200 KB overall
...
This is controlled with the feature flag gitlab_git_diff_size_limit_increase.
Both of these limits were basically picked arbitrarily in the first place;
disabling the feature flag reverts to the old limits.
2017-06-02 19:37:09 +01:00
4d1e987ec3
Use the new Gitaly CommitDiff RPC
2017-06-02 18:33:18 +02:00
e564fe971f
Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`
2017-06-01 21:21:14 +00:00
04251829ba
Merge branch 'dm-collapsed-blob' into 'master'
...
Consistent diff and blob size limit names
See merge request !11776
2017-06-01 09:10:53 +00:00
04cf618b6f
Change no_limits to limits
2017-05-31 14:41:25 -05:00
ea7269e4c6
Remove entry variable
2017-05-31 11:19:56 -05:00
ce869e3964
Fix Diff#too_large? and specs
2017-05-30 21:48:30 -05:00
0c7dd30c78
Make .gitmodules parsing more resilient to syntax errors
2017-05-30 16:19:36 -05:00
d9461314ad
Fix Diff#to_hash and #init_from_hash
2017-05-30 14:50:02 -05:00
aed0387f97
Consistent diff and blob size limit names
2017-05-29 17:02:02 -05:00
324af4ac9a
Merge branch 'diffcollection-no-restarts' into 'master'
...
Fix buffering in DiffCollection
See merge request !11659
2017-05-26 14:35:45 +00:00
16168b5b10
Use the iterator inside DiffCollection only once
2017-05-24 13:57:01 +02:00
Alejandro Rodríguez
Zeger-Jan van de Weg
Lin Jen-Shin
Sean McGivern
Jacob Vosmaer
Douwe Maan
Sean McGivern
David Turner
Ahmad Sherif
Robert Speicher
Kim "BKC" Carlbäcker
Nick Thomas
Stan Hu
Robin Bobbitt
Andrew Newdigate
micael.bergeron
Ahmad Sherif
Maxim Rydkin
Douwe Maan
Rémy Coutable
Robert Speicher
Brian Neel
Dmitriy Zaporozhets
Bob Van Landuyt
Bob Van Landuyt
Alexis Reigel
Kevin O'Connor
Clement Ho
Tiago Botelho
David Turner