GitLab Bot
1d9f78b3a4
Add latest changes from gitlab-org/gitlab@master
2021-07-28 15:09:57 +00:00
GitLab Bot
7e3f469a40
Add latest changes from gitlab-org/gitlab@master
2021-07-21 21:10:10 +00: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
70af1e2e03
Fix 500 error when trying to resolve non-ASCII conflicts in editor
...
When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
always call `lines`, which meant that we didn't get the benefit of the
side-effect from that, where it forced the conflict data itself to UTF-8.
To fix that, make this explicit by separating the `raw_content` (any encoding)
from the `content` (which is either UTF-8, or an exception is raised).
2018-03-23 18:33:14 +00: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
2286681e1c
Add missing attr_accessor to Gitlab::Git::Conflict::File
2017-12-04 16:11:54 -03:00
Alejandro Rodríguez
9fdde3693b
Move line code generation into Gitlab::Git
...
Having a distinct class just for that was a bit overkill
2017-10-12 22:13:05 -03:00
Alejandro Rodríguez
faa9bd402d
Create a Gitlab::Git submodule for conlict-related files
...
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
