delta/gitlab/gitlab-ce.git/spec/javascripts, branch 34371-ca-main-template gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into 34371-ca-main-template 2017-10-06T19:30:26+00:00 Filipa Lacerda filipa@gitlab.com 2017-10-06T19:30:26+00:00 ddca28d74cbf3027fe73ffdaac5a976feb75b42b * master: (135 commits) Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener spec Gitaly feature flag metadata Add delete issue docs Fix JS lock issue specs Improve redirect uri state and fix all remaining tests Add 1000+ counters (instead of inifnite) to jobs controller Use short path project_clusters_url Change Clusters to Cluster in sidebar Security fix: redirection in google_api/authorizations_controller UX review Fix sidebar title Fix fixture Fix margins in edit form Use utc for time comparision Good old dangling comma Fix wording in the js messages Resetting of active Line + setting it for the async display functions Add some empty spaces Fix failing spec Refactor discussion lock docs Fix almost all unresolved comments from Docs and UX review ... 
* master: (135 commits)
  Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener spec
  Gitaly feature flag metadata
  Add delete issue docs
  Fix JS lock issue specs
  Improve redirect uri state and fix all remaining tests
  Add 1000+ counters (instead of inifnite) to jobs controller
  Use short path project_clusters_url
  Change Clusters to Cluster in sidebar
  Security fix: redirection in google_api/authorizations_controller
  UX review
  Fix sidebar title Fix fixture
  Fix margins in edit form
  Use utc for time comparision
  Good old dangling comma
  Fix wording in the js messages
  Resetting of active Line + setting it for the async display functions
  Add some empty spaces
  Fix failing spec
  Refactor discussion lock docs
  Fix almost all unresolved comments from Docs and UX review
  ...
Merge branch 'ide-fix-back-btn' into 'master' 2017-10-06T17:39:32+00:00 Fatih Acet acetfatih@gmail.com 2017-10-06T17:39:32+00:00 10e3342a06e3f90cacaed6b44c3b205df678fc02 Repo Editor : Fixes Back Button for files + line number jumping for preview and editor See merge request gitlab-org/gitlab-ce!14508 
Repo Editor : Fixes Back Button for files + line number jumping for preview and editor

See merge request gitlab-org/gitlab-ce!14508
 Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' 2017-10-06T17:06:55+00:00 Kamil Trzciński ayufan@ayufan.eu 2017-10-06T17:06:55+00:00 fb70fadaca6d2ce30730e9a6c995ad8e4f0526e3 Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470 
Create Kubernetes cluster on GKE from k8s service

Closes #35954

See merge request gitlab-org/gitlab-ce!14470
 Remove extra empty line 2017-10-06T16:59:22+00:00 Filipa Lacerda filipa@gitlab.com 2017-10-06T16:59:22+00:00 c9cf2ecff69dfd418d44ea46ebca02c2e137e81c 






Moves banner from cycle analytics into a .vue file
2017-10-06T16:55:09+00:00

Filipa Lacerda
filipa@gitlab.com

2017-10-06T16:55:09+00:00

0c9c9c377bc6fee54226ce7fb52965e25c45df28












Merge branch '18608-lock-issues-v2' into 'master'
2017-10-06T16:47:27+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-10-06T16:47:27+00:00

a68a39e34120e0cf67d95e143326d03f61288cdf

Resolve "Lock issue and merge request"

Closes #18608

See merge request gitlab-org/gitlab-ce!14531




Resolve "Lock issue and merge request"

Closes #18608

See merge request gitlab-org/gitlab-ce!14531






Fix JS lock issue specs
2017-10-06T15:30:11+00:00

Sean McGivern
sean@gitlab.com

2017-10-06T15:30:11+00:00

26f6065ec686d16a053e33f031779a8e75f0c5c9












Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-06T15:27:15+00:00

Shinya Maeda
shinya@gitlab.com

2017-10-06T15:27:15+00:00

830c770a532fc94e1b1a70064500c9bd63712de4












Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-06T12:45:46+00:00

Shinya Maeda
shinya@gitlab.com

2017-10-06T12:45:46+00:00

3e26b0dcd113ade77dc8304137c6733cab4c8718












Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-06T12:29:03+00:00

Shinya Maeda
shinya@gitlab.com

2017-10-06T12:29:03+00:00

91e530df246c6898f4e92e8cb61dde6f52304999