Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-19
Showing
... | @@ -172,6 +172,9 @@ gem 'rainbow', '~> 2.2' | ... | @@ -172,6 +172,9 @@ gem 'rainbow', '~> 2.2' |
# GitLab settings | # GitLab settings | ||
gem 'settingslogic', '~> 2.0.9' | gem 'settingslogic', '~> 2.0.9' | ||
# Linear-time regex library for untrusted regular expressions | |||
gem 're2', '~> 1.0.0' | |||
# Misc | # Misc | ||
gem 'version_sorter', '~> 2.1.0' | gem 'version_sorter', '~> 2.1.0' | ||
... | ... |
Please register or sign in to comment