diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/editor/tinymce/plugins/moodlenolink/tinymce/editor_plugin.js b/lib/editor/tinymce/plugins/moodlenolink/tinymce/editor_plugin.js
index <HASH>..<HASH> 100644
--- a/lib/editor/tinymce/plugins/moodlenolink/tinymce/editor_plugin.js
+++ b/lib/editor/tinymce/plugins/moodlenolink/tinymce/editor_plugin.js
@@ -43,6 +43,10 @@
ed.onNodeChange.add(function(ed, cm, n) {
var p, c;
c = cm.get('moodlenolink');
+ if (!c) {
+ // Button not used.
+ return;
+ }
p = ed.dom.getParent(n, 'SPAN');
c.setActive(p && ed.dom.hasClass(p, 'nolink'));
|
MDL-<I> fix JS error when moodlenolink button not present in toolbar
Thanks Rossiani Wijaya for discovering this issue!
|
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java
index <HASH>..<HASH> 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java
@@ -19,6 +19,7 @@ import com.google.api.client.http.HttpHeaders;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpResponse;
import com.google.api.client.http.HttpTransport;
+import com.google.api.client.util.Beta;
import java.io.IOException;
import java.net.SocketTimeoutException;
@@ -30,6 +31,7 @@ import java.util.logging.Logger;
/**
* Utilities used by the com.google.api.client.googleapis.auth.oauth2 namespace.
*/
+@Beta
public class OAuth2Utils {
static final Charset UTF_8 = Charset.forName("UTF-8");
|
Mark OAuth2Utils as Beta
It isn't really meant to be used generally, but needs to be exposed for
the different components to reuse code.
|
diff --git a/visidata/settings.py b/visidata/settings.py
index <HASH>..<HASH> 100644
--- a/visidata/settings.py
+++ b/visidata/settings.py
@@ -308,8 +308,8 @@ def loadConfigAndPlugins(vd, args):
options.visidata_dir = args.visidata_dir or os.getenv('VD_DIR', '') or options.visidata_dir
options.config = args.config or os.getenv('VD_CONFIG', '') or options.config
- sys.path.append(visidata.Path(options.visidata_dir))
- sys.path.append(visidata.Path(options.visidata_dir)/"plugin-deps")
+ sys.path.append(str(visidata.Path(options.visidata_dir)))
+ sys.path.append(str(visidata.Path(options.visidata_dir)/"plugin-deps"))
# import plugins from .visidata/plugins before .visidatarc, so plugin options can be overridden
for modname in (args.imports or options.imports or '').split():
|
[plugins-] sys.path needs str #<I>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -9,19 +9,16 @@ var normalizeArgs = require('./normalize-args');
module.exports = function (opts) {
opts = normalizeArgs(arguments);
- var cliPath;
- var location;
+ var cliPath = resolveSync(opts.path, process.cwd());
+ var location = 'local';
- try {
- cliPath = resolveSync(opts.path, process.cwd());
- location = 'local';
- } catch (e) {
- try {
- cliPath = resolveSync(opts.relative, dirname(caller()));
- location = 'global';
- } catch (e) {
- throw new Error('fallback-cli could not find global', e);
- }
+ if (!cliPath) {
+ cliPath = resolveSync(opts.relative, dirname(caller()));
+ location = 'global';
+ }
+
+ if (!cliPath) {
+ throw new Error('fallback-cli could not find local or global');
}
runAsync(opts.before, doRequire, location, cliPath);
@@ -36,5 +33,9 @@ module.exports = function (opts) {
};
function resolveSync(path, basedir) {
- return resolve.sync(path, {basedir: basedir});
+ try {
+ return resolve.sync(path, {basedir: basedir});
+ } catch (e) {
+ return null;
+ }
}
|
return null from `resolveSync` instead of throwing an error
|
diff --git a/src/primitives/a-tube.js b/src/primitives/a-tube.js
index <HASH>..<HASH> 100644
--- a/src/primitives/a-tube.js
+++ b/src/primitives/a-tube.js
@@ -15,7 +15,7 @@ module.exports.Primitive = AFRAME.registerPrimitive('a-tube', {
path: 'tube.path',
segments: 'tube.segments',
radius: 'tube.radius',
- radialSegments: 'tube.radialSegments',
+ 'radial-segments': 'tube.radialSegments',
closed: 'tube.closed'
}
});
@@ -56,6 +56,13 @@ module.exports.Component = AFRAME.registerComponent('tube', {
this.el.setObject3D('mesh', this.mesh);
},
+ update: function (prevData) {
+ if (!Object.keys(prevData).length) return;
+
+ this.remove();
+ this.init();
+ },
+
remove: function () {
if (this.mesh) this.el.removeObject3D('mesh');
}
|
[a-tube] Fix primitive and update issues. (fixes #<I>, #<I>)
|
diff --git a/swim/heal_via_discover_provider.go b/swim/heal_via_discover_provider.go
index <HASH>..<HASH> 100644
--- a/swim/heal_via_discover_provider.go
+++ b/swim/heal_via_discover_provider.go
@@ -131,7 +131,6 @@ func (h *discoverProviderHealer) Heal() ([]string, error) {
}
h.previousHostListSize = len(hostList)
- util.ShuffleStringsInPlace(hostList)
// collect the targets this node might want to heal with
var targets []string
@@ -141,6 +140,7 @@ func (h *discoverProviderHealer) Heal() ([]string, error) {
targets = append(targets, address)
}
}
+ util.ShuffleStringsInPlace(targets)
// filter hosts that we already know about and attempt to heal nodes that
// are complementary to the membership of this node.
|
Don’t change the hostlist in place to prevent race conditions when a discovery provider returns the reference to a static hostlist. (#<I>)
|
diff --git a/lib/fog/aws/requests/rds/describe_db_instances.rb b/lib/fog/aws/requests/rds/describe_db_instances.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/aws/requests/rds/describe_db_instances.rb
+++ b/lib/fog/aws/requests/rds/describe_db_instances.rb
@@ -58,7 +58,7 @@ module Fog
end
when "rebooting" # I don't know how to show rebooting just once before it changes to available
# it applies pending modified values
- if server["PendingModifiedValues"]
+ unless server["PendingModifiedValues"].empty?
server.merge!(server["PendingModifiedValues"])
server["PendingModifiedValues"] = {}
self.data[:tmp] ||= Time.now + Fog::Mock.delay * 2
@@ -69,13 +69,13 @@ module Fog
end
when "modifying"
# TODO there are some fields that only applied after rebooting
- if server["PendingModifiedValues"]
+ unless server["PendingModifiedValues"].empty?
server.merge!(server["PendingModifiedValues"])
server["PendingModifiedValues"] = {}
server["DBInstanceStatus"] = 'available'
end
when "available" # I'm not sure if amazon does this
- if server["PendingModifiedValues"]
+ unless server["PendingModifiedValues"].empty?
server["DBInstanceStatus"] = 'modifying'
end
|
fix for RDS mocking to avoid state flipping between "modifying" and "available"
|
diff --git a/everest/entities/aggregates.py b/everest/entities/aggregates.py
index <HASH>..<HASH> 100644
--- a/everest/entities/aggregates.py
+++ b/everest/entities/aggregates.py
@@ -168,18 +168,14 @@ class OrmAggregate(Aggregate):
return ent
def iterator(self):
- if not self._relationship is None:
- # We need a flush here because we may have newly added entities
- # in the aggregate which need to get an ID *before* we build the
- # relation filter spec.
- self._session.flush()
if self.__defaults_empty:
raise StopIteration()
else:
- # We need a flush here because we may have newly added entities
- # in the aggregate which need to get an ID *before* we build the
- # query expression.
- self._session.flush()
+ if len(self._session.new) > 0:
+ # We need a flush here because we may have newly added
+ # entities in the aggregate which need to get an ID *before*
+ # we build the query expression.
+ self._session.flush()
query = self._get_data_query()
for obj in iter(query):
yield obj
|
Optimized OrmAggregate.iterator.
|
diff --git a/app/lib/actions/katello/repository/import_upload.rb b/app/lib/actions/katello/repository/import_upload.rb
index <HASH>..<HASH> 100644
--- a/app/lib/actions/katello/repository/import_upload.rb
+++ b/app/lib/actions/katello/repository/import_upload.rb
@@ -13,6 +13,10 @@ module Actions
plan_action(FinishUpload, repository, import_upload.output)
end
+ def rescue_strategy
+ Dynflow::Action::Rescue::Skip
+ end
+
def humanized_name
_("Upload into")
end
|
Fixes #<I> - Handle bad upload errors (#<I>)
|
diff --git a/src/mako/session/Session.php b/src/mako/session/Session.php
index <HASH>..<HASH> 100644
--- a/src/mako/session/Session.php
+++ b/src/mako/session/Session.php
@@ -198,7 +198,7 @@ class Session
protected function generateId()
{
- return md5(UUID::v4());
+ return sha1(UUID::v4() . uniqid('session', true));
}
/**
|
Added more randomness to session IDs
|
diff --git a/test/host/node_loader.js b/test/host/node_loader.js
index <HASH>..<HASH> 100644
--- a/test/host/node_loader.js
+++ b/test/host/node_loader.js
@@ -42,12 +42,15 @@
global.gpfSourcesPath = "../../src/";
}
- if ("release" === global.version) {
+ if (options.release) {
+ console.log("Using release version");
global.gpf = require("../../build/gpf.js");
- } else if ("debug" === global.version) {
+ } else if (options.debug) {
+ console.log("Using debug version");
global.gpf = require("../../build/gpf-debug.js");
// Sources are included
} else {
+ console.log("Using source version");
require("../../src/boot.js");
}
|
Implemented version switch
was not working...
|
diff --git a/Gemfile b/Gemfile
index <HASH>..<HASH> 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
source "https://rubygems.org"
-# Specify your gem"s dependencies in sensu-transport.gemspec
+# Specify your gem's dependencies in sensu-transport.gemspec
gemspec
diff --git a/lib/sensu/transport/base.rb b/lib/sensu/transport/base.rb
index <HASH>..<HASH> 100644
--- a/lib/sensu/transport/base.rb
+++ b/lib/sensu/transport/base.rb
@@ -48,7 +48,9 @@ module Sensu
def connect(options={}); end
# Reconnect to the transport.
- def reconnect; end
+ #
+ # @param force [Boolean] the reconnect.
+ def reconnect(force=false); end
# Indicates if connected to the transport.
#
diff --git a/lib/sensu/transport/rabbitmq.rb b/lib/sensu/transport/rabbitmq.rb
index <HASH>..<HASH> 100644
--- a/lib/sensu/transport/rabbitmq.rb
+++ b/lib/sensu/transport/rabbitmq.rb
@@ -14,7 +14,7 @@ module Sensu
connect_with_eligible_options
end
- def reconnect
+ def reconnect(force=false)
unless @reconnecting
@reconnecting = true
@before_reconnect.call
|
[redis-transport] updated transport api reconnect() to include force param
|
diff --git a/event/event.js b/event/event.js
index <HASH>..<HASH> 100644
--- a/event/event.js
+++ b/event/event.js
@@ -56,7 +56,7 @@ $.ready = function() {
};
// If Mozilla is used
-if ( $.browser == "mozilla" ) {
+if ( $.browser == "mozilla" || $.browser == "opera" ) {
// Use the handy event callback
document.addEventListener( "DOMContentLoaded", $.ready, null );
@@ -79,8 +79,8 @@ if ( $.browser == "mozilla" ) {
// Clear from memory
script = null;
-// If Safari or Opera is used
-} else {
+// If Safari is used
+} else if ( $.browser == "safari" ) {
$.$$timer = setInterval(function(){
if ( document.readyState == "loaded" ||
document.readyState == "complete" ) {
|
DOMContentLoaded works in Opera 9b2+, so I have it firing for that now too - the means that there is a DOM Ready solution for every major browser! (Older version of Opera simply fallback to window.onload)
|
diff --git a/runtests.py b/runtests.py
index <HASH>..<HASH> 100644
--- a/runtests.py
+++ b/runtests.py
@@ -30,6 +30,7 @@ if not settings.configured:
ROOT_URLCONF='allaccess.tests.urls',
LOGIN_URL='/login/',
LOGIN_REDIRECT_URL='/',
+ USE_TZ=True,
)
|
Ensure tests are run with timezone support active. Currently passes without any warnings. Fixes #<I>
|
diff --git a/src/lib/skemer.js b/src/lib/skemer.js
index <HASH>..<HASH> 100644
--- a/src/lib/skemer.js
+++ b/src/lib/skemer.js
@@ -55,7 +55,7 @@ function shouldReplace(context) {
* new value or a default value. Otherwise, the new value
*/
function setValueToType(context) {
- var t, value;
+ var t, value, parts;
//console.log('\nsetValueToType', util.inspect(context, {depth: null}));
if (context.schema.types) {
//console.log('have types, checking for value', context.schema, context.newData);
@@ -133,7 +133,7 @@ function setValueToType(context) {
case 'boolean':
if (context.newData !== undefined) {
if (typeof context.newData === context.schema.type) {
- var parts = [];
+ parts = [];
if (context.schema.type === 'number') {
if ((context.schema.min !== undefined
&& context.newData < context.schema.min)
@@ -185,7 +185,7 @@ function setValueToType(context) {
case 'date':
if (context.newData !== undefined) {
if (typeof context.newData === context.schema.type) {
- var parts = [];
+ parts = [];
if ((context.schema.min !== undefined
&& context.newData < context.schema.min)
|
- Fixed duplicated var declaration
|
diff --git a/src/mustache_core.js b/src/mustache_core.js
index <HASH>..<HASH> 100644
--- a/src/mustache_core.js
+++ b/src/mustache_core.js
@@ -26,7 +26,7 @@ var canReflect = require("can-reflect");
// ## Helpers
-var mustacheLineBreakRegExp = /(?:(^|(?:\r?)\n)(\s*)(\{\{([\s\S]*)\}\}\}?)([^\S\n\r]*)($|\r?\n))|(\{\{([\s\S]*)\}\}\}?)/g,
+var mustacheLineBreakRegExp = /(?:(^|\r?\n)(\s*)(\{\{([\s\S]*)\}\}\}?)([^\S\n\r]*)($|\r?\n))|(\{\{([\s\S]*)\}\}\}?)/g,
mustacheWhitespaceRegExp = /(\s*)(\{\{\{?)(-?)([\s\S]*?)(-?)(\}\}\}?)(\s*)/g,
k = function(){};
|
ungroup carriage return at beginning of mustacheLineBreakRegExp
|
diff --git a/packages/react-impression/src/components/Popover/Popover.js b/packages/react-impression/src/components/Popover/Popover.js
index <HASH>..<HASH> 100644
--- a/packages/react-impression/src/components/Popover/Popover.js
+++ b/packages/react-impression/src/components/Popover/Popover.js
@@ -153,6 +153,7 @@ export default class Popover extends React.PureComponent {
() => {
this.popperJS = new Popper(this.referenceDom, this.popper, {
placement: this.props.position,
+ positionFixed: true,
})
}
)
|
fix popover (#<I>)
|
diff --git a/edc_notification/settings.py b/edc_notification/settings.py
index <HASH>..<HASH> 100644
--- a/edc_notification/settings.py
+++ b/edc_notification/settings.py
@@ -10,7 +10,10 @@ APP_NAME = 'edc_notification'
env = environ.Env()
-ENVFILE = os.environ['ENVFILE'] or 'env.sample'
+try:
+ ENVFILE = os.environ['ENVFILE'] or 'env.sample'
+except KeyError:
+ ENVFILE = 'env.sample'
env.read_env(os.path.join(BASE_DIR, ENVFILE))
print(f"Reading env from {os.path.join(BASE_DIR, ENVFILE)}")
|
refer to env.sample in travis tests
|
diff --git a/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php b/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php
index <HASH>..<HASH> 100644
--- a/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php
+++ b/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php
@@ -8,6 +8,7 @@
*/
namespace EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentFieldMapper;
+use eZ\Publish\API\Repository\Exceptions\NotFoundException;
use eZ\Publish\SPI\Persistence\Content;
use eZ\Publish\SPI\Persistence\Content\Location\Handler as LocationHandler;
use eZ\Publish\SPI\Persistence\Content\ObjectState\Handler as ObjectStateHandler;
@@ -192,10 +193,14 @@ class BlockDocumentsBaseContentFields extends ContentFieldMapper
$objectStateIds = [];
foreach ($this->objectStateHandler->loadAllGroups() as $objectStateGroup) {
- $objectStateIds[] = $this->objectStateHandler->getContentState(
- $contentId,
- $objectStateGroup->id
- )->id;
+ try {
+ $objectStateIds[] = $this->objectStateHandler->getContentState(
+ $contentId,
+ $objectStateGroup->id
+ )->id;
+ } catch (NotFoundException $e) {
+ // // Ignore empty object state groups
+ }
}
return $objectStateIds;
|
EZP-<I>: Skipped empty object state groups during indexing (#<I>)
|
diff --git a/libraries/common/components/Image/style.js b/libraries/common/components/Image/style.js
index <HASH>..<HASH> 100644
--- a/libraries/common/components/Image/style.js
+++ b/libraries/common/components/Image/style.js
@@ -24,6 +24,9 @@ const image = css({
* Before there was a left:50%, translateX(-50%) hack for centering the images if ratio is
* different, but it didn't work since height was not 'auto'.
* Adding this hack back would cause PWA-660 regression.
+ *
+ * To fix CCP-410 without shrinking the image and without making PWA-660 back, we should
+ * change how the image is rendered by not making it absolute positioned.
* */
top: 0,
left: 0,
|
PWA-<I> - even better comment
|
diff --git a/wire/msgtx.go b/wire/msgtx.go
index <HASH>..<HASH> 100644
--- a/wire/msgtx.go
+++ b/wire/msgtx.go
@@ -314,6 +314,21 @@ func (msg *MsgTx) TxHash() chainhash.Hash {
return chainhash.DoubleHashH(buf.Bytes())
}
+// WitnessHash generates the hash of the transaction serialized according to
+// the new witness serialization defined in BIP0141 and BIP0144. The final
+// output is used within the Segregated Witness commitment of all the witnesses
+// within a block. If a transaction has no witness data, then the witness hash,
+// is the same as its txid.
+func (msg *MsgTx) WitnessHash() chainhash.Hash {
+ if msg.HasWitness() {
+ buf := bytes.NewBuffer(make([]byte, 0, msg.SerializeSize()))
+ _ = msg.Serialize(buf)
+ return chainhash.DoubleHashH(buf.Bytes())
+ }
+
+ return msg.TxHash()
+}
+
// Copy creates a deep copy of a transaction so that the original does not get
// modified when the copy is manipulated.
func (msg *MsgTx) Copy() *MsgTx {
|
BIP<I>+wire: add a WitnessHash method to tx
|
diff --git a/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/knife/bootstrap_spec.rb
+++ b/spec/unit/knife/bootstrap_spec.rb
@@ -1661,7 +1661,7 @@ describe Chef::Knife::Bootstrap do
before do
Chef::Config[:validation_key] = "/blah"
allow(vault_handler_mock).to receive(:doing_chef_vault?).and_return false
- allow(File).to receive(:exist?).with("/blah").and_return false
+ allow(File).to receive(:exist?).with(/\/blah/).and_return false
end
it_behaves_like "creating the client locally"
end
@@ -1669,7 +1669,7 @@ describe Chef::Knife::Bootstrap do
context "when a valid validation key is given and we're doing old-style client creation" do
before do
Chef::Config[:validation_key] = "/blah"
- allow(File).to receive(:exist?).with("/blah").and_return true
+ allow(File).to receive(:exist?).with(/\/blah/).and_return true
allow(vault_handler_mock).to receive(:doing_chef_vault?).and_return false
end
|
Relax the match for validation key path
Because we expand the path to the validation key,
the exact match of "/blah" under Windows was failing,
because it expanded to "C:/blah"
|
diff --git a/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/startup/SipHostConfig.java b/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/startup/SipHostConfig.java
index <HASH>..<HASH> 100644
--- a/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/startup/SipHostConfig.java
+++ b/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/startup/SipHostConfig.java
@@ -184,7 +184,8 @@ public class SipHostConfig extends HostConfig {
*/
private boolean isSipServletDirectory(File dir) {
if(dir.isDirectory()) {
- File sipXmlFile = new File(dir.getAbsoluteFile() + SipContext.APPLICATION_SIP_XML);
+ //Fix provided by Thomas Lenesey for exploded directory deployments
+ File sipXmlFile = new File(dir.getAbsoluteFile(), SipContext.APPLICATION_SIP_XML);
if(sipXmlFile.exists()) {
return true;
}
|
Fix for exploded directory deployment in Tomcat provided by Thomas Lenesey from Nexcom Systems
git-svn-id: <URL>
|
diff --git a/benchexec/tools/ultimate.py b/benchexec/tools/ultimate.py
index <HASH>..<HASH> 100644
--- a/benchexec/tools/ultimate.py
+++ b/benchexec/tools/ultimate.py
@@ -131,7 +131,7 @@ class UltimateTool(benchexec.tools.template.BaseTool):
launcher_jar = os.path.join(ultimatedir, jar)
if os.path.isfile(launcher_jar):
return launcher_jar
- raise FileNotFoundError('No suitable launcher jar found')
+ raise FileNotFoundError('No suitable launcher jar found in {0}'.format(ultimatedir))
@functools.lru_cache()
def version(self, executable):
|
more verbosity for launcher jar error
|
diff --git a/pyodesys/tests/test_symbolic.py b/pyodesys/tests/test_symbolic.py
index <HASH>..<HASH> 100644
--- a/pyodesys/tests/test_symbolic.py
+++ b/pyodesys/tests/test_symbolic.py
@@ -395,7 +395,7 @@ def test_long_chain_banded_scipy(n):
min_time_band = min(min_time_band, time_band)
check(yout_dens[-1, :], n, p, a, atol, rtol, 1.5)
check(yout_band[-1, :], n, p, a, atol, rtol, 1.5)
- assert min_time_dens > min_time_band # will fail sometimes due to load
+ assert min_time_dens*2 > min_time_band # (2x: fails sometimes due to load)
@pytest.mark.skipif(sym is None, reason='package sym missing')
|
add safety factor for timings in test suite
|
diff --git a/tests/test_goea_statsmodels.py b/tests/test_goea_statsmodels.py
index <HASH>..<HASH> 100755
--- a/tests/test_goea_statsmodels.py
+++ b/tests/test_goea_statsmodels.py
@@ -18,7 +18,7 @@ def test_goea_statsmodels(log=sys.stdout):
prt_if = lambda nt: nt.p_uncorrected < 0.0005
## These will specify to use the statsmodels methods
methods_sm0 = ['holm-sidak', 'simes-hochberg', 'hommel',
- 'fdr_bh', 'fdr_by', 'fdr_tsbh', 'fdr_tsbky']
+ 'fdr_bh', 'fdr_by', 'fdr_tsbh', 'fdr_tsbky', 'fdr_gbs']
# Prepend "sm_" or "statsmodels_" to a method to use that version
methods_sm1 = ['sm_bonferroni', 'sm_sidak', 'sm_holm']
methods = methods_sm0 + methods_sm1
|
Add multiple-test method, FDR adaptive Gavrilov-Benjamini-Sarkar to tests.
|
diff --git a/src/Schema/Generators/SchemaGenerator.php b/src/Schema/Generators/SchemaGenerator.php
index <HASH>..<HASH> 100644
--- a/src/Schema/Generators/SchemaGenerator.php
+++ b/src/Schema/Generators/SchemaGenerator.php
@@ -10,7 +10,7 @@ class SchemaGenerator
* @param string $version
* @return boolean
*/
- public function build($version = '0.6.0')
+ public function build($version = '4.12')
{
$query = file_get_contents(__DIR__.'/../../../assets/introspection-'. $version .'.txt');
$data = app('graphql')->execute($query);
|
revert to introspection <I>
|
diff --git a/packages/site/pages/core/motion.js b/packages/site/pages/core/motion.js
index <HASH>..<HASH> 100644
--- a/packages/site/pages/core/motion.js
+++ b/packages/site/pages/core/motion.js
@@ -181,15 +181,15 @@ const Travel = _ => (
}
.pill1 {
width: 50%;
- animation: 3000ms 500ms infinite pill1;
+ animation: 4000ms 500ms infinite pill1;
}
.pill2Container {
width: calc(100% - 44px);
- animation: 3000ms 500ms infinite pill2;
+ animation: 4000ms 500ms infinite pill2;
}
.pill3Container {
width: calc(100% - 44px);
- animation: 3000ms 500ms infinite pill3;
+ animation: 4000ms 500ms infinite pill3;
}
.pill2,
.pill3 {
|
refactor(site): add more time to motion travel example
|
diff --git a/spec/acceptance/neovim-ruby-host_spec.rb b/spec/acceptance/neovim-ruby-host_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/acceptance/neovim-ruby-host_spec.rb
+++ b/spec/acceptance/neovim-ruby-host_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe "neovim-ruby-host" do
# Start the remote host
host_nvim.command(%{let g:chan = rpcstart("#{bin_path}", ["#{plugin1}", "#{plugin2}"])})
- sleep 0.4 # TODO figure out if/why this is necessary
+ sleep 0.3 # TODO figure out if/why this is necessary
# Make two requests to the synchronous SyncAdd method and store the results
host_nvim.command(%{let g:res1 = rpcrequest(g:chan, "SyncAdd", 1, 2)})
@@ -48,6 +48,7 @@ RSpec.describe "neovim-ruby-host" do
# Set the current line content twice via the AsyncSetLine method
host_nvim.command(%{call rpcnotify(g:chan, "AsyncSetLine", "foo")})
host_nvim.command(%{call rpcnotify(g:chan, "AsyncSetLine", "bar")})
+ sleep 0.3
# Save the contents of the buffer
host_nvim.command("write! #{output}")
|
Add extra sleep to acceptance test to debug travis failures
|
diff --git a/lib/gym/options.rb b/lib/gym/options.rb
index <HASH>..<HASH> 100644
--- a/lib/gym/options.rb
+++ b/lib/gym/options.rb
@@ -122,6 +122,11 @@ module Gym
conflict_block: proc do |value|
UI.user_error!("'#{value.key}' must be false to use 'export_options'")
end),
+ FastlaneCore::ConfigItem.new(key: :just_export,
+ env_name: "GYM_JUST_EXPORT",
+ description: "Just export ipa from archive_path. Do not build again. Default false",
+ is_string: false,
+ optional: true),
# Very optional
FastlaneCore::ConfigItem.new(key: :build_path,
diff --git a/lib/gym/runner.rb b/lib/gym/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/gym/runner.rb
+++ b/lib/gym/runner.rb
@@ -9,7 +9,9 @@ module Gym
def run
clear_old_files
- build_app
+ if !Gym.config[:just_export]
+ build_app
+ end
verify_archive
FileUtils.mkdir_p(Gym.config[:output_directory])
|
adding option to just export ipa from archive_path
|
diff --git a/src/com/caverock/androidsvg/SVGImageView.java b/src/com/caverock/androidsvg/SVGImageView.java
index <HASH>..<HASH> 100644
--- a/src/com/caverock/androidsvg/SVGImageView.java
+++ b/src/com/caverock/androidsvg/SVGImageView.java
@@ -76,6 +76,9 @@ public class SVGImageView extends ImageView
private void init(AttributeSet attrs, int defStyle)
{
+ if (isInEditMode())
+ return;
+
TypedArray a = getContext().getTheme()
.obtainStyledAttributes(attrs, R.styleable.SVGImageView, defStyle, 0);
try
|
Don't perform SVGImageView initialisation if View is in edit mode.
|
diff --git a/src/Provider.php b/src/Provider.php
index <HASH>..<HASH> 100644
--- a/src/Provider.php
+++ b/src/Provider.php
@@ -619,7 +619,7 @@ class Provider
);
}
},
- function () use ($metadataPrefix) {
+ function () use (&$metadataPrefix) {
if (!isset($this->params['metadataPrefix'])) {
throw new BadArgumentException("Missing required argument metadataPrefix");
}
|
Set $metadataPrefix in getRecordListParams()
Since the value is set in a closure, it must be passed by reference
|
diff --git a/leveldb/external_test.go b/leveldb/external_test.go
index <HASH>..<HASH> 100644
--- a/leveldb/external_test.go
+++ b/leveldb/external_test.go
@@ -36,7 +36,7 @@ var _ = testutil.Defer(func() {
testutil.DoDBTesting(&t)
db.TestClose()
done <- true
- }, 9.0)
+ }, 20.0)
})
Describe("read test", func() {
|
leveldb: Increase 'write test' timeout to <I> secs
|
diff --git a/packages/ws/src/Ws/Services/ExtService.php b/packages/ws/src/Ws/Services/ExtService.php
index <HASH>..<HASH> 100644
--- a/packages/ws/src/Ws/Services/ExtService.php
+++ b/packages/ws/src/Ws/Services/ExtService.php
@@ -51,13 +51,14 @@ class ExtService extends BaseSunat
private function processResponse($status)
{
- $code = intval($status->statusCode);
+ $originCode = $status->statusCode;
+ $code = intval($originCode);
$result = new StatusResult();
- $result->setCode($code);
+ $result->setCode($originCode);
if ($this->isPending($code)) {
- $result->setError($this->getCustomError($code));
+ $result->setError($this->getCustomError($originCode));
return $result;
}
@@ -73,7 +74,7 @@ class ExtService extends BaseSunat
}
if ($this->isExceptionCode($code)) {
- $this->loadErrorByCode($result, $code);
+ $this->loadErrorByCode($result, $originCode);
}
return $result;
|
Preserve original code in getStatus
|
diff --git a/eth_account/hdaccount/__init__.py b/eth_account/hdaccount/__init__.py
index <HASH>..<HASH> 100644
--- a/eth_account/hdaccount/__init__.py
+++ b/eth_account/hdaccount/__init__.py
@@ -13,5 +13,9 @@ def derive_ethereum_key(seed: bytes, account_index: int=0):
def seed_from_mnemonic(words: str, passphrase="") -> bytes:
- Mnemonic.detect_language(words)
+ lang = Mnemonic.detect_language(words)
+ if not Mnemonic(lang).is_mnemonic_valid(words):
+ raise ValueError(
+ f"Provided words: '{words}', are not a valid BIP39 mnemonic phrase!"
+ )
return Mnemonic.to_seed(words, passphrase)
|
bug: Do proper check of seed words before deriving key
|
diff --git a/lib/fluent/plugin/out_google_cloud.rb b/lib/fluent/plugin/out_google_cloud.rb
index <HASH>..<HASH> 100644
--- a/lib/fluent/plugin/out_google_cloud.rb
+++ b/lib/fluent/plugin/out_google_cloud.rb
@@ -1236,8 +1236,10 @@ module Fluent
{}
rescue StandardError => e
- @log.error "Failed to set monitored resource labels for #{type}: ",
- error: e
+ if [Platform::GCE, Platform::EC2].include?(@platform)
+ @log.error "Failed to set monitored resource labels for #{type}: ",
+ error: e
+ end
{}
end
|
Mute 'Failed to set monitored resource labels for gce_instance' error for GKE On-Prem. (#<I>)
|
diff --git a/tests/test_pydocstyle.py b/tests/test_pydocstyle.py
index <HASH>..<HASH> 100644
--- a/tests/test_pydocstyle.py
+++ b/tests/test_pydocstyle.py
@@ -7,6 +7,7 @@ registry = violations.ErrorRegistry
_disabled_checks = [
'D202', # No blank lines allowed after function docstring
+ 'D205', # 1 blank line required between summary line and description
]
|
disable D<I> in pylint (#<I>)
|
diff --git a/proso/release.py b/proso/release.py
index <HASH>..<HASH> 100644
--- a/proso/release.py
+++ b/proso/release.py
@@ -1 +1 @@
-VERSION = '3.3.0'
+VERSION = '3.4.0.dev'
|
start working on <I>.dev
|
diff --git a/server/api.go b/server/api.go
index <HASH>..<HASH> 100644
--- a/server/api.go
+++ b/server/api.go
@@ -86,13 +86,12 @@ func (d dexAPI) UpdateClient(ctx context.Context, req *api.UpdateClientReq) (*ap
}
err := d.s.UpdateClient(req.Id, func(old storage.Client) (storage.Client, error) {
- if req.RedirectUris != nil && len(req.RedirectUris) > 0 {
+ if req.RedirectUris != nil {
old.RedirectURIs = req.RedirectUris
}
- if req.TrustedPeers != nil && len(req.TrustedPeers) > 0 {
+ if req.TrustedPeers != nil {
old.TrustedPeers = req.TrustedPeers
}
- old.Public = req.Public
if req.Name != "" {
old.Name = req.Name
}
|
Update also to a list of empty redirect URIs and Peers
|
diff --git a/src/MarkerClusterGroup.js b/src/MarkerClusterGroup.js
index <HASH>..<HASH> 100644
--- a/src/MarkerClusterGroup.js
+++ b/src/MarkerClusterGroup.js
@@ -134,7 +134,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
//If we have already clustered we'll need to add this one to a cluster
- newCluster = this._topClusterLevel._recursivelyAddLayer(layer, this._topClusterLevel._zoom);
+ newCluster = this._topClusterLevel._recursivelyAddLayer(layer, this._topClusterLevel._zoom - 1);
this._animationAddLayer(layer, newCluster);
@@ -210,7 +210,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
//otherwise, look through all of the markers we haven't managed to cluster and see if we should form a cluster with them
if (!used) {
- var newCluster = this._clusterOne(unclustered, point, hasChildClusters);
+ var newCluster = this._clusterOne(unclustered, point);
if (newCluster) {
newCluster._haveGeneratedChildClusters = hasChildClusters;
newCluster._projCenter = this._map.project(newCluster.getLatLng(), zoom);
|
Pass the right zoom level in so that clustering happens at the right scale
|
diff --git a/src/main/resources/META-INF/resources/primefaces/keyfilter/1-keyfilter.js b/src/main/resources/META-INF/resources/primefaces/keyfilter/1-keyfilter.js
index <HASH>..<HASH> 100644
--- a/src/main/resources/META-INF/resources/primefaces/keyfilter/1-keyfilter.js
+++ b/src/main/resources/META-INF/resources/primefaces/keyfilter/1-keyfilter.js
@@ -47,6 +47,11 @@ PrimeFaces.widget.KeyFilter = PrimeFaces.widget.BaseWidget.extend({
} else if (this.cfg.mask) {
input.keyfilter($.fn.keyfilter.defaults.masks[this.cfg.mask]);
}
+
+ //disable drop
+ input.on('drop', function(e) {
+ e.preventDefault();
+ });
if (cfg.preventPaste) {
//disable paste
|
Fix #<I>: Keyfilter prevent drag and drop. (#<I>)
* Fix #<I>: Keyfilter prevent drag and drop.
* Fix #<I>: Keyfilter prevent drag and drop.
|
diff --git a/openquake/risklib/asset.py b/openquake/risklib/asset.py
index <HASH>..<HASH> 100644
--- a/openquake/risklib/asset.py
+++ b/openquake/risklib/asset.py
@@ -658,12 +658,9 @@ def build_asset_array(assets_by_site, tagnames=()):
elif field in tagnames:
value = asset.tagidxs[tagi[field]]
else:
- try:
- name, lt = field.split('-')
- except ValueError: # no - in field
- name, lt = 'value', field
- # the line below retrieve one of `deductibles` or
- # `insurance_limits` ("s" suffix)
+ name, lt = field.split('-')
+ # the line below retrieve `.values`, `.deductibles` or
+ # `.insurance_limits` dictionaries
value = getattr(asset, name + 's')[lt]
record[field] = value
return assetcol, ' '.join(occupancy_periods)
|
Small cleanup in build_asset_array
|
diff --git a/saltapi/netapi/rest_cherrypy.py b/saltapi/netapi/rest_cherrypy.py
index <HASH>..<HASH> 100644
--- a/saltapi/netapi/rest_cherrypy.py
+++ b/saltapi/netapi/rest_cherrypy.py
@@ -65,11 +65,10 @@ class LowDataAdapter(object):
@cherrypy.tools.json_out()
def GET(self):
- # FIXME: how to pass a compound command via lowdata?
- lowdata = [
- {'client': 'local', 'tgt': '*', 'fun': 'grains.items'},
- {'client': 'local', 'tgt': '*', 'fun': 'sys.list_functions'},
- ]
+ lowdata = [{'client': 'local', 'tgt': '*',
+ 'fun': ['grains.items', 'sys.list_functions'],
+ 'arg': [[], []],
+ }]
return self.exec_lowdata(lowdata)
@cherrypy.tools.json_out()
|
Change root URL command to issue a compound command
|
diff --git a/distribution/src/test/java/com/orientechnologies/distribution/integration/OIntegrationTestTemplate.java b/distribution/src/test/java/com/orientechnologies/distribution/integration/OIntegrationTestTemplate.java
index <HASH>..<HASH> 100644
--- a/distribution/src/test/java/com/orientechnologies/distribution/integration/OIntegrationTestTemplate.java
+++ b/distribution/src/test/java/com/orientechnologies/distribution/integration/OIntegrationTestTemplate.java
@@ -28,7 +28,7 @@ public abstract class OIntegrationTestTemplate {
if (firstTime) {
System.out.println("Waiting for OrientDB to startup");
- TimeUnit.SECONDS.sleep(5);
+ TimeUnit.SECONDS.sleep(1000);
firstTime = false;
}
|
Incremented timeout for Integration tests
|
diff --git a/lib/ProMotion/helpers/motion-table/1st/sectioned_table.rb b/lib/ProMotion/helpers/motion-table/1st/sectioned_table.rb
index <HASH>..<HASH> 100644
--- a/lib/ProMotion/helpers/motion-table/1st/sectioned_table.rb
+++ b/lib/ProMotion/helpers/motion-table/1st/sectioned_table.rb
@@ -101,7 +101,7 @@ module ProMotion::MotionTable
expectedArguments = self.method(action).arity
if expectedArguments == 0
self.send(action)
- elsif expectedArguments == 1
+ elsif expectedArguments == 1 || expectedArguments == -1
self.send(action, arguments)
else
MotionTable::Console.log("MotionTable warning: #{action} expects #{expectedArguments} arguments. Maximum number of required arguments for an action is 1.", withColor: MotionTable::Console::RED_COLOR)
|
Finally accounted for -1 arguments.
|
diff --git a/lib/commander/runner.rb b/lib/commander/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/commander/runner.rb
+++ b/lib/commander/runner.rb
@@ -66,7 +66,7 @@ module Commander
# program :help, 'Copyright', '2008 TJ Holowaychuk'
# program :help, 'Anything', 'You want'
# program :int_message 'Bye bye!'
- #
+ #
# # Get data
# program :name # => 'Commander'
#
@@ -86,7 +86,7 @@ module Commander
@program[:help][args.first] = args[1]
else
@program[key] = *args unless args.empty?
- @program[key] if args.empty?
+ @program[key]
end
end
|
Misc refactorings to #program
|
diff --git a/DependencyInjection/RomaricDrigonOrchestraExtension.php b/DependencyInjection/RomaricDrigonOrchestraExtension.php
index <HASH>..<HASH> 100644
--- a/DependencyInjection/RomaricDrigonOrchestraExtension.php
+++ b/DependencyInjection/RomaricDrigonOrchestraExtension.php
@@ -28,7 +28,13 @@ class RomaricDrigonOrchestraExtension extends Extension
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
+ // Register services
$loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.xml');
+
+ // We must also add our bundle to Assetic configuration
+ $asseticBundle = $container->getParameter('assetic.bundles');
+ $asseticBundle[] = 'RomaricDrigonOrchestraBundle';
+ $container->setParameter('assetic.bundles', $asseticBundle);
}
}
|
Enabled Assetic for our bundle
|
diff --git a/packages/webiny-app-cms/src/editor/plugins/elementSettings/align/HorizontalAlignAction.js b/packages/webiny-app-cms/src/editor/plugins/elementSettings/align/HorizontalAlignAction.js
index <HASH>..<HASH> 100644
--- a/packages/webiny-app-cms/src/editor/plugins/elementSettings/align/HorizontalAlignAction.js
+++ b/packages/webiny-app-cms/src/editor/plugins/elementSettings/align/HorizontalAlignAction.js
@@ -47,7 +47,9 @@ export default compose(
options: { alignments } = defaultOptions
}) => {
return () => {
- const types = Object.keys(icons).filter(key => alignments.includes(key));
+ const types = Object.keys(icons).filter(key =>
+ alignments ? alignments.includes(key) : true
+ );
const nextAlign = types[types.indexOf(align) + 1] || "left";
|
Fix horizontal align when alignment options are not defined.
|
diff --git a/packages/cozy-client/src/cli/index.js b/packages/cozy-client/src/cli/index.js
index <HASH>..<HASH> 100644
--- a/packages/cozy-client/src/cli/index.js
+++ b/packages/cozy-client/src/cli/index.js
@@ -192,4 +192,22 @@ const createClientInteractive = (clientOptions, serverOpts) => {
})
}
+const main = async () => {
+ const client = await createClientInteractive({
+ scope: ['io.cozy.files'],
+ uri: 'http://cozy.tools:8080',
+ oauth: {
+ softwareID: 'io.cozy.client.cli'
+ }
+ })
+ console.log(client.toJSON())
+}
+
+if (require.main === module) {
+ main().catch(e => {
+ console.error(e)
+ process.exit(1)
+ })
+}
+
export { createClientInteractive }
|
feat: Add test CLI for createClientInteractive
|
diff --git a/src/Torann/GeoIP/GeoIP.php b/src/Torann/GeoIP/GeoIP.php
index <HASH>..<HASH> 100644
--- a/src/Torann/GeoIP/GeoIP.php
+++ b/src/Torann/GeoIP/GeoIP.php
@@ -113,8 +113,10 @@ class GeoIP {
private function find( $ip = null ) {
// Check Session
- if ( $ip === null && $position = $this->session->get('geoip-location') ) {
- if($position['ip'] === $this->remote_ip) {
+ if ( $ip === null && $position = $this->session->get('geoip-location') )
+ {
+ // TODO: Remove default check on 2/28/14
+ if(isset($position['default']) && $position['ip'] === $this->remote_ip) {
return $position;
}
}
|
Position object in the session causes bugs, this fixes it. Remove on 2/<I>/<I>
|
diff --git a/examples/01_empty_window.rb b/examples/01_empty_window.rb
index <HASH>..<HASH> 100644
--- a/examples/01_empty_window.rb
+++ b/examples/01_empty_window.rb
@@ -3,10 +3,10 @@
# http://library.gnome.org/devel/gtk-tutorial/2.90/c39.html
#
$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'girffi/builder'
+require 'girffi'
-GirFFI::Builder.build_module 'GObject'
-GirFFI::Builder.build_module 'Gtk'
+GirFFI.setup :GObject
+GirFFI.setup :Gtk
GirFFI::Builder.build_class 'Gtk', 'Window'
(my_len, my_args) = Gtk.init ARGV.length + 1, [$0, *ARGV]
diff --git a/lib/girffi.rb b/lib/girffi.rb
index <HASH>..<HASH> 100644
--- a/lib/girffi.rb
+++ b/lib/girffi.rb
@@ -32,5 +32,11 @@ module GirFFI
end # module GirFfi
require 'girffi/irepository'
+require 'girffi/builder'
+module GirFFI
+ def self.setup modul
+ GirFFI::Builder.build_module modul.to_s
+ end
+end
# EOF
|
Provide a GirFFI#setup method to setup the namespaces.
|
diff --git a/src/Saxulum/DoctrineMongoDb/Provider/DoctrineMongoDbProvider.php b/src/Saxulum/DoctrineMongoDb/Provider/DoctrineMongoDbProvider.php
index <HASH>..<HASH> 100644
--- a/src/Saxulum/DoctrineMongoDb/Provider/DoctrineMongoDbProvider.php
+++ b/src/Saxulum/DoctrineMongoDb/Provider/DoctrineMongoDbProvider.php
@@ -15,7 +15,8 @@ class DoctrineMongoDbProvider implements ServiceProviderInterface
{
$container['mongodb.default_options'] = array(
'server' => 'mongodb://localhost:27017',
- 'options' => array()
+ 'options' => array(),
+ 'driver.options' => array()
/** @link http://www.php.net/manual/en/mongoclient.construct.php */
);
@@ -58,7 +59,7 @@ class DoctrineMongoDbProvider implements ServiceProviderInterface
}
$mongodbs[$name] = function () use ($options, $config, $manager) {
- return new Connection($options['server'], $options['options'], $config, $manager);
+ return new Connection($options['server'], $options['options'], $config, $manager, $options['driver.options'] ?: array());
};
}
|
feat(): Optionally allow the specification of driver options
|
diff --git a/closure/goog/graphics/canvaselement.js b/closure/goog/graphics/canvaselement.js
index <HASH>..<HASH> 100644
--- a/closure/goog/graphics/canvaselement.js
+++ b/closure/goog/graphics/canvaselement.js
@@ -626,7 +626,8 @@ goog.graphics.CanvasTextElement.prototype.updateText_ = function() {
if (this.x1_ == this.x2_) {
// Special case vertical text
this.innerElement_.innerHTML =
- goog.array.map(this.text_.split(''), goog.string.htmlEscape).
+ goog.array.map(this.text_.split(''),
+ function(entry) { return goog.string.htmlEscape(entry); }).
join('<br>');
} else {
this.innerElement_.innerHTML = goog.string.htmlEscape(this.text_);
|
Don't pass the extra parameters of goog.array.map callback to the
htmlEscape function.
R=chrishenry
DELTA=2 (1 added, 0 deleted, 1 changed)
Revision created by MOE tool push_codebase.
MOE_MIGRATION=<I>
git-svn-id: <URL>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -16,14 +16,18 @@
{
if ( this.doneFn && this.processes === 1 && this.queue.length === 0 )
{
- this.doneFn()
+ this.doneFn( this.errors.length !== 0 ? this.errors : null, this.results )
}
}
- function nextQueue()
+ function nextQueue( err, result )
{
this.processes--
+ typeof err !== 'undefined' && this.errors.push( err )
+
+ typeof result !== 'undefined' && this.results.push( result )
+
processQueue.call( this )
}
@@ -59,6 +63,10 @@
this.queue = []
this.doneFn = null
+
+ this.errors = []
+
+ this.results = []
}
Queue.prototype.add = function ( fn )
|
pass errors and results to done callback
|
diff --git a/src/Artistas/PagSeguroConfig.php b/src/Artistas/PagSeguroConfig.php
index <HASH>..<HASH> 100644
--- a/src/Artistas/PagSeguroConfig.php
+++ b/src/Artistas/PagSeguroConfig.php
@@ -2,7 +2,6 @@
namespace Artistas\PagSeguro;
-use Illuminate\Config\Repository as Config;
use Illuminate\Log\Writer as Log;
use Illuminate\Session\SessionManager as Session;
use Illuminate\Validation\Factory as Validator;
diff --git a/src/Artistas/routes.php b/src/Artistas/routes.php
index <HASH>..<HASH> 100644
--- a/src/Artistas/routes.php
+++ b/src/Artistas/routes.php
@@ -10,4 +10,4 @@ Route::get('/pagseguro/session/reset', function () {
Route::get('/pagseguro/javascript', function () {
return file_get_contents(\PagSeguro::getUrl()['javascript']);
-});
\ No newline at end of file
+});
|
Applied fixes from StyleCI (#<I>)
|
diff --git a/tests/FluentDOMStyleTest.php b/tests/FluentDOMStyleTest.php
index <HASH>..<HASH> 100644
--- a/tests/FluentDOMStyleTest.php
+++ b/tests/FluentDOMStyleTest.php
@@ -54,6 +54,12 @@ class FluentDOMStyleTest extends PHPUnit_Framework_TestCase {
$this->assertTrue($items instanceof FluentDOMStyle);
$this->assertEquals(NULL, $items->css('text-align'));
}
+
+ function testCSSReadOnTextNodes() {
+ $items = FluentDOMStyle(self::HTML)->find('//div')->children()->andSelf();
+ $this->assertTrue(count($items) > 3);
+ $this->assertEquals('left', $items->css('text-align'));
+ }
function testCSSWriteWithString() {
$items = FluentDOMStyle(self::HTML)->find('//div');
|
FluentDOMStyleTest:
- added: test for reading on a list that includes text nodes
|
diff --git a/leaflet.photon.js b/leaflet.photon.js
index <HASH>..<HASH> 100644
--- a/leaflet.photon.js
+++ b/leaflet.photon.js
@@ -225,6 +225,7 @@ L.Control.Photon = L.Control.extend({
detailsContainer = L.DomUtil.create('small', '', el),
details = [];
title.innerHTML = feature.properties.name;
+ details.push(this.formatType(feature));
if (feature.properties.city && feature.properties.city !== feature.properties.name) {
details.push(feature.properties.city);
}
@@ -236,6 +237,14 @@ L.Control.Photon = L.Control.extend({
return (this.options.formatResult || this._formatResult).call(this, feature, el);
},
+ formatType: function (feature) {
+ return (this.options.formatType || this._formatType).call(this, feature);
+ },
+
+ _formatType: function (feature) {
+ return feature.properties.osm_value;
+ },
+
createResult: function (feature) {
var el = L.DomUtil.create('li', '', this.resultsContainer);
this.formatResult(feature, el);
|
First shot in displaying OSM type in results (overridable)
|
diff --git a/umap/umap_.py b/umap/umap_.py
index <HASH>..<HASH> 100644
--- a/umap/umap_.py
+++ b/umap/umap_.py
@@ -2,6 +2,7 @@
#
# License: BSD 3 clause
from __future__ import print_function
+from past.builtins import basestring
from warnings import warn
import time
@@ -1501,10 +1502,19 @@ class UMAP(BaseEstimator):
"target_n_neighbors must be greater than 2"
)
if not isinstance(self.n_components, int):
+ if isinstance(self.n_components, basestring):
+ raise ValueError(
+ "n_components must be an int"
+ )
+ if self.n_components % 1 != 0:
+ raise ValueError("n_components must be a whole number")
try:
+ # this will convert other types of int (eg. numpy int64) to Python int
self.n_components = int(self.n_components)
except ValueError:
- raise ValueError("n_components must be an int")
+ raise ValueError(
+ "n_components must be an int"
+ )
if self.n_components < 1:
raise ValueError(
"n_components must be greater than 0"
|
make sure to raise errors if n_components is string or float
|
diff --git a/invenio_base/app.py b/invenio_base/app.py
index <HASH>..<HASH> 100644
--- a/invenio_base/app.py
+++ b/invenio_base/app.py
@@ -34,6 +34,7 @@ import click
import pkg_resources
from flask import Flask
from flask.cli import FlaskGroup
+from flask.helpers import get_debug_flag
from .cmd import instance
@@ -157,7 +158,7 @@ def create_cli(create_app=None):
info.create_app = None
app = info.load_app()
else:
- app = create_app(debug=getattr(info, 'debug', False))
+ app = create_app(debug=get_debug_flag())
return app
@click.group(cls=FlaskGroup, create_app=create_cli_app)
@@ -165,7 +166,7 @@ def create_cli(create_app=None):
"""Command Line Interface for Invenio."""
pass
- # Add command for startin new Invenio instances.
+ # Add command for starting new Invenio instances.
cli.add_command(instance)
return cli
|
app: debug state initialization fix
* Fixes issue with Flask not setting app.debug until after the
application creation, causing e.g. template auto-reloading or
Flask-DebugToolbar to not be correctly initialized.
|
diff --git a/src/deep-security/lib/Token.js b/src/deep-security/lib/Token.js
index <HASH>..<HASH> 100644
--- a/src/deep-security/lib/Token.js
+++ b/src/deep-security/lib/Token.js
@@ -490,7 +490,7 @@ export class Token {
* @returns {AWS.CognitoIdentityCredentials}
*/
get credentials() {
- if (!this._credentials) {
+ if (!this.validCredentials(this._credentials)) {
this._credentials = this._createCognitoIdentityCredentials();
}
|
# Fix lambda requests CORS issue
|
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index <HASH>..<HASH> 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -1204,7 +1204,7 @@ func clusterNodesPost(d *Daemon, r *http.Request) response.Response {
return response.InternalError(err)
}
- d.State().Events.SendLifecycle(projectParam(r), lifecycle.ClusterTokenCreated.Event("", op.Requestor(), nil))
+ d.State().Events.SendLifecycle(projectParam(r), lifecycle.ClusterTokenCreated.Event("members", op.Requestor(), nil))
return operations.OperationResponse(op)
}
|
lxd/api/cluster: use 'members' as name for ClusterTokenCreated lifecycle event
|
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index <HASH>..<HASH> 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -130,7 +130,9 @@ module Jekyll
#
# Returns nothing.
def write_metadata
- File.binwrite(metadata_file, Marshal.dump(metadata))
+ unless disabled?
+ File.binwrite(metadata_file, Marshal.dump(metadata))
+ end
end
# Produce the absolute path of the metadata file
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index <HASH>..<HASH> 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -305,4 +305,23 @@ class TestRegenerator < JekyllUnitTest
assert @regenerator.modified?(@path)
end
end
+
+ context "when incremental regen is disabled" do
+ setup do
+ FileUtils.rm_rf(source_dir(".jekyll-metadata"))
+ @site = Site.new(Jekyll.configuration({
+ "source" => source_dir,
+ "destination" => dest_dir,
+ "incremental" => false
+ }))
+
+ @site.process
+ @path = @site.in_source_dir(@site.pages.first.path)
+ @regenerator = @site.regenerator
+ end
+
+ should "not create .jekyll-metadata" do
+ refute File.file?(source_dir(".jekyll-metadata"))
+ end
+ end
end
|
Fix #<I>: Make sure that .jekyll-metadata is not generated when not needed.
|
diff --git a/locator-init/src/main/java/org/talend/esb/locator/server/init/internal/RootNodeInitializer.java b/locator-init/src/main/java/org/talend/esb/locator/server/init/internal/RootNodeInitializer.java
index <HASH>..<HASH> 100644
--- a/locator-init/src/main/java/org/talend/esb/locator/server/init/internal/RootNodeInitializer.java
+++ b/locator-init/src/main/java/org/talend/esb/locator/server/init/internal/RootNodeInitializer.java
@@ -73,8 +73,8 @@ public class RootNodeInitializer implements Watcher {
try {
zk = new ZooKeeper(locatorEndpoints, 5000, this);
} catch (IOException e) {
- if (LOG.isLoggable(Level.SEVERE)) {
- LOG.log(Level.SEVERE, "Failed to create ZooKeeper client", e);
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.log(Level.INFO, "Failed to create ZooKeeper client", e);
}
}
}
|
Downgrade message level from error to info.
|
diff --git a/lib/did_you_mean/tree_spell_checker.rb b/lib/did_you_mean/tree_spell_checker.rb
index <HASH>..<HASH> 100644
--- a/lib/did_you_mean/tree_spell_checker.rb
+++ b/lib/did_you_mean/tree_spell_checker.rb
@@ -4,7 +4,7 @@ module DidYouMean
# spell checker for a dictionary that has a tree
# structure, see doc/tree_spell_checker_api.md
class TreeSpellChecker
- attr_reader :dictionary, :dimensions, :separator, :augment
+ attr_reader :dictionary, :separator, :augment
def initialize(dictionary:, separator: '/', augment: nil)
@dictionary = dictionary
|
✂️ 'warning: method redefined; discarding old dimensions'
|
diff --git a/salt/utils/process.py b/salt/utils/process.py
index <HASH>..<HASH> 100644
--- a/salt/utils/process.py
+++ b/salt/utils/process.py
@@ -223,9 +223,15 @@ class ThreadPool(object):
while True:
# 1s timeout so that if the parent dies this thread will die within 1s
try:
- func, args, kwargs = self._job_queue.get(timeout=1)
- self._job_queue.task_done() # Mark the task as done once we get it
- except queue.Empty:
+ try:
+ func, args, kwargs = self._job_queue.get(timeout=1)
+ self._job_queue.task_done() # Mark the task as done once we get it
+ except queue.Empty:
+ continue
+ except AttributeError:
+ # During shutdown, `queue` may not have an `Empty` atttribute. Thusly,
+ # we have to catch a possible exception from our exception handler in
+ # order to avoid an unclean shutdown. Le sigh.
continue
try:
log.debug('ThreadPool executing func: {0} with args:{1}'
|
Catch a possible error on shutdown
Catches a condition where our exception handler might itself raise
an exception on shutdown.
|
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index <HASH>..<HASH> 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -2033,8 +2033,8 @@ class OverlayPlot(GenericOverlayPlot, LegendPlot):
hover_renderers = [] if hover.renderers == 'auto' else hover.renderers
renderers = tool_renderers + hover_renderers
tool.renderers = list(util.unique_iterator(renderers))
- if 'hover' not in self.handles:
- self.handles['hover'] = tool
+ if 'hover' not in self.handles:
+ self.handles['hover'] = tool
def _get_factors(self, overlay, ranges):
|
Fixed bug in bokeh HoverTool lookup (#<I>)
|
diff --git a/colorful/__init__.py b/colorful/__init__.py
index <HASH>..<HASH> 100644
--- a/colorful/__init__.py
+++ b/colorful/__init__.py
@@ -4,6 +4,6 @@ from django.utils import version
__all__ = ['VERSION', '__version__']
-VERSION = (1, 2, 1, 'alpha', 0)
+VERSION = (1, 3, 0, 'final', 0)
__version__ = version.get_version(VERSION)
|
Bumped version number to <I>.
|
diff --git a/pymc/distributions/continuous.py b/pymc/distributions/continuous.py
index <HASH>..<HASH> 100644
--- a/pymc/distributions/continuous.py
+++ b/pymc/distributions/continuous.py
@@ -1532,6 +1532,7 @@ class Laplace(Continuous):
\frac{1}{2b} \exp \left\{ - \frac{|x - \mu|}{b} \right\}
.. plot::
+ :context: close-figs
import matplotlib.pyplot as plt
import numpy as np
@@ -1557,9 +1558,9 @@ class Laplace(Continuous):
Parameters
----------
- mu: float
+ mu : tensor_like of float
Location parameter.
- b: float
+ b : tensor_like of float
Scale parameter (b > 0).
"""
rv_op = laplace
@@ -1585,7 +1586,7 @@ class Laplace(Continuous):
Parameters
----------
- value: numeric or np.ndarray or aesara.tensor
+ value : tensor_like of float
Value(s) for which log CDF is calculated. If the log CDF for multiple
values are desired the values must be provided in a numpy array or Aesara tensor.
|
Update pymc.Laplace docsting (#<I>)
* fixed pymc.Laplace docsting
* fixed pymc.Laplace docsting
|
diff --git a/haproxy/datadog_checks/haproxy/haproxy.py b/haproxy/datadog_checks/haproxy/haproxy.py
index <HASH>..<HASH> 100644
--- a/haproxy/datadog_checks/haproxy/haproxy.py
+++ b/haproxy/datadog_checks/haproxy/haproxy.py
@@ -237,6 +237,9 @@ class HAProxy(AgentCheck):
custom_tags = [] if custom_tags is None else custom_tags
active_tag = [] if active_tag is None else active_tag
+ # First initialize here so that it is defined whether or not we enter the for loop
+ line_tags = list(custom_tags)
+
# Skip the first line, go backwards to set back_or_front
for line in data[:0:-1]:
if not line.strip():
|
Fix error in case of empty stat info (#<I>)
|
diff --git a/src/extensions/renderer/canvas/drawing-redraw.js b/src/extensions/renderer/canvas/drawing-redraw.js
index <HASH>..<HASH> 100644
--- a/src/extensions/renderer/canvas/drawing-redraw.js
+++ b/src/extensions/renderer/canvas/drawing-redraw.js
@@ -482,7 +482,7 @@ CRp.render = function( options ){
}
var extent = cy.extent();
- var vpManip = (r.pinching || r.hoverData.dragging || r.swipePanning || r.data.wheelZooming || r.hoverData.draggingEles);
+ var vpManip = (r.pinching || r.hoverData.dragging || r.swipePanning || r.data.wheelZooming || r.hoverData.draggingEles || r.cy.animated());
var hideEdges = r.hideEdgesOnViewport && vpManip;
var needMbClear = [];
|
Include the animated viewport case for `hideEdgesOnViewport `
Ref : Hide edges on viewport animation #<I>
|
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index <HASH>..<HASH> 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -140,7 +140,7 @@ class CombineAssets
* Minification filters
*/
if ($this->useMinify) {
- $this->registerFilter('js', new \Assetic\Filter\JSMinFilter);
+ $this->registerFilter('js', new \Assetic\Filter\JSqueezeFilter);
$this->registerFilter(['css', 'less', 'scss'], new \October\Rain\Parse\Assetic\StylesheetMinify);
}
|
Replaced JSMin with JSqueeze
|
diff --git a/spring-jdbc-oracle/src/main/java/com/github/ferstl/spring/jdbc/oracle/OracleJdbcTemplate.java b/spring-jdbc-oracle/src/main/java/com/github/ferstl/spring/jdbc/oracle/OracleJdbcTemplate.java
index <HASH>..<HASH> 100644
--- a/spring-jdbc-oracle/src/main/java/com/github/ferstl/spring/jdbc/oracle/OracleJdbcTemplate.java
+++ b/spring-jdbc-oracle/src/main/java/com/github/ferstl/spring/jdbc/oracle/OracleJdbcTemplate.java
@@ -32,7 +32,10 @@ import org.springframework.jdbc.core.ParameterizedPreparedStatementSetter;
* are processed as a whole, so it is not possible to find out the number of updated rows for each individual statement
* in a batch. For example, if the batch size is set to 5 and a batch update containing 7 statements
* (each of which updates exactly one row) is executed, the result will be {@code [0, 0, 0, 0, 5, 0, 2]}.
+ *
+ * @deprecated as of 12c the Oracle JDBC driver supports JDBC update batching and the proprietary API is deprecated
*/
+@Deprecated
public class OracleJdbcTemplate extends JdbcTemplate {
private final int sendBatchSize;
|
Deprecate OracleJdbcTemplate
As of <I>c the Oracle JDBC driver supports JDBC update batching and the
proprietary API is deprecated therefore OracleJdbcTemplate should be
deprecated as well.
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,8 +6,7 @@ var eslintFilter = filter('**/*.js', { restore: true });
stagedFiles()
.pipe(eslintFilter)
- .pipe(eslint({
- useEslintrc: true
- }))
+ .pipe(eslint())
.pipe(eslint.format())
- .pipe(eslint.failAfterError());
+ .pipe(eslint.failAfterError())
+ .pipe(eslintFilter.restore);
|
Removed useEslintrc option since it's true by default
|
diff --git a/scapy/base_classes.py b/scapy/base_classes.py
index <HASH>..<HASH> 100644
--- a/scapy/base_classes.py
+++ b/scapy/base_classes.py
@@ -14,6 +14,7 @@ Generators and packet meta classes.
import re,random,socket
import config
import error
+import types
class Gen(object):
def __iter__(self):
@@ -36,7 +37,9 @@ class SetGen(Gen):
while j <= i[1]:
yield j
j += 1
- elif isinstance(i, Gen) and (self._iterpacket or not isinstance(i,BasePacket)):
+ elif (isinstance(i, Gen) and
+ (self._iterpacket or not isinstance(i,BasePacket))) or (
+ isinstance(i, (xrange, types.GeneratorType))):
for j in i:
yield j
else:
|
Accept generators and xrange objects as field values
|
diff --git a/wptools/core.py b/wptools/core.py
index <HASH>..<HASH> 100644
--- a/wptools/core.py
+++ b/wptools/core.py
@@ -248,7 +248,7 @@ class WPTools:
https://www.wikidata.org/w/api.php?action=help&modules=wbgetentities
"""
if not self.wikibase:
- print("instance needs a wikibase")
+ print("instance needs a wikibase", file=sys.stderr)
return
if self._skip_get('get_wikidata'):
return
@@ -315,7 +315,7 @@ class WPTools:
# NOTE: json.dumps and pprint show unicode literals
print(header, file=sys.stderr)
- print("{")
+ print("{", file=sys.stderr)
for item in sorted(data):
- print(" %s: %s" % (item, data[item]))
- print("}")
+ print(" %s: %s" % (item, data[item]), file=sys.stderr)
+ print("}", file=sys.stderr)
|
print only to stderr in core
|
diff --git a/javascript/libjoynr-js/src/main/js/joynr/capabilities/CapabilitiesStore.js b/javascript/libjoynr-js/src/main/js/joynr/capabilities/CapabilitiesStore.js
index <HASH>..<HASH> 100644
--- a/javascript/libjoynr-js/src/main/js/joynr/capabilities/CapabilitiesStore.js
+++ b/javascript/libjoynr-js/src/main/js/joynr/capabilities/CapabilitiesStore.js
@@ -227,7 +227,7 @@ define(
*/
var checkAge = function checkAge(discoveryEntry, maxAge) {
var registrationTime = registeredCapabilitiesTime[hashCode(discoveryEntry)];
- if (registrationTime === undefined || maxAge === undefined) {
+ if (registrationTime === undefined || maxAge === undefined || maxAge < 0) {
return true;
}
return (Date.now() - registrationTime <= maxAge);
|
[JS] CapabilitiesStore.checkAge ignores negative max ages
This way, the age of capabilities can be ignored
Change-Id: I0e4cee<I>e<I>fdb<I>b6f5a<I>c0bc<I>bfa6b1
|
diff --git a/jOOX/src/main/java/org/joox/Impl.java b/jOOX/src/main/java/org/joox/Impl.java
index <HASH>..<HASH> 100644
--- a/jOOX/src/main/java/org/joox/Impl.java
+++ b/jOOX/src/main/java/org/joox/Impl.java
@@ -1884,6 +1884,7 @@ class Impl implements Match {
return write(new OutputStreamWriter(stream));
}
+ @SuppressWarnings("resource")
@Override
public final Match write(File file) throws IOException {
return write(new FileOutputStream(file));
|
The resource is always closed, in another method
|
diff --git a/scripts/compile-tsc.js b/scripts/compile-tsc.js
index <HASH>..<HASH> 100644
--- a/scripts/compile-tsc.js
+++ b/scripts/compile-tsc.js
@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+// tslint:disable:no-console
const fs = require('fs');
const path = require('path');
const shell = require('shelljs');
|
Fix lint by allowing console in build-tsc.js
|
diff --git a/src/Symfony/Component/Security/Core/Security.php b/src/Symfony/Component/Security/Core/Security.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Security/Core/Security.php
+++ b/src/Symfony/Component/Security/Core/Security.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Security\Core;
use Psr\Container\ContainerInterface;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Security\Core\User\UserInterface;
/**
@@ -20,7 +21,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
*
* @final
*/
-class Security
+class Security implements AuthorizationCheckerInterface
{
const ACCESS_DENIED_ERROR = '_security.403_error';
const AUTHENTICATION_ERROR = '_security.last_error';
|
[Security] class Security implements AuthorizationCheckerInterface
The class has the method of AuthorizationCheckerInterface already.
|
diff --git a/src/integration/helpers/to_map.go b/src/integration/helpers/to_map.go
index <HASH>..<HASH> 100644
--- a/src/integration/helpers/to_map.go
+++ b/src/integration/helpers/to_map.go
@@ -1,14 +1,13 @@
package helpers
-import (
- influxdb "github.com/influxdb/influxdb-go"
-)
+import "common"
-func ToMap(series *influxdb.Series) []map[string]interface{} {
- points := make([]map[string]interface{}, 0, len(series.Points))
- for _, p := range series.Points {
+func ToMap(series common.ApiSeries) []map[string]interface{} {
+ seriesPoints := series.GetPoints()
+ points := make([]map[string]interface{}, 0, len(seriesPoints))
+ for _, p := range seriesPoints {
point := map[string]interface{}{}
- for idx, column := range series.Columns {
+ for idx, column := range series.GetColumns() {
point[column] = p[idx]
}
points = append(points, point)
|
make ToMap work with any ApiSeries
|
diff --git a/public/vendor/aperture-slider/aperture-slider.js b/public/vendor/aperture-slider/aperture-slider.js
index <HASH>..<HASH> 100644
--- a/public/vendor/aperture-slider/aperture-slider.js
+++ b/public/vendor/aperture-slider/aperture-slider.js
@@ -157,7 +157,7 @@ var ApertureSlider = function (apertureDiv, frameCount, width, minHeight) {
/**
* slide to next frame
*
- * @param {Function} callBack [optional] is called when sliding is complete
+ * @param {Function} [callBack] is called when sliding is complete
*/
me.goForward = function (callBack) {
if (currentFrame < frameCount) {
@@ -168,7 +168,7 @@ var ApertureSlider = function (apertureDiv, frameCount, width, minHeight) {
/**
* Slide to last frame
*
- * @param {Function} callBack [optional] is called when sliding is complete
+ * @param {Function} [callBack] is called when sliding is complete
*/
me.goBack = function (callBack) {
if (currentFrame != 1) {
|
facator block ui in apps
|
diff --git a/src/Mautic/Form.php b/src/Mautic/Form.php
index <HASH>..<HASH> 100644
--- a/src/Mautic/Form.php
+++ b/src/Mautic/Form.php
@@ -170,6 +170,7 @@ class Form
if ($contactIp = $contact->getIp()) {
$request['header'][] = "X-Forwarded-For: $contactIp";
+ $request['header'][] = "Client-Ip: $contactIp";
}
if ($sessionId = $contact->getSessionId()) {
|
fix(client IP): Add additional header in form request
- Add a new header Client-Ip: w.x.y.z while submitting the form
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -13,9 +13,16 @@ function get(url) {
if (url.length <= 0 || typeof url !== 'string') {
throw Error("A valid URL is required");
}
+
+ var options = {
+ hostname: url,
+ agent: false,
+ rejectUnauthorized: false,
+ ciphers: "ALL",
+ };
return new Promise(function (resolve, reject) {
- var req = https.get({hostname: url, agent: false, rejectUnauthorized: false}, function (res) {
+ var req = https.get(options, function (res) {
var certificate = res.socket.getPeerCertificate();
if(isEmpty(certificate) || certificate === null) {
reject({message: 'The website did not provide a certificate'});
|
sets ciphers: "ALL" on https request
|
diff --git a/src/trace-plugin-interface.js b/src/trace-plugin-interface.js
index <HASH>..<HASH> 100644
--- a/src/trace-plugin-interface.js
+++ b/src/trace-plugin-interface.js
@@ -249,7 +249,8 @@ function createRootSpan_(api, options, skipFrames) {
incomingTraceContext = api.agent_.parseContextFromHeader(options.traceContext);
}
incomingTraceContext = incomingTraceContext || {};
- if (options.url && !api.agent_.shouldTrace(options.url, incomingTraceContext.options)) {
+ if (!api.agent_.shouldTrace(options.url || '',
+ incomingTraceContext.options)) {
return null;
}
var rootContext = api.agent_.createRootSpanData(options.name,
|
Bugfix for creating root spans through plugin API (#<I>)
PR-URL: #<I>
|
diff --git a/lib/buffer_concat_polyfill.js b/lib/buffer_concat_polyfill.js
index <HASH>..<HASH> 100644
--- a/lib/buffer_concat_polyfill.js
+++ b/lib/buffer_concat_polyfill.js
@@ -17,10 +17,10 @@ function polyfill(list, totalLength) {
i = 0;
// @see http://nodejs.org/api/buffer.html#buffer_class_method_buffer_concat_list_totallength
- if (list.length === 0 || size === 0) {
- return new Buffer(0);
- } else if (list.length === 1) {
+ if (list.length === 1) {
return list[0];
+ } else if (list.length === 0 || size === 0) {
+ return new Buffer(0);
} else {
result = new Buffer(size);
|
fix buffer concat polyfill for the case when the list contains one zero length buffer
|
diff --git a/lib/setup.js b/lib/setup.js
index <HASH>..<HASH> 100644
--- a/lib/setup.js
+++ b/lib/setup.js
@@ -174,6 +174,8 @@ function lessPlugins (opts) {
logger.fatal(err, 'could not find the requested Less plugin, ' + e.name);
process.exit(-1);
}
+
+ return e;
});
}
|
add missing return during plugin option setup
Issue: ENYO-<I>
Enyo-DCO-<I>-
|
diff --git a/coaster/__init__.py b/coaster/__init__.py
index <HASH>..<HASH> 100644
--- a/coaster/__init__.py
+++ b/coaster/__init__.py
@@ -354,7 +354,7 @@ def sanitize_html(value, valid_tags=VALID_TAGS):
newoutput = soup.renderContents()
if oldoutput == newoutput:
break
- warn("This method is deprecated. Please use the bleach library", DeprecationWarning)
+ warn("This function is deprecated. Please use the bleach library", DeprecationWarning)
return unicode(newoutput, 'utf-8')
|
It's a function, not a method
|
diff --git a/src/org/opencms/importexport/A_CmsImport.java b/src/org/opencms/importexport/A_CmsImport.java
index <HASH>..<HASH> 100644
--- a/src/org/opencms/importexport/A_CmsImport.java
+++ b/src/org/opencms/importexport/A_CmsImport.java
@@ -880,7 +880,7 @@ public abstract class A_CmsImport implements I_CmsImport {
List<Element> groupNodes;
List<String> userGroups;
Element currentElement, currentGroup;
- Map<String, Object> userInfo = new HashMap<String, Object>();
+ Map<String, Object> userInfo = null;
String name, description, flags, password, firstname, lastname, email, address, pwd, infoNode, defaultGroup;
// try to get the import resource
//getImportResource();
@@ -918,7 +918,10 @@ public abstract class A_CmsImport implements I_CmsImport {
} catch (ClassNotFoundException cnfex) {
m_report.println(cnfex);
}
-
+ // in case the user info could not be parsed create a new map
+ if (userInfo == null) {
+ userInfo = new HashMap<String, Object>();
+ }
// get the groups of the user and put them into the list
groupNodes = currentElement.selectNodes("*/" + A_CmsImport.N_GROUPNAME);
userGroups = new ArrayList<String>();
|
Fixing null pointer issue during user import.
|
diff --git a/linshareapi/admin/ldapconnections.py b/linshareapi/admin/ldapconnections.py
index <HASH>..<HASH> 100644
--- a/linshareapi/admin/ldapconnections.py
+++ b/linshareapi/admin/ldapconnections.py
@@ -133,6 +133,6 @@ class LdapConnections2(LdapConnections):
rbu.add_field('uuid')
rbu.add_field('label', required=True)
rbu.add_field('providerUrl', required=True)
- rbu.add_field('securityPrincipal', "principal")
- rbu.add_field('securityCredentials', "credential")
+ rbu.add_field('securityPrincipal', "principal", extended=True)
+ rbu.add_field('securityCredentials', "credential", extended=True)
return rbu
|
Mark some ldap fields as extented.
|
diff --git a/allennlp/commands/predict.py b/allennlp/commands/predict.py
index <HASH>..<HASH> 100644
--- a/allennlp/commands/predict.py
+++ b/allennlp/commands/predict.py
@@ -56,7 +56,8 @@ DEFAULT_PREDICTORS = {
'bidaf': 'machine-comprehension',
'simple_tagger': 'sentence-tagger',
'crf_tagger': 'sentence-tagger',
- 'coref': 'coreference-resolution'
+ 'coref': 'coreference-resolution',
+ 'constituency_parser': 'constituency-parser',
}
|
fix predictor issue for constituency parser (#<I>)
* fix predictor issue for constituency parser
* matt
|
diff --git a/store/store.go b/store/store.go
index <HASH>..<HASH> 100644
--- a/store/store.go
+++ b/store/store.go
@@ -99,6 +99,7 @@ type statsToken struct {
}
// statsKey returns the compound statistics identifier that represents key.
+// If write is true, the identifier will be created if necessary.
// Identifiers have a form similar to "ab:c:def:", where each section is a
// base-32 number that represents the respective word in key. This form
// allows efficiently indexing and searching for prefixes, while detaching
|
Add comment about write parameter, as mentioned by Rog.
|
diff --git a/lib/restforce/concerns/streaming.rb b/lib/restforce/concerns/streaming.rb
index <HASH>..<HASH> 100644
--- a/lib/restforce/concerns/streaming.rb
+++ b/lib/restforce/concerns/streaming.rb
@@ -8,11 +8,8 @@ module Restforce
#
# Returns a Faye::Subscription
def subscribe(channels, options = {}, &block)
- topics = Array(channels).map do |channel|
- replay_handlers[channel] = options[:replay]
- "/topic/#{channel}"
- end
- faye.subscribe topics, &block
+ Array(channels).each { |channel| replay_handlers[channel] = options[:replay] }
+ faye.subscribe Array(channels).map { |channel| "/topic/#{channel}" }, &block
end
# Public: Faye client to use for subscribing to PushTopics
|
Register handlers and convert to topics in 2 steps
|
diff --git a/client/cli/common/assignment.py b/client/cli/common/assignment.py
index <HASH>..<HASH> 100644
--- a/client/cli/common/assignment.py
+++ b/client/cli/common/assignment.py
@@ -166,7 +166,7 @@ class Assignment(core.Serializable):
print()
def _find_files(self, pattern):
- return glob.glob(pattern)
+ return sorted(glob.glob(pattern))
def _import_module(self, module):
return importlib.import_module(module)
|
Load tests in sorted order
|
diff --git a/safemysql.class.php b/safemysql.class.php
index <HASH>..<HASH> 100644
--- a/safemysql.class.php
+++ b/safemysql.class.php
@@ -470,23 +470,28 @@ class SafeMySQL
private function escapeInt($value)
{
- if (is_float($value))
- {
- $value = number_format($value, 0, '.', ''); // may lose precision on big numbers
- }
- elseif(is_numeric($value))
+ if ($value === NULL)
{
- $value = $value;
+ return 'NULL';
}
- else
+ if(!is_numeric($value))
{
$this->error("Integer (?i) placeholder expects numeric value, ".gettype($value)." given");
+ return FALSE;
}
- return " ".$value; // to avoid double munus collision (one from query + one from value = comment --)
+ if (is_float($value))
+ {
+ $value = number_format($value, 0, '.', ''); // may lose precision on big numbers
+ }
+ return $value;
}
private function escapeString($value)
{
+ if ($value === NULL)
+ {
+ return 'NULL';
+ }
return "'".mysqli_real_escape_string($this->conn,$value)."'";
}
|
Added NULL translation as suggested in issue #<I>
I changed my mind and made added literal translation from PHP's NULL into Mysql's NULL when processing placeholders.
|
diff --git a/builtin/providers/google/resource_compute_target_pool.go b/builtin/providers/google/resource_compute_target_pool.go
index <HASH>..<HASH> 100644
--- a/builtin/providers/google/resource_compute_target_pool.go
+++ b/builtin/providers/google/resource_compute_target_pool.go
@@ -82,6 +82,7 @@ func resourceComputeTargetPool() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
+ Default: "NONE",
},
},
}
|
Change google_compute_target_pool's session_affinity field default to NONE. (#<I>)
|
diff --git a/src/main/java/io/fabric8/maven/docker/service/QueryService.java b/src/main/java/io/fabric8/maven/docker/service/QueryService.java
index <HASH>..<HASH> 100644
--- a/src/main/java/io/fabric8/maven/docker/service/QueryService.java
+++ b/src/main/java/io/fabric8/maven/docker/service/QueryService.java
@@ -169,18 +169,4 @@ public class QueryService {
public boolean hasImage(String name) throws DockerAccessException {
return docker.hasImage(name);
}
-
- /**
- * Check whether an image needs to be pulled.
- *
- * @param mode the auto pull mode coming from the configuration
- * @param imageName name of the image to check
- * @param always whether to a alwaysPull mode would be active or is always ignored
- * @param previouslyPulled cache holding all previously pulled images
- * @return true if the image needs to be pulled, false otherwise
- *
- * @throws DockerAccessException
- * @throws MojoExecutionException
- */
-
}
|
chore: Removed bogus comment
|
diff --git a/src/Providers/ArtisanServiceProvider.php b/src/Providers/ArtisanServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/Providers/ArtisanServiceProvider.php
+++ b/src/Providers/ArtisanServiceProvider.php
@@ -10,10 +10,10 @@ use Illuminate\Console\Scheduling\ScheduleRunCommand;
use Cortex\Foundation\Console\Commands\JobMakeCommand;
use Cortex\Foundation\Console\Commands\MailMakeCommand;
use Cortex\Foundation\Console\Commands\RuleMakeCommand;
+use Cortex\Foundation\Console\Commands\EventListCommand;
use Cortex\Foundation\Console\Commands\EventMakeCommand;
use Cortex\Foundation\Console\Commands\ModelMakeCommand;
use Illuminate\Console\Scheduling\ScheduleFinishCommand;
-use Cortex\Foundation\Console\Commands\EventListCommand;
use Cortex\Foundation\Console\Commands\ConfigMakeCommand;
use Cortex\Foundation\Console\Commands\ModuleMakeCommand;
use Cortex\Foundation\Console\Commands\PolicyMakeCommand;
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/catalogue/src/main/java/org/project/openbaton/catalogue/mano/descriptor/VirtualDeploymentUnit.java b/catalogue/src/main/java/org/project/openbaton/catalogue/mano/descriptor/VirtualDeploymentUnit.java
index <HASH>..<HASH> 100644
--- a/catalogue/src/main/java/org/project/openbaton/catalogue/mano/descriptor/VirtualDeploymentUnit.java
+++ b/catalogue/src/main/java/org/project/openbaton/catalogue/mano/descriptor/VirtualDeploymentUnit.java
@@ -80,10 +80,10 @@ public class VirtualDeploymentUnit implements Serializable {
/**
* Contains information that is distinct for each VNFC created based on this VDU.
*/
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
private Set<VNFComponent> vnfc;
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
private Set<VNFCInstance> vnfc_instance;
/**
|
added orphanRemoval do VNFCs and VNFCIs
|
diff --git a/org.kevoree.modeling.microframework/src/test/java/org/kevoree/modeling/memory/storage/impl/OffHeapMemoryStorageTest.java b/org.kevoree.modeling.microframework/src/test/java/org/kevoree/modeling/memory/storage/impl/OffHeapMemoryStorageTest.java
index <HASH>..<HASH> 100644
--- a/org.kevoree.modeling.microframework/src/test/java/org/kevoree/modeling/memory/storage/impl/OffHeapMemoryStorageTest.java
+++ b/org.kevoree.modeling.microframework/src/test/java/org/kevoree/modeling/memory/storage/impl/OffHeapMemoryStorageTest.java
@@ -60,6 +60,9 @@ public class OffHeapMemoryStorageTest {
// KMemoryChunk
KMemoryChunk chunk = new OffHeapMemoryChunk();
+ storage.putAndReplace(0, 0, 0, chunk);
+ KMemoryChunk retrievedChunk = (KMemoryChunk) storage.get(0, 0, 0);
+ Assert.assertNotNull(retrievedChunk);
}
}
|
* first tests of offheap memory storage
|
diff --git a/lib/specials.js b/lib/specials.js
index <HASH>..<HASH> 100644
--- a/lib/specials.js
+++ b/lib/specials.js
@@ -9,6 +9,7 @@ const intended = [
'HTTPS',
'JSX',
'DNS',
+ 'URL',
'now.sh'
]
|
Add URL as special word (#<I>)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.