kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
105011 commits 1 branch 0 tags 899 MiB
Commit graph

4 commits

Author SHA1 Message Date
GitLab Bot
7c077d9603 Add latest changes from gitlab-org/gitlab@master 2019-10-18 00:07:45 +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
Ahmad Sherif
b4b267b739 Migrate Repository#can_be_merged? to Gitaly 2018-01-11 16:40:13 +01:00