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
..
applications	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	2018-02-06 13:28:13 -06:00
concerns	Extend Cluster Applications to allow installation of Prometheus	2017-12-22 17:23:43 +00:00
platforms	Replace "cluster" with "Kubernetes cluster"	2018-02-06 10:05:02 +01:00
providers	Adds Rubocop rule for line break after guard clause	2017-11-16 17:58:29 +01:00
cluster.rb	Cleanup implementation and add cluster finding tests	2018-01-04 13:56:07 +01:00
project.rb	…