status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:hashicorp/consul into Telemetry

This commit is contained in:
Siva 2018-07-03 10:48:31 -04:00
parent 9579ba4e12 7f35ca33f4
commit 7baae933e6
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-v2/app/styles/components/icons.scss
View File

@ -152,18 +152,18 @@
} }
%with-right-arrow-grey { %with-right-arrow-grey {
@extend %pseudo-icon; @extend %pseudo-icon;
background-image: url('data:image/svg+xml;charset=UTF-8,<svg width="13" height="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path fill="%23919FA8" d="M7.526.219l-.958.924L10.4 4.84H0v1.32h10.4L6.568 9.857l.958.924L13 5.5z"/></svg>'); background-image: url('data:image/svg+xml;charset=UTF-8,<svg width="13" height="11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path fill="%23919FA8" d="M7.526.219l-.958.924L10.4 4.84H0v1.32h10.4L6.568 9.857l.958.924L13 5.5z"/></svg>');
} }
%with-deny-icon { %with-deny-icon {
@extend %pseudo-icon; @extend %pseudo-icon;
background-image: url('data:image/svg+xml;charset=UTF-8,<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#282C2E" d="M8.79 4l-.737.71L11 7.556H3V8.57h8l-2.947 2.844.736.711L13 8.062z"/><rect stroke="#C73445" stroke-width="1.5" x=".75" y=".75" width="14.5" height="14.5" rx="7.25"/><path d="M3.5 3.5l9 9" stroke="#C73445" stroke-width="1.5" stroke-linecap="square"/></g></svg>'); background-image: url('data:image/svg+xml;charset=UTF-8,<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="%23282C2E" d="M8.79 4l-.737.71L11 7.556H3V8.57h8l-2.947 2.844.736.711L13 8.062z"/><rect stroke="%23C73445" stroke-width="1.5" x=".75" y=".75" width="14.5" height="14.5" rx="7.25"/><path d="M3.5 3.5l9 9" stroke="%23C73445" stroke-width="1.5" stroke-linecap="square"/></g></svg>');
width: 16px; width: 16px;
height: 16px; height: 16px;
background-color: transparent; background-color: transparent;
} }
%with-deny-icon-grey { %with-deny-icon-grey {
@extend %pseudo-icon; @extend %pseudo-icon;
background-image: url('data:image/svg+xml;charset=UTF-8,<svg width="14" height="14" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="%23919FA8" d="M7.79 2.992l-.737.711L10 6.547H2v1.016h8l-2.947 2.843.736.711L12 7.055z"/><rect stroke="#919FA8" stroke-width="1.5" x=".75" y=".75" width="12.5" height="12.5" rx="6.25"/><path d="M3.063 3.063l7.874 7.874" stroke="%23919FA8" stroke-width="1.5" stroke-linecap="square"/></g></svg>'); background-image: url('data:image/svg+xml;charset=UTF-8,<svg width="14" height="14" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="%23919FA8" d="M7.79 2.992l-.737.711L10 6.547H2v1.016h8l-2.947 2.843.736.711L12 7.055z"/><rect stroke="%23919FA8" stroke-width="1.5" x=".75" y=".75" width="12.5" height="12.5" rx="6.25"/><path d="M3.063 3.063l7.874 7.874" stroke="%23919FA8" stroke-width="1.5" stroke-linecap="square"/></g></svg>');
} }
%with-deny::before { %with-deny::before {
@extend %with-deny-icon; @extend %with-deny-icon;

1
ui-v2/tests/acceptance/startup.feature
View File

@ -3,7 +3,6 @@ Feature: startup
In order to give users an indication as early as possible that they are at the right place In order to give users an indication as early as possible that they are at the right place
As a user As a user
I should be able to see a startup logo I should be able to see a startup logo
@ignore
Scenario: When loading the index.html file into a browser Scenario: When loading the index.html file into a browser
Given 1 datacenter model with the value "dc-1" Given 1 datacenter model with the value "dc-1"
Then the url should be '' Then the url should be ''

15
ui-v2/tests/helpers/yadda-annotations.js
View File

@ -3,6 +3,18 @@ import { skip } from 'qunit';
import { setupApplicationTest, setupRenderingTest, setupTest } from 'ember-qunit'; import { setupApplicationTest, setupRenderingTest, setupTest } from 'ember-qunit';
import api from 'consul-ui/tests/helpers/api'; import api from 'consul-ui/tests/helpers/api';
const staticClassList = [...document.documentElement.classList];
function reset() {
window.localStorage.clear();
api.server.reset();
const list = document.documentElement.classList;
while (list.length > 0) {
list.remove(list.item(0));
}
staticClassList.forEach(function(item) {
list.add(item);
});
}
// this logic could be anything, but in this case... // this logic could be anything, but in this case...
// if @ignore, then return skip (for backwards compatibility) // if @ignore, then return skip (for backwards compatibility)
// if have annotations in config, then only run those that have a matching annotation // if have annotations in config, then only run those that have a matching annotation
@ -64,8 +76,7 @@ function setupScenario(featureAnnotations, scenarioAnnotations) {
} }
return function(model) { return function(model) {
model.afterEach(function() { model.afterEach(function() {
window.localStorage.clear(); reset();
api.server.reset();
}); });
}; };
// return setupFn; // return setupFn;

2
website/source/docs/connect/proxies.html.md
View File

@ -41,7 +41,7 @@ The default managed proxy is a basic proxy built-in to Consul and written
in Go. Having a basic built-in proxy allows Consul to have a sane default in Go. Having a basic built-in proxy allows Consul to have a sane default
with performance that is good enough for most workloads. In some basic with performance that is good enough for most workloads. In some basic
benchmarks, the service-to-service communication over the built-in proxy benchmarks, the service-to-service communication over the built-in proxy
could sustain 5 Gbps with a per-hop latency of less than X microseconds. Therefore, could sustain 5 Gbps with sub-millisecond latency. Therefore,
the performance impact of even the basic built-in proxy is minimal. the performance impact of even the basic built-in proxy is minimal.
Consul will be Consul will be