diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 21:10:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 21:10:25 +0300 |
| commit | f368b4968e55b32dcedfaefe7c31f7a9463454cf (patch) | |
| tree | b3e4652bd0131adf46f4b7e07346a0dbfa32da05 /config | |
| parent | 2c2b5aeac04350b0d3e13d4b52add0b520bf2ebb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/experiment/null_hypothesis.yml | 7 | ||||
| -rw-r--r-- | config/initializers/trusted_proxies.rb | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/config/feature_flags/experiment/null_hypothesis.yml b/config/feature_flags/experiment/null_hypothesis.yml deleted file mode 100644 index 716b0711ef1..00000000000 --- a/config/feature_flags/experiment/null_hypothesis.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -name: null_hypothesis -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45840 -rollout_issue_url: -type: experiment -group: group::adoption -default_enabled: false diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb index 93c4d2b10cc..a4528020c06 100644 --- a/config/initializers/trusted_proxies.rb +++ b/config/initializers/trusted_proxies.rb @@ -30,4 +30,4 @@ module TrustedProxyMonkeyPatch end end -ActionDispatch::Request.send(:include, TrustedProxyMonkeyPatch) +ActionDispatch::Request.include TrustedProxyMonkeyPatch |