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
Douwe Maan
Robert Speicher
Jacob Vosmaer
Kim "BKC" Carlbäcker
Brian Neel
Dmitriy Zaporozhets
Alejandro Rodríguez
Robert Speicher
Ahmad Sherif
Sean McGivern
Bob Van Landuyt
Bob Van Landuyt
Alexis Reigel
Kevin O'Connor
Z.J. van de Weg
Rémy Coutable
Andrew Newdigate
Clement Ho
Tiago Botelho
Douwe Maan
David Turner
Sean McGivern