Commit graph

22 commits

Author SHA1 Message Date
Sean McGivern
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
micael.bergeron
46f6092a6d [ci-skip] spec for an instance method 2017-09-06 09:44:12 -04:00
micael.bergeron
5625b0e453 add .json_safe_diff spec 2017-09-06 09:01:53 -04:00
Jacob Vosmaer
65f83941c3 Make gl_repository a G::G::Repository attribute 2017-08-23 10:45:20 +02:00
Rémy Coutable
a97208dde7 Merge branch 'bvl-enable-features-in-test' into 'master'
Enable all feature flags by default in specs

See merge request !12832
2017-07-13 12:24:31 +00:00
Bob Van Landuyt
3ee48e422d Enable all feature flags by default in specs
Otherwise some features would go untested in non-specific contexts

I did need to disable the
`gitlab_git_diff_size_limit_increase`-feature in some specs since we
depend on diffs being expandable while the file we are testing on is
smaller than the increased limit.
2017-07-13 13:00:34 +02:00
Jacob Vosmaer
0b0e89ef7b Try to eliminate unused diff options 2017-07-12 18:28:29 +02:00
Jacob Vosmaer
8a62f304ef Add a UTF-8 encoding matcher 2017-06-30 14:32:42 +02:00
Ahmad Sherif
5b092d21cc Encode Gitaly diff patches properly 2017-06-22 03:12:23 +02:00
Grzegorz Bizon
0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Sean McGivern
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
Douwe Maan
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
Sean McGivern
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
Ahmad Sherif
4d1e987ec3 Use the new Gitaly CommitDiff RPC 2017-06-02 18:33:18 +02:00
Douwe Maan
ce869e3964 Fix Diff#too_large? and specs 2017-05-30 21:48:30 -05:00
Douwe Maan
aed0387f97 Consistent diff and blob size limit names 2017-05-29 17:02:02 -05:00
Rémy Coutable
3db37e0562 Enable the Style/TrailingCommaInArguments cop
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
Alejandro Rodríguez
267cd3e359 Incorporate Gitaly client for refs service 2017-04-04 16:53:44 +02:00
Ahmad Sherif
c0a4f527db Use Gitaly for CommitController#show 2017-03-15 12:52:11 +02:00
Robert Speicher
a00578ce5c Absorb gitlab_git 2017-01-04 19:09:28 -05:00
Dmitriy Zaporozhets
4f2d2c90f7 Move Gitlab::Git out of gitlab core 2013-04-27 23:50:17 +03:00
Dmitriy Zaporozhets
be41d0e1bf Gitlab::Git::Diff specs 2013-04-16 16:30:16 +03:00