diff options
author | Robert Speicher <robert@gitlab.com> | 2018-02-09 22:01:16 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-02-09 22:01:16 +0000 |
commit | 498ade4801a822f8704390b10d178af9fe7987cb (patch) | |
tree | aa27ec6d4b301e98e5957c1e036318f0f05a799f /lib/gitlab/regex.rb | |
parent | 97a59cb7ce2b0049093e0059ac29965f5c745dab (diff) | |
parent | 0d9107374a2caddea61351d2fd5ba619cb69df81 (diff) | |
download | gitlab-ce-498ade4801a822f8704390b10d178af9fe7987cb.tar.gz |
Merge branch 'fix/encoding-to-unsupported-encodings' into 'master'
Return a warning string if we try to encode to unsupported encoding
Closes gitlab-development-kit#321
See merge request gitlab-org/gitlab-ce!17038
Diffstat (limited to 'lib/gitlab/regex.rb')
0 files changed, 0 insertions, 0 deletions