Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "auth proxy: use real ip when validating white listed ip's" #12444

Merged
merged 1 commit into from
Jun 28, 2018

Conversation

marefr
Copy link
Contributor

@marefr marefr commented Jun 28, 2018

Revert of "Whitelist proxy IP address instead of client IP address" introduced in 5.2.0-beta2 (#12299).

@marefr marefr merged commit d226383 into master Jun 28, 2018
@marefr marefr deleted the revert-12299-10707_whitelist branch June 28, 2018 14:31
@marefr marefr added this to the 5.2.1 milestone Jun 28, 2018
marefr added a commit that referenced this pull request Jun 28, 2018
ryantxu added a commit to NatelEnergy/grafana that referenced this pull request Jun 29, 2018
* grafana/master:
  changelog: update
  changelog: update
  changelog: add notes about closing grafana#12438
  alerting: only log when screenshot been uploaded
  fixes typos
  changelog: add notes about closing grafana#12444
  Revert "auth proxy: use real ip when validating white listed ip's"
  changelog: adds note for grafana#11892
  changelog: add notes about closing grafana#12430
  fix footer css issue
  Karma to Jest: 3 test files (grafana#12414)
  fix: log close/flush was done too early, before server shutdown log message was called, fixes grafana#12438
  Karma to Jest: value_select_dropdown (grafana#12435)
  support passing api token in Basic auth password (grafana#12416)
  Add disabled styles for checked checkbox (grafana#12422)
  Make pre/postfix coloring checkboxes inactive when gauge is active
  Add options to colorize prefix and postfix in singlestat
bergquist added a commit that referenced this pull request Jun 29, 2018
* master: (34 commits)
  registry: adds comments to interfaces
  changelog: update
  changelog: update
  changelog: add notes about closing #12438
  alerting: only log when screenshot been uploaded
  fixes typos
  changelog: add notes about closing #12444
  Revert "auth proxy: use real ip when validating white listed ip's"
  changelog: adds note for #11892
  changelog: add notes about closing #12430
  fix footer css issue
  Karma to Jest: 3 test files (#12414)
  fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
  Karma to Jest: value_select_dropdown (#12435)
  support passing api token in Basic auth password (#12416)
  Add disabled styles for checked checkbox (#12422)
  changelog: add notes about closing #11920
  changelog: add notes about closing #11920
  changelog: update
  docs: upd what's new in v5.2
  ...
bergquist added a commit that referenced this pull request Jun 29, 2018
* master: (95 commits)
  registry: adds more comments
  registry: adds comments to interfaces
  changelog: update
  changelog: update
  changelog: add notes about closing #12438
  alerting: only log when screenshot been uploaded
  fixes typos
  changelog: add notes about closing #12444
  Revert "auth proxy: use real ip when validating white listed ip's"
  changelog: adds note for #11892
  changelog: add notes about closing #12430
  fix footer css issue
  Karma to Jest: 3 test files (#12414)
  fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
  Karma to Jest: value_select_dropdown (#12435)
  support passing api token in Basic auth password (#12416)
  Add disabled styles for checked checkbox (#12422)
  changelog: add notes about closing #11920
  changelog: add notes about closing #11920
  changelog: update
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant