diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 12:06:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 12:06:13 +0000 |
| commit | 0a850868dfb85086cba8320cee9dac4657dcae6c (patch) | |
| tree | 40d17228fe23d9db7b861fe2a20d024d64c50323 /config | |
| parent | 3744bcc0d10d24104e39985b6833a0ec51791c0a (diff) | |
| download | gitlab-ce-0a850868dfb85086cba8320cee9dac4657dcae6c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/rack_attack_new.rb | 1 | ||||
| -rw-r--r-- | config/locales/sherlock.en.yml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/rack_attack_new.rb b/config/initializers/rack_attack_new.rb index 2812ceb3fd5..b0f7febe427 100644 --- a/config/initializers/rack_attack_new.rb +++ b/config/initializers/rack_attack_new.rb @@ -125,4 +125,5 @@ class Rack::Attack end end +::Rack::Attack.extend_if_ee('::EE::Gitlab::Rack::Attack') # rubocop: disable Cop/InjectEnterpriseEditionModule ::Rack::Attack::Request.prepend_if_ee('::EE::Gitlab::Rack::Attack::Request') diff --git a/config/locales/sherlock.en.yml b/config/locales/sherlock.en.yml index f24b825f585..963e1d6295a 100644 --- a/config/locales/sherlock.en.yml +++ b/config/locales/sherlock.en.yml @@ -30,7 +30,7 @@ en: origin: Origin line: line line_capitalized: Line - copy_to_clipboard: Copy to clipboard + copy_to_clipboard: Copy query_plan: Query Plan events: Events percent: '%' |