delta/gitlab/gitlab-ce.git/spec/javascripts/clusters, branch docs/ssh-win gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into 'prettify-all-the-karma-specs' 2018-10-17T21:50:44+00:00 Mike Greiling mike@pixelcog.com 2018-10-17T21:50:44+00:00 7f1b934e514099c1743167858ebf5be69e05d71a # Conflicts: # spec/javascripts/clusters/components/application_row_spec.js 
# Conflicts:
#   spec/javascripts/clusters/components/application_row_spec.js
 Merge branch '7493-configuring-prometheus-alerts-causes-cluster-install-page-to-display-error-message' into 'master' 2018-10-17T21:41:52+00:00 Mike Greiling mike@pixelcog.com 2018-10-17T21:41:52+00:00 1d7453d31078dfec0adbcdad89e15b885a6dbd0d Backport: Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message" See merge request gitlab-org/gitlab-ce!22408 
Backport: Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message"

See merge request gitlab-org/gitlab-ce!22408
 Add missing state on the application row component 2018-10-17T17:09:32+00:00 Jose Vargas jvargas@gitlab.com 2018-10-16T21:56:07+00:00 d4763515c1ec40f2dadf85736d51eecc80a8d18b This fixes the application row component weird state when an `updating` status is fetched, this causes apps to show as uninstalled even though they are installed in the cluster. 
This fixes the application row component weird state when an
`updating` status is fetched, this causes apps to show as uninstalled
even though they are installed in the cluster.
Resolve eslint violations 2018-10-17T16:18:17+00:00 Mike Greiling mike@pixelcog.com 2018-10-17T07:21:28+00:00 7a3e605350fd501661d2cd0fe72440bf0773f4b7 






Prettify all spec files
2018-10-17T16:18:17+00:00

Mike Greiling
mike@pixelcog.com

2018-10-17T07:13:26+00:00

f666026d71ebefd70219d5078b1f0c83fa01f84d












enable jasmine/new-line-before-expect
2018-10-17T04:57:29+00:00

Johann Hubert Sonntagbauer
johann.sonntagbauer@gmail.com

2018-10-09T18:03:09+00:00

6f5723a169b5d400c136dbd844fc54c68e5f8563












Fix UI error whereby prometheus application status is updated
2018-08-07T19:05:43+00:00

Clement Ho
clemmakesapps@gmail.com

2018-08-07T19:05:43+00:00

83badd07f783880079ecfb4f47705fe62760b8da












Toggle Show / Hide Button for Kubernetes Password
2018-07-18T15:57:25+00:00

gfyoung
gfyoung17@gmail.com

2018-07-16T20:59:37+00:00

510ea543d190866202cd4f1bbb378c263fc9765c

Closes #49193.





Closes #49193.







Use nip.io instead of xip.io for jupyter domain suggestion
2018-06-08T09:03:21+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2018-06-08T09:03:21+00:00

a904314941d42c41cab7760a154a1fcb3585dc27

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Changes after review
2018-05-28T09:17:17+00:00

Filipa Lacerda
filipa@gitlab.com

2018-05-28T09:17:17+00:00

08216d2e58edea388d334077ccfce7d842292319