Mike Greiling 47f2754a14 Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480 ... * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...		2018-02-06 13:28:13 -06:00
..
components	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	2018-02-06 13:28:13 -06:00
services	Extend Cluster Applications to allow installation of Prometheus	2017-12-22 17:23:43 +00:00
stores	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	2018-02-06 13:28:13 -06:00
clusters_bundle.js	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	2018-02-06 13:28:13 -06:00
clusters_index.js	Generalize toggle_buttons.js	2018-01-26 12:46:38 -06:00
constants.js	Add FE tests for not_installable/scheduled and cluster banner rules	2017-11-06 10:07:19 -06:00
event_hub.js