delta/gitlab/gitlab-ce.git/app/assets/javascripts/clusters, branch chart.html.haml-refactor gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480 2018-02-06T19:28:13+00:00 Mike Greiling mike@pixelcog.com 2018-02-06T19:28:13+00:00 47f2754a14549ccd18e4be8b3b6604b378450d6d * 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 ... 
* 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
  ...
Merge branch 'winh-kubernetes-clusters' into 'master' 2018-02-06T15:57:48+00:00 Phil Hughes me@iamphill.com 2018-02-06T15:57:48+00:00 ba62493009c2360018709b660956a6173f3e1515 Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778 
Replace "cluster" with "Kubernetes cluster"

Closes #41963

See merge request gitlab-org/gitlab-ce!16778
 Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" 2018-02-06T14:59:15+00:00 Fabio Busatto fabio@gitlab.com 2018-02-06T14:59:15+00:00 914415c79f4100494b96d5f883f235fd61d62f52 






Replace "cluster" with "Kubernetes cluster"
2018-02-06T09:05:02+00:00

Winnie Hellmann
winnie@gitlab.com

2018-01-29T19:49:00+00:00

0ecd759d73abaee5c08adbd8ab3db651c2522b14












fix eslint and formatting issues
2018-01-31T19:58:27+00:00

Mike Greiling
mike@pixelcog.com

2018-01-31T19:58:27+00:00

e25f383ddc6b867dc4010be10518d79c663d7409












display manage application button only when it is installed
2018-01-31T19:54:04+00:00

Mike Greiling
mike@pixelcog.com

2018-01-31T19:54:04+00:00

a97a4bdcf730c63f2e627682f66698741ba05526












internationalize the "Manage" button label
2018-01-30T23:26:06+00:00

Mike Greiling
mike@pixelcog.com

2018-01-30T23:26:06+00:00

39d5adde9ca10ff284875c456001b08fa21b3197












add button to configure prometheus integration from cluster page
2018-01-30T23:21:59+00:00

Mike Greiling
mike@pixelcog.com

2018-01-30T23:21:59+00:00

40d93ce6b9b31081290c47be8e495ddac8f3dfb0












add manage button to application rows in cluster integration
2018-01-30T23:13:54+00:00

Mike Greiling
mike@pixelcog.com

2018-01-30T23:13:54+00:00

d2688b2855c9a039335da0ad2484aa02a44c1b2b












Generalize toggle_buttons.js
2018-01-26T18:46:38+00:00

Eric Eastwood
contact@ericeastwood.com

2018-01-24T21:54:33+00:00

737236551fbf5c8d4e44a70d7012ac1331322cd8

Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110





Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110