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
27fb64d6a3
Remove deltas_only from DiffCollection
2017-05-11 16:01:10 +02:00
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
d40e1f547e
Enable the Style/TrailingCommaInLiteral cop
...
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
c1174901c6
Merge branch 'deltas-only' into 'master'
...
Don't use DiffCollection for deltas
See merge request !11201
2017-05-09 15:38:38 +00:00
fc0e00bd3c
Remove some unused Gitlab::Git code
2017-05-09 14:51:19 +02:00
48254d187f
Don't use DiffCollection for deltas
2017-05-09 12:27:17 +02:00
37b1b14a16
Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master'
...
Sort the network graph both by commit date and topographically
Closes #30973
See merge request !11057
2017-05-04 13:56:58 +00:00
b44eaf8e07
Sort the network graph both by commit date and topographically.
...
- Previously, we sorted commits by date, which seemed to work okay.
- The one edge case where this failed was when multiple commits have the same
commit date (for example: when a range of commits are cherry picked with a
single command, they all have the same commit date [and different author
dates]).
- Commits with the same commit date would be sorted arbitrarily, and usually
break the network graph.
- This commit solves the problem by both sorting by date, and by sorting
topographically (parents aren't displayed until all their children are
displayed)
- Include review comments from @adamniedzielski
A more detailed explanation is present here:
https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
2017-05-04 04:21:12 +00:00
4faa65d838
Merge branch '31671-merge-request-message-contains-carriage-returns' into 'master'
...
removes the possibility of commit messages having carriage returns
Closes #31671
See merge request !11077
2017-05-03 22:25:50 +00:00
268ec199da
removes the possibility of commit messages having carriage returns
2017-05-03 21:25:57 +01:00
720cc14a75
Refactor Blob support of external storage in preparation of job artifact blobs
2017-05-03 10:20:05 -05:00
5e0e5801f1
Re-enable ref operations with gitaly after not-found fix
2017-05-02 17:17:58 -03:00
780dcf9cdb
Merge branch 'gitaly-branch-tag-count' into 'master'
...
Use Gitaly for getting Branch/Tag counts
Closes gitaly#157
See merge request !10780
2017-05-02 13:17:51 +00:00
fe771b51fd
Fix Gitaly::Commit#is_ancestor
...
- Upgrade Gitaly-version
2017-04-28 16:44:41 +02:00
6f89bd3628
Use Gitaly for getting Branch/Tag counts
...
- Backup-rake-spec fixed. Storage config broken
- Use rugged to compare branch/tag-count in specs
- upgrade gitaly
2017-04-28 13:07:53 +02:00
b73b16798d
Small code tweaks
2017-04-27 12:23:26 -05:00
a7e67604b3
Fix ordering of commits in the network graph.
...
- We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1
- Prior to this upgrade, the default sort order for commits returned by
`Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the
graph relied on.
- While upgrading `rugged`, the MR also changed this default to
`Rugged::SORT_NONE`, which broke commit ordering in the graph.
- This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort
by date, and changes the graph builder `Network::Graph` so it explictly
requests the `:date` sort order
2017-04-27 13:09:54 +00:00
71b6a4ba85
Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING error
2017-04-20 16:10:33 +02:00
d170133bde
Refactor changing files in web UI
2017-04-20 00:37:44 +00:00
d40970bf5e
Normalize sizes in Gitlab::Git::Blob
2017-04-17 13:44:31 -05:00
c43f7d4713
Merge branch 'gitaly-testing' into 'master'
...
Setup and run a Gitaly server for testing if GitalyClient is enabled
See merge request !10298
2017-04-12 09:25:09 +00:00
d6cc8feb6c
Setup and run a Gitaly server for testing if GitalyClient is enabled
2017-04-11 16:00:44 -03:00
ae88355bb8
Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs method
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-10 16:10:18 +02:00
cb20cfa244
Retrieve Git-specific env in Gitlab::Git::Repository#rugged
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-10 16:10:18 +02:00
05aa038c42
Add a Gitlab::Git::Env to store Git-specific env thread-safely
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-10 16:10:18 +02:00
20d415a676
Use Gitlab::Git::Repository#gitaly_... more
2017-04-07 12:53:30 +02:00
Douwe Maan
Robert Speicher
Sean McGivern
Ahmad Sherif
Bob Van Landuyt
Sean McGivern
Douwe Maan
Jacob Vosmaer
Alejandro Rodríguez
Rémy Coutable
Timothy Andrew
Tiago Botelho
Kim "BKC" Carlbäcker
James Lopez