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
7e09a9b7dc
Clean up diff rendering
2017-05-23 15:37:05 -05:00
d9a0188d2f
Add question mark to Gitlab::Diff::File predicate methods
2017-05-23 15:37:04 -05:00
6319ca271c
Merge branch 'gitaly-local-branches' into 'master'
...
Incorporate Gitaly's local_branches operation into repo code
Closes #27379
See merge request !10059
2017-05-18 14:22:41 +00:00
925945f01b
Incorporate Gitaly's local_branches operation into repo code
2017-05-17 18:12:10 -04:00
71569a9c41
Compare ids of commits if present for equality test
...
This solves a problem where commits populated with Gitaly were not equal
to commits populated with Rugged. This is because Gitaly may not return
all fields of a commit for optimizations purposes, which resulted in
false negatives when comparing the same commit (commits with the same
sha) with different sources.
2017-05-16 20:54:45 -04:00
cf09c826a5
Re-enable gitaly migration for ref_name_for_sha after bugfixes
2017-05-16 11:43:37 -04:00
ffabab80a7
Merge branch 'use-gitaly-migrate' into 'master'
...
Use gitaly_migrate helper on all current migrations in repository
See merge request !11309
2017-05-15 18:26:55 +00:00
43f037c903
Don't reuse gRPC channels
...
It seems that bad things happen when two gRPC stubs share one gRPC
channel so let's stop doing that. The downside of this is that we
create more gRPC connections; one per stub.
2017-05-15 10:52:33 +02:00
99feed6e00
Add support for deltas_only under Gitaly
...
Closes gitaly#199
2017-05-13 18:27:06 +02:00
6d46e51031
Use gitaly_migrate helper on all current migrations in repository
2017-05-11 16:48:59 -03:00
Douwe Maan
Tiago Botelho
Sean McGivern
Jacob Vosmaer
Douwe Maan
Alejandro Rodríguez
Robert Speicher
Ahmad Sherif
Rémy Coutable
David Turner
Sean McGivern
Bob Van Landuyt