GitLab Bot
7e3f469a40
Add latest changes from gitlab-org/gitlab@master
2021-07-21 21:10:10 +00:00
GitLab Bot
6b8af95df6
Add latest changes from gitlab-org/gitlab@master
2021-07-07 09:08:35 +00:00
GitLab Bot
9f5ac379c7
Add latest changes from gitlab-org/gitlab@master
2021-02-11 12:08:52 +00:00
GitLab Bot
8d96319c80
Add latest changes from gitlab-org/gitlab@master
2020-07-01 00:09:02 +00:00
GitLab Bot
c59765a50a
Add latest changes from gitlab-org/gitlab@master
2020-06-24 18:09:03 +00:00
GitLab Bot
7c077d9603
Add latest changes from gitlab-org/gitlab@master
2019-10-18 00:07:45 +00:00
GitLab Bot
81f7adf08b
Add latest changes from gitlab-org/gitlab@master
2019-09-19 18:06:18 +00:00
Stan Hu
df650eaae5
Force source and target branch to binary mode
2019-06-10 20:50:00 -07:00
Stan Hu
1edf1807c5
Fix UTF-8 conversion issues when resolving conflicts
...
Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/63030 ,
when the commit message in the /resolve_conflicts endpoint contains a
UTF-8 character, the conversion to the Gitaly ASCII-8BIT value may flag
an error. To fix this, we run `force_encoding` on the commit message.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63062
2019-06-10 15:54:14 -07:00
Bob Van Landuyt
8c5b3d0302
Allow streaming io objects into Gitaly
...
This allows us to set the encoding of an IO passed without reading it
into memory.
This is useful if we want to stream files into Gitaly. Like we do when
uploading a new file to the repository.
2019-04-01 20:17:40 +02:00
gfyoung
ebf98f27c4
Enable even more frozen string in lib/gitlab
...
Enables frozen string for the following:
* lib/gitlab/fogbugz_import/**/*.rb
* lib/gitlab/gfm/**/*.rb
* lib/gitlab/git/**/*.rb
* lib/gitlab/gitaly_client/**/*.rb
* lib/gitlab/gitlab_import/**/*.rb
* lib/gitlab/google_code_import/**/*.rb
* lib/gitlab/gpg/**/*.rb
* lib/gitlab/grape_logging/**/*.rb
* lib/gitlab/graphql/**/*.rb
* lib/gitlab/graphs/**/*.rb
* lib/gitlab/hashed_storage/**/*.rb
* lib/gitlab/health_checks/**/*.rb
Partially address gitlab-org/gitlab-ce#47424 .
2018-11-13 11:42:15 -08:00
Sean McGivern
57fc7cd8f3
Make sure ConflictsService does not raise for conflicting submodules
2018-07-10 15:06:20 +01:00
Andrew Newdigate
583635f0c8
Updated Gitaly timeout values
2018-07-05 16:05:24 +00:00
Ahmad Sherif
0b965528c6
GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
2018-01-23 22:16:51 +01:00
Ahmad Sherif
b4b267b739
Migrate Repository#can_be_merged? to Gitaly
2018-01-11 16:40:13 +01:00
Jacob Vosmaer
ce09dc3182
Fix method lookup
2018-01-03 12:45:53 +01:00
Alejandro Rodríguez
65e3a1e9e9
Simplify conflict resolution interface and code
...
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly
2018-01-02 16:22:02 -03:00
Alejandro Rodríguez
0aa87bbe13
Incorporate ConflictsService.ResolveConflicts Gitaly RPC
2017-12-27 15:14:25 -03:00
Alejandro Rodríguez
351f205c05
Incorporate ConflictsService.ListConflictFiles Gitaly RPC
2017-12-27 15:12:30 -03:00
