summaryrefslogtreecommitdiff
path: root/lib/api/settings.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-08-16 20:57:38 +0000
committerStan Hu <stanhu@gmail.com>2018-08-16 20:57:38 +0000
commit6fc10af5a9ab5ab81e4e9e3666ced7b4ea87c176 (patch)
tree3191c3cf6bf05c77c7366c1e012cea9053cad757 /lib/api/settings.rb
parentf18bb9d5f2a5c52ed0b6311302ee05c641458a01 (diff)
parent84af372fc3d75e151d62102ff3acb42beb62b6a1 (diff)
downloadgitlab-ce-6fc10af5a9ab5ab81e4e9e3666ced7b4ea87c176.tar.gz
Merge branch 'rouge_3.2.1' into 'master'
Update Rouge to 3.2.1. Includes a critical fix for the Perl Lexer See merge request gitlab-org/gitlab-ce!21263
Diffstat (limited to 'lib/api/settings.rb')
0 files changed, 0 insertions, 0 deletions