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
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
33aed43e9d
Avoid crash when trying to parse string with invalid UTF-8 sequence
2017-05-30 15:05:52 +00:00
aed0387f97
Consistent diff and blob size limit names
2017-05-29 17:02:02 -05:00
fcdc427972
Add test that shows DiffCollection restart bug
2017-05-23 18:45:58 +02: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
cf09c826a5
Re-enable gitaly migration for ref_name_for_sha after bugfixes
2017-05-16 11:43:37 -04: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
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
185fd98fd4
Merge branch 'fix-gitaly-not-found' into 'master'
...
Re-enable ref operations with gitaly after not-found fix
See merge request !10773
2017-05-02 22:32:34 +00:00
2a73f0a638
Merge branch 'rs-described_class-cop-2' into 'master'
...
Enable `RSpec/DescribedClass` cop and correct violations
See merge request !10930
2017-05-02 22:30:30 +00:00
5e0e5801f1
Re-enable ref operations with gitaly after not-found fix
2017-05-02 17:17:58 -03:00
d49768296c
Auto-correct `RSpec/DescribedClass` violations
2017-05-01 11:13:33 -04:00
a998710a3b
Fix RSpec
2017-04-28 13:07:54 +02: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
d6f49b85f1
Fix specs
2017-04-17 18:31:23 -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
267cd3e359
Incorporate Gitaly client for refs service
2017-04-04 16:53:44 +02:00
ed5d59d4c4
Fix symlink icon in project tree
2017-04-02 14:42:37 +03:00
53819c5ac6
Support >1 path in Gitlab::Git::Repository#log
...
This is analogous to `git log -- foo bar baz`, but not the same as
`Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git
log -- 'foo bar baz'`.
2017-03-30 10:21:19 +01:00
def164e761
Fix RSpec/DescribeSymbol cop violations
2017-03-24 19:04:03 -04:00
5409a3c5b7
Merge branch 'feature/use-gitaly-for-commit-show' into 'master'
...
Use Gitaly for CommitController#show
See merge request !9629
2017-03-17 17:41:44 +00:00
4597654079
Fix archive prefix bug for refs containing dots
2017-03-16 21:04:58 +05:30
c0a4f527db
Use Gitaly for CommitController#show
2017-03-15 12:52:11 +02:00
464ca33747
Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different gitlab-git-test repo
...
We will set this to the dev mirror in GitLab CE and EE on dev.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-14 18:30:53 +01:00
d13451cd49
Returns correct header data for commits endpoint
2017-03-07 22:56:31 -03:00
c46f933bb7
Fix pagination headers for repository commits api endpoint
2017-03-07 22:56:31 -03:00
3ac54d22b9
Ensure archive download is only one directory deep
2017-03-02 10:30:24 +05:30
cecfcc2edd
Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master'
...
Make Git history follow renames again by performing the --skip in Ruby
Closes #23062
See merge request !9314
2017-02-25 19:58:05 +00:00
a530e9da35
Address review
2017-02-24 09:55:01 -06:00
0625af3bcb
Consistently create, update, and delete files, taking CRLF settings into account
2017-02-24 09:55:01 -06:00
9720bcd83d
Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-02-23 19:06:00 +01:00
3eb0354061
Make Git history follow renames again by performing the --skip in Ruby
...
This hack is needed because of an issue when --follow and --skip
are passed to git log at the same time.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/23062
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-02-23 19:06:00 +01:00
1fe7501b49
Revert "Prefer leading style for Style/DotPosition"
...
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
2017-02-23 09:33:05 -06:00
7d4b52b27d
Enable Style/WordArray
2017-02-23 09:32:41 -06: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
Robert Speicher
Kim "BKC" Carlbäcker
James Lopez
mhasbini
Mark Fletcher
Oswaldo Ferreira
George Andrinopoulos