diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/salt/runners/saltutil.py b/salt/runners/saltutil.py
index <HASH>..<HASH> 100644
--- a/salt/runners/saltutil.py
+++ b/salt/runners/saltutil.py
@@ -42,6 +42,7 @@ def sync_all(saltenv='base'):
ret['wheel'] = sync_wheel(saltenv=saltenv)
ret['engines'] = sync_engines(saltenv=saltenv)
ret['queues'] = sync_queues(saltenv=saltenv)
+ ret['pillar'] = sync_pillar(saltenv=saltenv)
return ret
@@ -230,3 +231,20 @@ def sync_queues(saltenv='base'):
salt-run saltutil.sync_queues
'''
return salt.utils.extmods.sync(__opts__, 'queues', saltenv=saltenv)[0]
+
+
+def sync_pillar(saltenv='base'):
+ '''
+ Sync pillar modules from ``salt://_pillar`` to the master
+
+ saltenv : base
+ The fileserver environment from which to sync. To sync from more than
+ one environment, pass a comma-separated list.
+
+ CLI Example:
+
+ .. code-block:: bash
+
+ salt-run saltutil.sync_pillar
+ '''
+ return salt.utils.extmods.sync(__opts__, 'pillar', saltenv=saltenv)[0]
|
add pillars to extmods sync_all commands
So that we can use _pillar from the fileserver
|
diff --git a/src/main/java/org/jbake/app/Parser.java b/src/main/java/org/jbake/app/Parser.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jbake/app/Parser.java
+++ b/src/main/java/org/jbake/app/Parser.java
@@ -48,6 +48,7 @@ public class Parser {
private Map<String, Object> content = new HashMap<String, Object>();
private Asciidoctor asciidoctor;
private String contentPath;
+ private String currentPath;
private DateFormat dateFormat;
private PegDownProcessor pegdownProcessor;
@@ -122,7 +123,7 @@ public class Parser {
*/
public Map<String, Object> processFile(File file) {
content = new HashMap<String, Object>();
- contentPath = file.getParent();
+ currentPath = file.getParent();
InputStream is = null;
List<String> fileContents = null;
try {
@@ -373,7 +374,7 @@ public class Parser {
String name = iterator.next();
options.setOption(name, guessTypeByContent(optionsSubset.getString(name)));
}
- options.setBaseDir(contentPath);
+ options.setBaseDir(currentPath);
options.setSafe(UNSAFE);
return options;
}
|
Added new var to store current path.
|
diff --git a/src/stores/GuildMemberRoleStore.js b/src/stores/GuildMemberRoleStore.js
index <HASH>..<HASH> 100644
--- a/src/stores/GuildMemberRoleStore.js
+++ b/src/stores/GuildMemberRoleStore.js
@@ -106,7 +106,7 @@ class GuildMemberRoleStore extends DataStore {
* @readonly
*/
get highest() {
- return this.reduce((prev, role) => !prev || role.comparePositionTo(prev) > 0 ? role : prev);
+ return this.reduce((prev, role) => role.comparePositionTo(prev) > 0 ? role : prev, this.first());
}
/**
diff --git a/src/stores/RoleStore.js b/src/stores/RoleStore.js
index <HASH>..<HASH> 100644
--- a/src/stores/RoleStore.js
+++ b/src/stores/RoleStore.js
@@ -56,6 +56,15 @@ class RoleStore extends DataStore {
}
/**
+ * The role with the highest position in the store
+ * @type {Role}
+ * @readonly
+ */
+ get highest() {
+ return this.reduce((prev, role) => role.comparePositionTo(prev) > 0 ? role : prev, this.first());
+ }
+
+ /**
* Data that can be resolved to a Role object. This can be:
* * A Role
* * A Snowflake
|
fix: re-add highest property to RoleStore and GuildMemberRoleStore
closes #<I>
|
diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index <HASH>..<HASH> 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -86,7 +86,8 @@
if (changes.length) cm.operation(function() {
for (var i = 0; i < changes.length; ++i) {
var change = changes[i];
- cm.replaceRange(change.text, change.from, change.to);
+ if (change.text || CodeMirror.cmpPos(change.from, change.to))
+ cm.replaceRange(change.text, change.from, change.to);
}
});
return changes.length ? {from: changes[0].from, to: CodeMirror.changeEnd(changes[changes.length - 1])} : null;
|
[hardwrap addon] Don't generate null changes
Issue #<I>
|
diff --git a/editor/editor.py b/editor/editor.py
index <HASH>..<HASH> 100644
--- a/editor/editor.py
+++ b/editor/editor.py
@@ -973,8 +973,7 @@ class Editor(App):
def move_widget(self, css_key, value):
# css_key can be 'top' or 'left'
# value (int): positive or negative value
- if issubclass(self.selectedWidget.__class__, gui.Widget) and css_key in self.selectedWidget.style and \
- self.selectedWidget.css_position=='absolute':
+ if issubclass(self.selectedWidget.__class__, gui.Widget) and css_key in self.selectedWidget.style:
self.selectedWidget.style[css_key] = gui.to_pix(gui.from_pix(self.selectedWidget.style[css_key]) + value)
def onkeydown(self, emitter, key, keycode, ctrl, shift, alt):
|
Editor: resize and move shortcuts not limited with absolute positioning.
|
diff --git a/src/frontend/org/voltdb/iv2/TransactionTaskQueue.java b/src/frontend/org/voltdb/iv2/TransactionTaskQueue.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/iv2/TransactionTaskQueue.java
+++ b/src/frontend/org/voltdb/iv2/TransactionTaskQueue.java
@@ -329,6 +329,7 @@ public class TransactionTaskQueue
*/
if (firstTask) {
firstTask = false;
+ } else {
iter.remove();
}
taskQueueOffer(task);
|
For ENG-<I>, fix a bug in TransactionTaskQueue where the first fragment was removed from the queue
|
diff --git a/tests/classes/Gems/Util/MonitorTest.php b/tests/classes/Gems/Util/MonitorTest.php
index <HASH>..<HASH> 100644
--- a/tests/classes/Gems/Util/MonitorTest.php
+++ b/tests/classes/Gems/Util/MonitorTest.php
@@ -52,6 +52,9 @@ class MonitorTest extends \Gems_Test_DbTestAbstract
$this->transport = new \Zend_Mail_Transport_File($options);
\Zend_Mail::setDefaultTransport($this->transport);
+
+ // Make sure the lock file can be written, not a problem outside test situations
+ \MUtil_File::ensureDir(GEMS_ROOT_DIR . '/var/settings');
}
/**
|
#<I> Make sure lock file can be written
|
diff --git a/h5p.classes.php b/h5p.classes.php
index <HASH>..<HASH> 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -412,13 +412,13 @@ interface H5PFrameworkInterface {
* Start an atomic operation against the dependency storage
*/
public function lockDependencyStorage();
-
+
/**
* Stops an atomic operation against the dependency storage
*/
public function unlockDependencyStorage();
-
-
+
+
/**
* Delete a library from database and file system
*
@@ -1327,7 +1327,8 @@ class H5PStorage {
// Move the content folder
$destination_path = $contents_path . DIRECTORY_SEPARATOR . $contentId;
- @rename($current_path, $destination_path);
+ $this->h5pC->copyFileTree($current_path, $destination_path);
+ H5PCore::deleteFileTree($current_path);
// Save the content library dependencies
$this->h5pF->saveLibraryUsage($contentId, $librariesInUse);
|
Replaced another rename function.
|
diff --git a/code/ZenFields.php b/code/ZenFields.php
index <HASH>..<HASH> 100755
--- a/code/ZenFields.php
+++ b/code/ZenFields.php
@@ -48,8 +48,12 @@ class ZenFields extends Extension {
* @param array The arguments to the method
* @return FieldList
*/
- public function __call($method, $args) {
+ public function __call($method, $args) {
$formFieldClass = ucfirst($method)."Field";
+ $getter = "get".ucfirst($method);
+ if($this->owner->hasMethod($getter)) {
+ return $this->owner->$getter();
+ }
if(is_subclass_of($formFieldClass, "FormField")) {
if(!isset($args[0])) {
user_error("FieldList::{$method} -- Missing argument 1 for field name", E_ERROR);
@@ -213,7 +217,8 @@ class ZenFields extends Extension {
* @return array
*/
public function allMethodNames() {
- $methods = array (
+ $methods = array (
+ 'add',
'tab',
'field',
'group',
|
ENHANCEMENT: Detect getters and fallback, i.e. FieldGroup::getTag conflict with TagField
|
diff --git a/src/DoctrineServiceProvider.php b/src/DoctrineServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/DoctrineServiceProvider.php
+++ b/src/DoctrineServiceProvider.php
@@ -263,6 +263,7 @@ class DoctrineServiceProvider extends ServiceProvider
AuthManager::class,
EntityManager::class,
DoctrineManager::class,
+ ConnectionManager::class,
ClassMetadataFactory::class,
EntityManagerInterface::class,
ExtensionManager::class,
|
Add ConnectionManager to service provider
This way it can be used to extend(replace) and add custom connection drivers
|
diff --git a/src/main/java/com/relayrides/pushy/apns/ApnsConnection.java b/src/main/java/com/relayrides/pushy/apns/ApnsConnection.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/relayrides/pushy/apns/ApnsConnection.java
+++ b/src/main/java/com/relayrides/pushy/apns/ApnsConnection.java
@@ -304,6 +304,9 @@ public class ApnsConnection<T extends ApnsPushNotification> {
// listeners if the handshake has completed. Otherwise, we'll notify listeners of a connection failure (as
// opposed to closure) elsewhere.
if (this.apnsConnection.handshakeCompleted && this.apnsConnection.listener != null) {
+ // At this point, there may still be some tasks in the event queue (i.e. write future listeners). We
+ // want to make sure those are all done before we notify listeners of connection closure, so we put the
+ // actual handler notification at the end of the queue.
context.channel().eventLoop().execute(new Runnable() {
@Override
|
Added a comment explaining the weird-ish queue maneuver when connections close.
|
diff --git a/php-binance-api.php b/php-binance-api.php
index <HASH>..<HASH> 100644
--- a/php-binance-api.php
+++ b/php-binance-api.php
@@ -669,7 +669,7 @@ class API
/**
* withdrawFee get the withdrawal fee for an asset
*
- * $withdrawFee = $api->withdrawHistory( "BTC" );
+ * $withdrawFee = $api->withdrawFee( "BTC" );
*
* @param $asset string currency such as BTC
* @return array with error message or array containing withdrawFee
|
Add to withdrawHistory and depositHistory, new withdrawFee function
|
diff --git a/src/test/java/org/springframework/data/solr/repository/query/SolrQueryMethodTests.java b/src/test/java/org/springframework/data/solr/repository/query/SolrQueryMethodTests.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/springframework/data/solr/repository/query/SolrQueryMethodTests.java
+++ b/src/test/java/org/springframework/data/solr/repository/query/SolrQueryMethodTests.java
@@ -241,6 +241,12 @@ public class SolrQueryMethodTests {
Assert.assertNull(method.getTimeAllowed());
}
+ @Test
+ public void testQueryWithDefType() throws Exception {
+ SolrQueryMethod method = getQueryMethodByName("findByNameEndingWith", String.class);
+ Assert.assertEquals("lucene", method.getDefType());
+ }
+
private SolrQueryMethod getQueryMethodByName(String name, Class<?>... parameters) throws Exception {
Method method = Repo1.class.getMethod(name, parameters);
return new SolrQueryMethod(method, new DefaultRepositoryMetadata(Repo1.class), creator);
@@ -297,6 +303,9 @@ public class SolrQueryMethodTests {
@Query(value = "*:*", timeAllowed = -10)
List<ProductBean> findAllWithNegativeTimeRestriction(String name);
+
+ @Query(defType = "lucene")
+ List<ProductBean> findByNameEndingWith(String name);
}
}
|
DATASOLR-<I> - additional test for 'defType' in @Query
|
diff --git a/ui/js/components/auth.js b/ui/js/components/auth.js
index <HASH>..<HASH> 100644
--- a/ui/js/components/auth.js
+++ b/ui/js/components/auth.js
@@ -162,10 +162,14 @@ treeherder.component("loginCallback", {
algorithm: 'sha256'
};
this.loginError = null;
- const header = hawk.client.header(loginUrl, 'GET', {
+ var payload = {
credentials: credentials,
- ext: hawk.utils.base64urlEncode(JSON.stringify({"certificate": JSON.parse(certificate)}))}
- );
+ };
+ if (certificate) {
+ payload.ext = hawk.utils.base64urlEncode(JSON.stringify({"certificate": JSON.parse(certificate)}));
+ }
+
+ const header = hawk.client.header(loginUrl, 'GET', payload);
// send a request from client side to TH server signed with TC
// creds from login.taskcluster.net
|
Bug <I> - Support login with permanent credentials (empty cert) (#<I>)
|
diff --git a/src/gridstack.js b/src/gridstack.js
index <HASH>..<HASH> 100644
--- a/src/gridstack.js
+++ b/src/gridstack.js
@@ -429,11 +429,12 @@
if (this.opts.auto) {
var elements = [];
+ var _this = this;
this.container.children('.' + this.opts.item_class).each(function (index, el) {
el = $(el);
elements.push({
el: el,
- i: parseInt(el.attr('data-gs-x')) + parseInt(el.attr('data-gs-y')) * parseInt(el.attr('data-gs-width'))
+ i: parseInt(el.attr('data-gs-x')) + parseInt(el.attr('data-gs-y')) * _this.opts.width // Use opts.width as weight for Y
});
});
_.chain(elements).sortBy(function (x) { return x.i; }).each(function (i) {
|
Correctly sort nodes by using the total width instead of individual node width (becomes a problem with nodes of variable width).
|
diff --git a/src/cf/commands/user/unset_space_role_test.go b/src/cf/commands/user/unset_space_role_test.go
index <HASH>..<HASH> 100644
--- a/src/cf/commands/user/unset_space_role_test.go
+++ b/src/cf/commands/user/unset_space_role_test.go
@@ -90,7 +90,6 @@ var _ = Describe("Testing with ginkgo", func() {
Expect(spaceRepo.FindByNameInOrgName).To(Equal("my-space"))
Expect(spaceRepo.FindByNameInOrgOrgGuid).To(Equal("some-org-guid"))
- println(ui.DumpOutputs())
testassert.SliceContains(ui.Outputs, testassert.Lines{
{"Removing role", "SpaceManager", "some-user", "some-org", "some-space", "my-user"},
{"OK"},
|
Remove stray debug println statement
|
diff --git a/lib/devise_security_extension/models/password_archivable.rb b/lib/devise_security_extension/models/password_archivable.rb
index <HASH>..<HASH> 100644
--- a/lib/devise_security_extension/models/password_archivable.rb
+++ b/lib/devise_security_extension/models/password_archivable.rb
@@ -9,7 +9,7 @@ module Devise # :nodoc:
base.class_eval do
include InstanceMethods
- has_many :old_passwords, :as => :password_archivable, :class_name => "OldPassword"
+ has_many :old_passwords, :as => :password_archivable, :dependent => :destroy
before_update :archive_password
validate :validate_password_archive
end
|
Added dependent destroy on the old passwords to help clean up the old password table for users that were removed.
|
diff --git a/core/server/master/src/main/java/alluxio/master/file/meta/InodeTree.java b/core/server/master/src/main/java/alluxio/master/file/meta/InodeTree.java
index <HASH>..<HASH> 100644
--- a/core/server/master/src/main/java/alluxio/master/file/meta/InodeTree.java
+++ b/core/server/master/src/main/java/alluxio/master/file/meta/InodeTree.java
@@ -187,7 +187,7 @@ public class InodeTree implements JournalCheckpointStreamable {
}
/**
- * @param uri the uri to get the inode for
+ * @param uri the {@link AlluxioURI} to check for existence
* @return whether the inode exists
*/
public boolean inodePathExists(AlluxioURI uri) {
|
clarified the javadoc in InodeTree.java for method inodePathExists
|
diff --git a/packages/utils-uuid/index.js b/packages/utils-uuid/index.js
index <HASH>..<HASH> 100644
--- a/packages/utils-uuid/index.js
+++ b/packages/utils-uuid/index.js
@@ -105,31 +105,6 @@ exports.humanized = function humanized (words = 6) {
return Random.sample(ENGENIE, english, words).join('.')
}
-// ───────────────────────────────── Utils ───────────────────────────────────
-
-/* Public utils */
-exports.util = {}
-
-/**
- * Checks if the given input string against the Damm algorithm
- *
- * @param {String} input - Numeric String, probs from uuid.numeric()
- *
- * @return {Boolean}
- */
-
-exports.util.verifyNumeric = input => generateCheckDigit(input) === '0'
-
-/**
- * Return a random value within the provided array
- *
- * @param {Array} inputArray
- *
- * @return {*} A random element of the array
- */
-
-exports.util.pick = input => Random.pick(ENGENIE, input)
-
// ──────────────────────────────── Exports ──────────────────────────────────
/* Freze the API */
|
Removed uuid.util
moved to @cactus-technologies/utils
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ setup(
# List run-time dependencies here. These will be installed by pip when
# your project is installed.
- install_requires=['requests'],
+ install_requires=['requests', 'pytz'],
# If there are data files included in your packages that need to be
# installed, specify them here. If using Python 2.6 or less, then these
|
add pytz in project requirements
|
diff --git a/src/FeedIo/Feed.php b/src/FeedIo/Feed.php
index <HASH>..<HASH> 100644
--- a/src/FeedIo/Feed.php
+++ b/src/FeedIo/Feed.php
@@ -151,4 +151,12 @@ class Feed extends Node implements FeedInterface, \JsonSerializable
return $properties;
}
+
+ /**
+ * @return int
+ */
+ public function count()
+ {
+ return count($this->items);
+ }
}
diff --git a/src/FeedIo/FeedInterface.php b/src/FeedIo/FeedInterface.php
index <HASH>..<HASH> 100644
--- a/src/FeedIo/FeedInterface.php
+++ b/src/FeedIo/FeedInterface.php
@@ -18,7 +18,7 @@ use FeedIo\Feed\ItemInterface;
* Represents the top node of a news feed
* @package FeedIo
*/
-interface FeedInterface extends \Iterator, NodeInterface
+interface FeedInterface extends \Iterator, \Countable, NodeInterface
{
/**
|
Add \Countable to FeedInterface. Implement it in Feed
|
diff --git a/pyxel/ui/widget.py b/pyxel/ui/widget.py
index <HASH>..<HASH> 100644
--- a/pyxel/ui/widget.py
+++ b/pyxel/ui/widget.py
@@ -68,7 +68,7 @@ class Widget:
def parent(self, value):
self._parent = value
- if value:
+ if value and self not in value._children:
value._children.append(self)
@property
|
Added the check code for the parent property
|
diff --git a/build-support/bin/_release_helper.py b/build-support/bin/_release_helper.py
index <HASH>..<HASH> 100644
--- a/build-support/bin/_release_helper.py
+++ b/build-support/bin/_release_helper.py
@@ -189,6 +189,7 @@ def validate_pants_pkg(version: str, venv_dir: Path, extra_pip_args: list[str])
"'pants.backend.awslambda.python', "
"'pants.backend.python', "
"'pants.backend.shell', "
+ "'pants.backend.experimental.java', "
"'internal_plugins.releases'"
"]"
),
|
[internal] CI: include java in release test (#<I>)
CI is broken after <URL>
|
diff --git a/metricdef/metricdef.go b/metricdef/metricdef.go
index <HASH>..<HASH> 100644
--- a/metricdef/metricdef.go
+++ b/metricdef/metricdef.go
@@ -170,7 +170,7 @@ func GetMetrics(scroll_id string) ([]*schema.MetricDefinition, string, error) {
var err error
var out elastigo.SearchResult
if scroll_id == "" {
- out, err = es.Search(IndexName, "metric_index", map[string]interface{}{"scroll": "1m"}, nil)
+ out, err = es.Search(IndexName, "metric_index", map[string]interface{}{"scroll": "1m", "size": 1000}, nil)
} else {
out, err = es.Scroll(map[string]interface{}{"scroll": "1m"}, scroll_id)
}
|
set doc count size to <I> to improve ES query performance.
|
diff --git a/lib/callbacks/transform.js b/lib/callbacks/transform.js
index <HASH>..<HASH> 100644
--- a/lib/callbacks/transform.js
+++ b/lib/callbacks/transform.js
@@ -309,13 +309,13 @@ if (typeof exports !== 'undefined') {
* Preliminary pass: mark source nodes so we can map line numbers
* Also eliminate _fast_ syntax
*/
- function _isMarker(node) {
- return node.type === IDENTIFIER && node.value === '_';
- }
- function _isStar(node) {
- return node.type === CALL && _isMarker(node.children[0]) && node.children[1].children.length === 2;
- }
function _removeFast(node, options) {
+ function _isMarker(node) {
+ return node.type === IDENTIFIER && node.value === options.callback;
+ }
+ function _isStar(node) {
+ return node.type === CALL && _isMarker(node.children[0]) && node.children[1].children.length === 2;
+ }
// ~_ -> _
if (node.type === BITWISE_NOT && _isMarker(node.children[0])) {
options.needsTransform = true;
|
Support options.callback != '_' in callbacks mode.
|
diff --git a/path.py b/path.py
index <HASH>..<HASH> 100644
--- a/path.py
+++ b/path.py
@@ -82,10 +82,10 @@ except AttributeError:
PY3 = sys.version_info[0] >= 3
if PY3:
def u(x):
- return codecs.unicode_escape_decode(x)[0]
+ return x
else:
def u(x):
- return x
+ return codecs.unicode_escape_decode(x)[0]
o777 = 511
o766 = 502
|
Present the modern, Python 3 version first
|
diff --git a/lib/magento/base.rb b/lib/magento/base.rb
index <HASH>..<HASH> 100644
--- a/lib/magento/base.rb
+++ b/lib/magento/base.rb
@@ -47,9 +47,20 @@ module Magento
end
end
- def method_missing(method, *args)
- return nil unless @attributes
- @attributes[method.to_s]
+ def method_missing(method_symbol, *arguments)
+ method_name = method_symbol.to_s
+
+ if method_name =~ /(=|\?)$/
+ case $1
+ when "="
+ @attributes[$`] = arguments.first
+ when "?"
+ @attributes[$`]
+ end
+ else
+ return @attributes[method_name] if @attributes.include?(method_name)
+ super
+ end
end
end
@@ -58,4 +69,4 @@ module Magento
end
class ApiError < StandardError; end
-end
\ No newline at end of file
+end
|
method_mising as in activeresource: support for setters plus raise error on missing attribute
|
diff --git a/javascript/node/selenium-webdriver/lib/test/index.js b/javascript/node/selenium-webdriver/lib/test/index.js
index <HASH>..<HASH> 100644
--- a/javascript/node/selenium-webdriver/lib/test/index.js
+++ b/javascript/node/selenium-webdriver/lib/test/index.js
@@ -188,8 +188,23 @@ function suite(fn, opt_options) {
inSuite = true;
var suiteOptions = opt_options || {};
+ var browsers = suiteOptions.browsers;
+ if (browsers) {
+ // Filter out browser specific tests when that browser is not currently
+ // selected for testing.
+ browsers = browsers.filter(function(browser) {
+ if (browsersToTest.indexOf(browser) != -1) {
+ return true;
+ }
+ return browsersToTest.indexOf(
+ browser.substring('remote.'.length)) != -1;
+ });
+ } else {
+ browsers = browsersToTest;
+ }
+
try {
- (suiteOptions.browsers || browsersToTest).forEach(function(browser) {
+ browsers.forEach(function(browser) {
testing.describe('[' + browser + ']', function() {
var serverToUse = null;
|
Filter out browser specific tests when that browser is not currently selected for testing.
|
diff --git a/src/input/pointer.js b/src/input/pointer.js
index <HASH>..<HASH> 100644
--- a/src/input/pointer.js
+++ b/src/input/pointer.js
@@ -582,7 +582,7 @@
// check if mapped to a key
if (keycode) {
- if (e.type === POINTER_DOWN[0] || e.type === POINTER_DOWN[1] || e.type === POINTER_DOWN[2]) {
+ if (e.type === POINTER_DOWN[0] || e.type === POINTER_DOWN[1] || e.type === POINTER_DOWN[2] || e.type === POINTER_DOWN[3]) {
return api._keydown(e, keycode, button + 1);
}
else { // 'mouseup' or 'touchend'
|
[#<I>] Add touchstart to pointer event check
|
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index <HASH>..<HASH> 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -5,7 +5,7 @@
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do
- wrap_parameters format: [:json]
+ wrap_parameters :format => [:json]
end
# Disable root element in JSON by default.
|
did not work with ruby <I>
|
diff --git a/lib/kete_trackable_items/extensions/helpers/application_helper.rb b/lib/kete_trackable_items/extensions/helpers/application_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/kete_trackable_items/extensions/helpers/application_helper.rb
+++ b/lib/kete_trackable_items/extensions/helpers/application_helper.rb
@@ -64,11 +64,14 @@ ApplicationHelper.module_eval do
html = String.new
phrase = order.blank? ? t('application_helper.tracking_list_create_html.location_tracking') :
t('application_helper.tracking_list_create_html.tracking_list_from_order')
+ basket = order.blank? ? @current_basket : order.basket
+ repositories = basket.repositories.count == 0 &&
+ basket != @site_basket ? @site_basket.repositories : basket.repositories
- if @current_basket.repositories.count > 0
- if @current_basket.repositories.count == 1
+ if repositories.count > 0
+ if repositories.count == 1
- url_hash = { :repository_id => @current_basket.repositories.first,
+ url_hash = { :repository_id => repositories.first,
:method => :post }
if order
|
Making basket and repositories resolve properly for order and/or non-site baskets without a repository.
|
diff --git a/tests/fixtures/TenantResolver.php b/tests/fixtures/TenantResolver.php
index <HASH>..<HASH> 100644
--- a/tests/fixtures/TenantResolver.php
+++ b/tests/fixtures/TenantResolver.php
@@ -2,11 +2,13 @@
namespace OwenIt\Auditing\Tests\fixtures;
+use OwenIt\Auditing\Contracts\Auditable;
use OwenIt\Auditing\Contracts\Resolver;
class TenantResolver implements Resolver
{
- public static function resolve()
+
+ public static function resolve(Auditable $auditable)
{
return 1;
}
|
Fix test-resolver missing argument
|
diff --git a/lib/fastlane/lane_manager.rb b/lib/fastlane/lane_manager.rb
index <HASH>..<HASH> 100644
--- a/lib/fastlane/lane_manager.rb
+++ b/lib/fastlane/lane_manager.rb
@@ -7,7 +7,23 @@ module Fastlane
ff = Fastlane::FastFile.new(File.join(Fastlane::FastlaneFolder.path, 'Fastfile'))
if lanes.count == 0
- raise "Please pass the name of the lane you want to drive. Available lanes: #{ff.runner.available_lanes.join(', ')}".red
+ loop do
+ Helper.log.error "You must provide a lane to drive. Available lanes:"
+ available = ff.runner.available_lanes
+
+ available.each_with_index do |lane, index|
+ puts "#{index + 1}) #{lane}"
+ end
+
+ i = gets.strip.to_i - 1
+ if i >= 0 and (available[i] rescue nil)
+ lanes = [available[i]]
+ Helper.log.info "Driving the lane #{lanes.first}. Next time launch fastlane using `fastlane #{lanes.first}`".green
+ break # yeah
+ end
+
+ Helper.log.error "Invalid input. Please enter the number of the lane you want to use".red
+ end
end
# Making sure the default '.env' and '.env.default' get loaded
|
Added lane selection if you don't specify one
|
diff --git a/core/src/main/java/com/orientechnologies/orient/core/config/OStorageConfiguration.java b/core/src/main/java/com/orientechnologies/orient/core/config/OStorageConfiguration.java
index <HASH>..<HASH> 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/config/OStorageConfiguration.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/config/OStorageConfiguration.java
@@ -478,10 +478,7 @@ public class OStorageConfiguration implements OSerializableStream {
indexEngines.put(name.toLowerCase(getLocaleInstance()), indexEngineData);
}
}
-
- // SET FLAGS
- strictSQL = "true".equalsIgnoreCase("strictSQL");
- txRequiredForSQLGraphOperations = "true".equalsIgnoreCase("txRequiredForSQLGraphOperations");
+
}
public OSerializableStream fromStream(final byte[] iStream) throws OSerializationException {
|
Remove wrong fix on configuration read from stream
|
diff --git a/php/class-wp-cli.php b/php/class-wp-cli.php
index <HASH>..<HASH> 100644
--- a/php/class-wp-cli.php
+++ b/php/class-wp-cli.php
@@ -661,7 +661,11 @@ class WP_CLI {
* @param CompositeCommand $old_command Command that was already registered.
* @param CompositeCommand $new_command New command that is being added.
*/
- private static function merge_sub_commands( $command_to_keep, $old_command, $new_command ) {
+ private static function merge_sub_commands(
+ CompositeCommand $command_to_keep,
+ CompositeCommand $old_command,
+ CompositeCommand $new_command
+ ) {
foreach ( $old_command->get_subcommands() as $subname => $subcommand ) {
$command_to_keep->add_subcommand( $subname, $subcommand, false );
}
|
Enforce types for merge_sub_commands()
|
diff --git a/lib/eye/patch/capistrano.rb b/lib/eye/patch/capistrano.rb
index <HASH>..<HASH> 100644
--- a/lib/eye/patch/capistrano.rb
+++ b/lib/eye/patch/capistrano.rb
@@ -7,14 +7,14 @@ Capistrano::Configuration.instance.load do
if fetch(:eye_default_hooks)
after "deploy:stop", "eye:stop"
- after "deploy:start", "eye:start"
+ after "deploy:start", "eye:load"
before "deploy:restart", "eye:restart"
end
namespace :eye do
desc "Start eye with the desired configuration file"
- task :start, roles: -> { fetch(:eye_roles) } do
+ task :load, roles: -> { fetch(:eye_roles) } do
run "cd #{current_path} && #{fetch(:eye_bin)} l #{fetch(:eye_config)}"
end
@@ -28,4 +28,6 @@ Capistrano::Configuration.instance.load do
run "cd #{current_path} && #{fetch(:eye_bin)} r all"
end
end
+
+ before "eye:restart", "eye:load"
end
|
Reload eye configuration before restart on deploy
|
diff --git a/views/partials/sidebar-left.blade.php b/views/partials/sidebar-left.blade.php
index <HASH>..<HASH> 100644
--- a/views/partials/sidebar-left.blade.php
+++ b/views/partials/sidebar-left.blade.php
@@ -1,4 +1,4 @@
-<div class="grid-md-4 grid-lg-3">
+<aside class="grid-md-4 grid-lg-3">
<?php
global $post;
$childOf = isset(array_reverse(get_post_ancestors($post))[1]) ? array_reverse(get_post_ancestors($post))[1] : get_option('page_on_front');
@@ -21,4 +21,4 @@
<?php endif; ?>
<?php dynamic_sidebar('left-sidebar'); ?>
-</div>
+</aside>
|
Sidebar from div element to aside element
|
diff --git a/tensorflow_datasets/image_classification/food101.py b/tensorflow_datasets/image_classification/food101.py
index <HASH>..<HASH> 100644
--- a/tensorflow_datasets/image_classification/food101.py
+++ b/tensorflow_datasets/image_classification/food101.py
@@ -69,7 +69,7 @@ class Food101(tfds.core.GeneratorBasedBuilder):
description=(_DESCRIPTION),
features=tfds.features.FeaturesDict(features_dict),
supervised_keys=("image", "label"),
- homepage="https://www.vision.ee.ethz.ch/datasets_extra/food-101/",
+ homepage="https://data.vision.ee.ethz.ch/cvl/datasets_extra/food-101/",
citation=_CITATION)
def _split_generators(self, dl_manager):
|
Updating faulty link in food<I>.py file
The homepage link to the Food<I> paper given in the file was wrong leading to a <I> error
Added the correct link to the Food<I> paper
|
diff --git a/biodata-models/src/main/java/org/opencb/biodata/models/variant/annotation/ConsequenceTypeMappings.java b/biodata-models/src/main/java/org/opencb/biodata/models/variant/annotation/ConsequenceTypeMappings.java
index <HASH>..<HASH> 100644
--- a/biodata-models/src/main/java/org/opencb/biodata/models/variant/annotation/ConsequenceTypeMappings.java
+++ b/biodata-models/src/main/java/org/opencb/biodata/models/variant/annotation/ConsequenceTypeMappings.java
@@ -83,6 +83,8 @@ public class ConsequenceTypeMappings {
termToAccession.put("CpG_island", 307);
termToAccession.put("DNAseI_hypersensitive_site", 685);
termToAccession.put("polypeptide_variation_site", 336);
+ termToAccession.put("protein_altering_variant", 1818);
+ termToAccession.put("start_lost", 2012);
// Fill the accession to term map
for(String key : termToAccession.keySet()) {
|
ConsequenceTypeMappings: added two new terms
|
diff --git a/Collection.php b/Collection.php
index <HASH>..<HASH> 100644
--- a/Collection.php
+++ b/Collection.php
@@ -726,17 +726,19 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
}
/**
- * Partition the collection into two array using the given callback.
+ * Partition the collection into two arrays using the given callback or key.
*
- * @param callable $callback
+ * @param callable|string $callback
* @return array
*/
- public function partition(callable $callback)
+ public function partition($callback)
{
$partitions = [new static(), new static()];
+ $callback = $this->valueRetriever($callback);
+
foreach ($this->items as $item) {
- $partitions[! (int) $callback($item)][] = $item;
+ $partitions[(int) ! $callback($item)][] = $item;
}
return $partitions;
|
Allow passing a key to the partition method in the collection class.
|
diff --git a/packages/node_modules/@webex/internal-plugin-devices/test/integration/spec/devices.js b/packages/node_modules/@webex/internal-plugin-devices/test/integration/spec/devices.js
index <HASH>..<HASH> 100644
--- a/packages/node_modules/@webex/internal-plugin-devices/test/integration/spec/devices.js
+++ b/packages/node_modules/@webex/internal-plugin-devices/test/integration/spec/devices.js
@@ -421,9 +421,9 @@ describe('plugin-devices', () => {
});
describe('when the priority host cannot be mapped', () => {
- beforeEach('remove postauth services', () => {
- /* eslint-disable-next-line no-underscore-dangle */
- services._getCatalog().serviceGroups.postauth = [];
+ beforeEach('stub priority host url converting', () => {
+ services.convertUrlToPriorityHostUrl = sinon.stub();
+ services.convertUrlToPriorityHostUrl.returns(undefined);
});
it('should return a rejected promise',
|
test(internal-plugin-devices): improve websocket retrieval
Update the test suite to validate that the web socket
retrieval method updates work as expected.
|
diff --git a/core/server/services/bulk-email/index.js b/core/server/services/bulk-email/index.js
index <HASH>..<HASH> 100644
--- a/core/server/services/bulk-email/index.js
+++ b/core/server/services/bulk-email/index.js
@@ -221,8 +221,8 @@ module.exports = {
recipient.member_first_name = (recipient.member_name || '').split(' ')[0];
// dynamic data from replacements
- replacements.forEach((id, recipientProp, fallback) => {
- data[id] = recipient[recipientProp] || fallback || '';
+ replacements.forEach(({id, recipientProperty, fallback}) => {
+ data[id] = recipient[recipientProperty] || fallback || '';
});
recipientData[recipient.member_email] = data;
|
🐛 Fixed email card replacements showing raw replacement text in emails
closes <URL>
|
diff --git a/lib/snowy_owl/version.rb b/lib/snowy_owl/version.rb
index <HASH>..<HASH> 100644
--- a/lib/snowy_owl/version.rb
+++ b/lib/snowy_owl/version.rb
@@ -1,3 +1,3 @@
module SnowyOwl
- VERSION = "0.1.1"
+ VERSION = "0.1.2"
end
|
[hy] release <I>
|
diff --git a/spyder/preferences/configdialog.py b/spyder/preferences/configdialog.py
index <HASH>..<HASH> 100644
--- a/spyder/preferences/configdialog.py
+++ b/spyder/preferences/configdialog.py
@@ -143,6 +143,7 @@ class ConfigDialog(QDialog):
# Widgets
self.pages_widget = QStackedWidget()
+ self.pages_widget.setMinimumWidth(600)
self.contents_widget = QListWidget()
self.button_reset = QPushButton(_('Reset to defaults'))
@@ -162,6 +163,7 @@ class ConfigDialog(QDialog):
self.contents_widget.setSpacing(1)
self.contents_widget.setCurrentRow(0)
self.contents_widget.setMinimumWidth(220)
+ self.contents_widget.setMinimumHeight(400)
# Layout
hsplitter = QSplitter()
|
Preferences: Add minimum width for its pages and height for its contents
|
diff --git a/src/MadeYourDay/Contao/CustomElements.php b/src/MadeYourDay/Contao/CustomElements.php
index <HASH>..<HASH> 100644
--- a/src/MadeYourDay/Contao/CustomElements.php
+++ b/src/MadeYourDay/Contao/CustomElements.php
@@ -976,8 +976,15 @@ class CustomElements
public static function loadConfig($bypassCache = false)
{
// Don't load the config in the install tool
- if (\Environment::get('script') === 'contao/install.php') {
- return;
+ if (version_compare(VERSION, '4.0', '>=')) {
+ if (\System::getContainer()->get('request')->get('_route') === 'contao_backend_install') {
+ return;
+ }
+ }
+ else {
+ if (\Environment::get('script') === 'contao/install.php') {
+ return;
+ }
}
$filePaths = static::getCacheFilePaths();
|
Added compatibility for Contao 4
|
diff --git a/languages/perl.php b/languages/perl.php
index <HASH>..<HASH> 100644
--- a/languages/perl.php
+++ b/languages/perl.php
@@ -50,7 +50,7 @@ class LuminousPerlScanner extends LuminousSimpleScanner {
$stack--;
if (!$stack)
$close_delimiter_match = $next[1][2];
- $finish = $next[0];
+ $finish = $next[0] + strlen($next[1][1]);
}
else assert(0);
$this->pos($next[0] + strlen($next[1][0]));
|
fix perl gobbling backslashes, sometimes
|
diff --git a/code/MSSQLDatabaseConfigurationHelper.php b/code/MSSQLDatabaseConfigurationHelper.php
index <HASH>..<HASH> 100644
--- a/code/MSSQLDatabaseConfigurationHelper.php
+++ b/code/MSSQLDatabaseConfigurationHelper.php
@@ -53,10 +53,8 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
/**
* Ensure a database connection is possible using credentials provided.
- * The established connection resource is returned with the results as well.
- *
* @param array $databaseConfig Associative array of db configuration, e.g. "server", "username" etc
- * @return array Result - e.g. array('success' => true, 'connection' => mssql link, 'error' => 'details of error')
+ * @return array Result - e.g. array('success' => true, 'error' => 'details of error')
*/
public function requireDatabaseConnection($databaseConfig) {
$success = false;
@@ -80,7 +78,6 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
return array(
'success' => $success,
- 'connection' => $conn,
'error' => $error
);
}
|
MINOR Removed return of connection which is not used any longer
|
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index <HASH>..<HASH> 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -136,13 +136,13 @@ class Dispatcher extends Object {
)));
}
- $privateAction = (bool)(strpos($this->params['action'], '_', 0) === 0);
+ $privateAction = $this->params['action'][0] === '_';
$prefixes = Router::prefixes();
if (!empty($prefixes)) {
if (isset($this->params['prefix'])) {
$this->params['action'] = $this->params['prefix'] . '_' . $this->params['action'];
- } elseif (strpos($this->params['action'], '_') !== false && !$privateAction) {
+ } elseif (strpos($this->params['action'], '_') > 0) {
list($prefix, $action) = explode('_', $this->params['action']);
$privateAction = in_array($prefix, $prefixes);
}
|
Applying patch from 'robustsolution' for optimization in Dispatcher::dispatch. Fixes #<I>
|
diff --git a/tests/test_fields/test_field_tracker.py b/tests/test_fields/test_field_tracker.py
index <HASH>..<HASH> 100644
--- a/tests/test_fields/test_field_tracker.py
+++ b/tests/test_fields/test_field_tracker.py
@@ -189,6 +189,7 @@ class FieldTrackerTests(FieldTrackerTestCase, FieldTrackerCommonTests):
# has_changed() returns False for deferred fields, without un-deferring them.
# Use an if because ModelTracked doesn't support has_changed() in this case.
if self.tracked_class == Tracked:
+ self.assertFalse(item.tracker.has_changed('number'))
if django.VERSION >= (1, 10):
self.assertTrue('number' in item.get_deferred_fields())
else:
|
Cover a branch in `has_changed`.
|
diff --git a/gbdxtools/images/worldview.py b/gbdxtools/images/worldview.py
index <HASH>..<HASH> 100644
--- a/gbdxtools/images/worldview.py
+++ b/gbdxtools/images/worldview.py
@@ -36,8 +36,7 @@ class WorldViewImage(RDABaseImage):
@staticmethod
def _find_parts(cat_id, band_type):
- query = "item_type:IDAHOImage AND attributes.catalogID:{} " \
- "AND attributes.colorInterpretation:{}".format(cat_id, band_types[band_type])
+ query = "item_type:IDAHOImage AND attributes.catalogID:{}".format(cat_id)
_parts = vector_services_query(query)
if not len(_parts):
raise MissingIdahoImages('Unable to find IDAHO imagery in the catalog: {}'.format(query))
|
worldview parts method now returns all idaho image parts for an image
|
diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
index <HASH>..<HASH> 100644
--- a/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
+++ b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
@@ -270,6 +270,11 @@ final class ConfigDelayedMerge extends AbstractConfigValue implements Unmergeabl
render(stack, sb, indent, atRoot, atKey, options);
}
+ @Override
+ protected void render(StringBuilder sb, int indent, boolean atRoot, ConfigRenderOptions options) {
+ render(sb, indent, atRoot, null, options);
+ }
+
// static method also used by ConfigDelayedMergeObject.
static void render(List<AbstractConfigValue> stack, StringBuilder sb, int indent, boolean atRoot, String atKey,
ConfigRenderOptions options) {
|
Fix toString of ConfigDelayedMerge, the default render() in superclass didn't work
The superclass called unwrapped() to render, which isn't allowed here.
|
diff --git a/lib/fezzik.rb b/lib/fezzik.rb
index <HASH>..<HASH> 100644
--- a/lib/fezzik.rb
+++ b/lib/fezzik.rb
@@ -3,8 +3,8 @@ require "thread"
require "rake"
require "rake/remote_task"
require "colorize"
-require "fezzik/base.rb"
-require "fezzik/environment.rb"
-require "fezzik/io.rb"
-require "fezzik/util.rb"
-require "fezzik/version.rb"
+require "fezzik/base"
+require "fezzik/environment"
+require "fezzik/io"
+require "fezzik/util"
+require "fezzik/version"
|
Delete .rb from some requires
|
diff --git a/hug/test.py b/hug/test.py
index <HASH>..<HASH> 100644
--- a/hug/test.py
+++ b/hug/test.py
@@ -76,10 +76,13 @@ for method in HTTP_METHODS:
globals()[method.lower()] = tester
-def cli(method, *args, **arguments):
+def cli(method, *args, api=None, module=None, **arguments):
"""Simulates testing a hug cli method from the command line"""
-
collect_output = arguments.pop('collect_output', True)
+ if api and module:
+ raise ValueError("Please specify an API OR a Module that contains the API, not both")
+ elif api or module:
+ method = API(api or module).cli.commands[method].interface._function
command_args = [method.__name__] + list(args)
for name, values in arguments.items():
|
Add ability to test against API for CLI methods
|
diff --git a/jsf/injection/src/main/java/org/jboss/as/jsf/injection/weld/WeldApplicationFactory.java b/jsf/injection/src/main/java/org/jboss/as/jsf/injection/weld/WeldApplicationFactory.java
index <HASH>..<HASH> 100644
--- a/jsf/injection/src/main/java/org/jboss/as/jsf/injection/weld/WeldApplicationFactory.java
+++ b/jsf/injection/src/main/java/org/jboss/as/jsf/injection/weld/WeldApplicationFactory.java
@@ -28,6 +28,13 @@ public class WeldApplicationFactory extends ForwardingApplicationFactory {
private volatile Application application;
+ // This private constructor must never be called, but it is here to suppress the WELD-001529 warning
+ // that an InjectionTarget is created for this class with no appropriate constructor.
+ private WeldApplicationFactory() {
+ super();
+ applicationFactory = null;
+ }
+
public WeldApplicationFactory(ApplicationFactory applicationFactory) {
this.applicationFactory = applicationFactory;
}
|
WFLY-<I> CDI JSF apps get WELD-<I> warning
|
diff --git a/vendor/Krystal/Validate/Pattern/PerPageCount.php b/vendor/Krystal/Validate/Pattern/PerPageCount.php
index <HASH>..<HASH> 100644
--- a/vendor/Krystal/Validate/Pattern/PerPageCount.php
+++ b/vendor/Krystal/Validate/Pattern/PerPageCount.php
@@ -27,8 +27,10 @@ final class PerPageCount extends AbstractPattern
'Numeric' => array(
'message' => 'Per page count must be numeric',
),
-
- //@TODO Min 1
+ 'GreaterThan' => array(
+ 'value' => 0,
+ 'message' => 'Per page count must be greater than 0'
+ )
)
));
}
|
Added greater than 0 restriction to per page pattern
|
diff --git a/tests/ExpressGatewayTest.php b/tests/ExpressGatewayTest.php
index <HASH>..<HASH> 100644
--- a/tests/ExpressGatewayTest.php
+++ b/tests/ExpressGatewayTest.php
@@ -101,7 +101,8 @@ class ExpressGatewayTest extends GatewayTestCase
'currency' => 'BYR'
))->send();
- $httpRequest = $this->getMockedRequests()[0];
+ $httpRequests = $this->getMockedRequests();
+ $httpRequest = $httpRequests[0];
$queryArguments = $httpRequest->getQuery()->toArray();
$this->assertSame('GET_TOKEN', $queryArguments['TOKEN']);
$this->assertSame('GET_PAYERID', $queryArguments['PAYERID']);
@@ -126,7 +127,8 @@ class ExpressGatewayTest extends GatewayTestCase
'payerid' => 'CUSTOM_PAYERID'
))->send();
- $httpRequest = $this->getMockedRequests()[0];
+ $httpRequests = $this->getMockedRequests();
+ $httpRequest = $httpRequests[0];
$queryArguments = $httpRequest->getQuery()->toArray();
$this->assertSame('CUSTOM_TOKEN', $queryArguments['TOKEN']);
$this->assertSame('CUSTOM_PAYERID', $queryArguments['PAYERID']);
|
Fixed PHP<I> distaste of index access after function call: ()[0]
|
diff --git a/lib/sprockets/digest_utils.rb b/lib/sprockets/digest_utils.rb
index <HASH>..<HASH> 100644
--- a/lib/sprockets/digest_utils.rb
+++ b/lib/sprockets/digest_utils.rb
@@ -80,6 +80,9 @@ module Sprockets
digest << val.to_s
}
end
+
+ ADD_VALUE_TO_DIGEST.compare_by_identity.rehash
+
ADD_VALUE_TO_DIGEST.default_proc = ->(_, val) {
raise TypeError, "couldn't digest #{ val }"
}
|
Speed up Hash lookups with constants
Since we are always looking up these hashes with an identical duplicate (not just the same value, the same object) we can take advantage of Hash.compare_by_identity.
Suggested by @dgynn in <URL>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -22,7 +22,7 @@ function Queue(options) {
EventEmitter.call(this);
options = options || {};
- this.concurrency = options.concurrency || 1;
+ this.concurrency = options.concurrency || Infinity;
this.timeout = options.timeout || 0;
this.pending = 0;
this.session = 0;
|
change default concurrency to Infinity
|
diff --git a/src/windows/CameraProxy.js b/src/windows/CameraProxy.js
index <HASH>..<HASH> 100644
--- a/src/windows/CameraProxy.js
+++ b/src/windows/CameraProxy.js
@@ -176,7 +176,14 @@ function takePictureFromFileWP(successCallback, errorCallback, args) {
else {
var storageFolder = Windows.Storage.ApplicationData.current.localFolder;
file.copyAsync(storageFolder, file.name, Windows.Storage.NameCollisionOption.replaceExisting).done(function (storageFile) {
- successCallback(URL.createObjectURL(storageFile));
+ if(destinationType == Camera.DestinationType.NATIVE_URI) {
+ successCallback("ms-appdata:///local/" + storageFile.name);
+ }
+ else {
+ successCallback(URL.createObjectURL(storageFile));
+ }
+
+
}, function () {
errorCallback("Can't access localStorage folder.");
});
|
Patch for CB-<I>, this closes #<I>
|
diff --git a/hazelcast/src/test/java/com/hazelcast/collection/SetTransactionTest.java b/hazelcast/src/test/java/com/hazelcast/collection/SetTransactionTest.java
index <HASH>..<HASH> 100644
--- a/hazelcast/src/test/java/com/hazelcast/collection/SetTransactionTest.java
+++ b/hazelcast/src/test/java/com/hazelcast/collection/SetTransactionTest.java
@@ -10,6 +10,7 @@ import com.hazelcast.test.annotation.QuickTest;
import com.hazelcast.transaction.TransactionContext;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -19,6 +20,7 @@ import static org.junit.Assert.*;
@RunWith(HazelcastParallelClassRunner.class)
@Category(ProblematicTest.class)
+@Ignore
public class SetTransactionTest {
static HazelcastInstance instance1;
|
Explicitly ignored SetTransactionTest because of long running time
|
diff --git a/lib/to_lang/string_methods.rb b/lib/to_lang/string_methods.rb
index <HASH>..<HASH> 100644
--- a/lib/to_lang/string_methods.rb
+++ b/lib/to_lang/string_methods.rb
@@ -28,25 +28,19 @@ module ToLang
case method.to_s
when /^to_(.*)_from_(.*)$/
if CODEMAP[$1] && CODEMAP[$2]
- define_and_call_method(method) do
- translate(CODEMAP[$1], :from => CODEMAP[$2])
- end
+ define_and_call_method(method) { translate(CODEMAP[$1], :from => CODEMAP[$2]) }
else
original_method_missing(method, *args, block)
end
when /^from_(.*)_to_(.*)$/
if CODEMAP[$1] && CODEMAP[$2]
- define_and_call_method(method) do
- translate(CODEMAP[$2], :from => CODEMAP[$1])
- end
+ define_and_call_method(method) { translate(CODEMAP[$2], :from => CODEMAP[$1]) }
else
original_method_missing(method, *args, block)
end
when /^to_(.*)$/
if CODEMAP[$1]
- define_and_call_method(method) do
- translate(CODEMAP[$1])
- end
+ define_and_call_method(method) { translate(CODEMAP[$1]) }
else
original_method_missing(method, *args, block)
end
|
favor braces over do/end for further terseness
|
diff --git a/sublimedsl/keymap.py b/sublimedsl/keymap.py
index <HASH>..<HASH> 100644
--- a/sublimedsl/keymap.py
+++ b/sublimedsl/keymap.py
@@ -260,11 +260,6 @@ class Context():
self.match_all = None
self._parent = parent
- for op in self._OPERATORS:
- func = partial(self._operator, op)
- func.__name__ = op
- setattr(self.__class__, op, func)
-
def all(self):
""" Require the test to succeed for all selections.
@@ -306,6 +301,11 @@ class Context():
self.operand = operand
return self._parent or self
+ def __getattr__(self, name):
+ if name in self._OPERATORS:
+ return partial(self._operator, name)
+ raise AttributeError
+
def __str__(self):
return jsonify(self, indent=None)
|
Fix wrongly defined operator methods in Context
This is equivalent to method_missing in Ruby. A better solution would be
to correctly define the methods dynamically on the class, but that's
unnecessarily complicated. Python <I> added handy function partialmethod
that would be ideal for this case, but I should keep sublimedsl
compatible at least with <I>.
|
diff --git a/lib/acmesmith/command.rb b/lib/acmesmith/command.rb
index <HASH>..<HASH> 100644
--- a/lib/acmesmith/command.rb
+++ b/lib/acmesmith/command.rb
@@ -81,6 +81,7 @@ module Acmesmith
acme.new_certificate(csr)
rescue Acme::Client::Error::Unauthorized => e
raise unless config.auto_authorize_on_request
+ raise if retried
puts "=> Authorizing unauthorized domain names"
# https://github.com/letsencrypt/boulder/blob/b9369a481415b3fe31e010b34e2ff570b89e42aa/ra/ra.go#L604
@@ -95,7 +96,7 @@ module Acmesmith
puts " * #{domains.join(', ')}"
authorize(*domains)
retried = true
- retry unless retried
+ retry
end
cert = Certificate.from_acme_client_certificate(acme_cert)
|
Oops, it didn't work...
|
diff --git a/config/local.js b/config/local.js
index <HASH>..<HASH> 100644
--- a/config/local.js
+++ b/config/local.js
@@ -3,7 +3,7 @@ module.exports = {
/**
* Core-Node config
*/
- endpointPath: __dirname + '/../endpoints/',
+ endpointPath: `${process.cwd()}/api`,
endpointParent: __dirname + '/../lib/endpoint.js',
/**
|
feat: enable 0 config setup
- use /api in cwd as standard folder for endpoints
|
diff --git a/packages/components/bolt-link/src/link.js b/packages/components/bolt-link/src/link.js
index <HASH>..<HASH> 100644
--- a/packages/components/bolt-link/src/link.js
+++ b/packages/components/bolt-link/src/link.js
@@ -153,21 +153,15 @@ class BoltLink extends withLitHtml() {
switch (name) {
case 'before':
case 'after':
- const iconClasses = cx('c-bolt-link__icon', {
- 'is-empty': name in this.slots === false,
- });
-
- return html`
- <span class="${iconClasses}"
- >${
- name in this.slots
- ? this.slot(name)
- : html`
- <slot name="${name}" />
- `
- }</span
- >
- `;
+ const iconClasses = cx('c-bolt-link__icon');
+
+ return name in this.slots
+ ? html`
+ <span class="${iconClasses}">${this.slot(name)}</span>
+ `
+ : html`
+ <slot name="${name}" />
+ `;
default:
const itemClasses = cx('c-bolt-link__text', {
'is-empty': name in this.slots === false,
|
feature: only output icon wrapper span when slot has content
|
diff --git a/src/Crypto.php b/src/Crypto.php
index <HASH>..<HASH> 100644
--- a/src/Crypto.php
+++ b/src/Crypto.php
@@ -60,7 +60,7 @@ class Crypto
// TODO: requester public key
- if ($transaction->recipientId) {
+ if (isset($transaction->recipientId)) {
$out .= \BitWasp\Bitcoin\Base58::decodeCheck($transaction->recipientId)->getBinary();
} else {
$out .= pack('x21');
|
fix: check if recipient is set
|
diff --git a/envy.go b/envy.go
index <HASH>..<HASH> 100644
--- a/envy.go
+++ b/envy.go
@@ -68,8 +68,16 @@ func loadEnv() {
}
}
+// Mods returns true if module support is enabled, false otherwise
+// See https://github.com/golang/go/wiki/Modules#how-to-install-and-activate-module-support for details
func Mods() bool {
- return Get(GO111MODULE, "off") == "on"
+ go111 := Get(GO111MODULE, "")
+
+ if !InGoPath() {
+ return go111 != "off"
+ }
+
+ return go111 == "on"
}
// Reload the ENV variables. Useful if
diff --git a/envy_test.go b/envy_test.go
index <HASH>..<HASH> 100644
--- a/envy_test.go
+++ b/envy_test.go
@@ -31,6 +31,10 @@ func Test_Mods(t *testing.T) {
r.False(Mods())
Set(GO111MODULE, "on")
r.True(Mods())
+ Set(GO111MODULE, "auto")
+ r.Equal(!InGoPath(), Mods())
+ Set(GO111MODULE, "")
+ r.Equal(!InGoPath(), Mods())
})
}
|
envy.Mods() - Modify behavior to better match the current module autodetection in place in go (#<I>)
Add tests for GO<I>MODULE being set to auto or being left blank.
|
diff --git a/teensy_minimal_rpc/proxy.py b/teensy_minimal_rpc/proxy.py
index <HASH>..<HASH> 100644
--- a/teensy_minimal_rpc/proxy.py
+++ b/teensy_minimal_rpc/proxy.py
@@ -350,7 +350,8 @@ try:
adc_sampler = AdcSampler(self, channels, sample_count)
adc_sampler.reset()
adc_sampler.start_read(sampling_rate_hz)
- df_adc_results = adc_sampler.get_results().astype('int16')
+ dtype = 'int16' if differential else 'uint16'
+ df_adc_results = adc_sampler.get_results().astype(dtype)
df_volts = reference_V * (df_adc_results /
(1 << (resolution +
adc_settings.gain_power)))
|
Return unsigned integers if not differential mode
|
diff --git a/tests/test_examples.py b/tests/test_examples.py
index <HASH>..<HASH> 100644
--- a/tests/test_examples.py
+++ b/tests/test_examples.py
@@ -32,7 +32,7 @@ def compare_text(example_filename, output_text):
saved_text = infile.read()
assert output_text == saved_text
-def similar_images(orig_image, new_image, tol=1.0e-1):
+def similar_images(orig_image, new_image, tol=1.0e-6):
"""Compare two PIL image objects and return a boolean True/False of whether
they are similar (True) or not (False). "tol" is a unitless float between
0-1 that does not depend on the size of the images."""
|
Fix mistaken threshold value in image comparison that crept in somewhere
|
diff --git a/grimoire_elk/utils.py b/grimoire_elk/utils.py
index <HASH>..<HASH> 100755
--- a/grimoire_elk/utils.py
+++ b/grimoire_elk/utils.py
@@ -225,8 +225,11 @@ def get_kibiter_version(url):
The url must point to the Elasticsearch used by Kibiter
"""
- config_url = '/.kibana/config/_search'
- url += "/" + config_url
+ config_url = '.kibana/config/_search'
+ # Avoid having // in the URL because ES will fail
+ if url[-1] != '/':
+ url += "/"
+ url += config_url
r = requests.get(url)
r.raise_for_status()
version = r.json()['hits']['hits'][0]['_id']
|
Avoid adding '//' to URL to be used with Elasticsearch API REST because
the API REST petition will fail if '//' are in the URL path.
|
diff --git a/src/frontend/org/voltdb/dbmonitor/js/voltdb.admin.ui.js b/src/frontend/org/voltdb/dbmonitor/js/voltdb.admin.ui.js
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/dbmonitor/js/voltdb.admin.ui.js
+++ b/src/frontend/org/voltdb/dbmonitor/js/voltdb.admin.ui.js
@@ -1762,8 +1762,8 @@ function loadAdminPage() {
var newStreamProperties = $(".newStreamProperty");
for (var i = 0; i < newStreamProperties.length; i += 2) {
newConfig["property"].push({
- "name": $(newStreamProperties[i]).val(),
- "value": $(newStreamProperties[i + 1]).val(),
+ "name": encodeURIComponent($(newStreamProperties[i]).val()),
+ "value": encodeURIComponent($(newStreamProperties[i + 1]).val()),
});
}
|
VMC-<I> : URLEncoded data to pass special characters.
|
diff --git a/aeron-client/src/main/java/io/aeron/Aeron.java b/aeron-client/src/main/java/io/aeron/Aeron.java
index <HASH>..<HASH> 100644
--- a/aeron-client/src/main/java/io/aeron/Aeron.java
+++ b/aeron-client/src/main/java/io/aeron/Aeron.java
@@ -66,7 +66,7 @@ public final class Aeron implements AutoCloseable
/**
* Duration in nanoseconds for which the client conductor will sleep between duty cycles.
*/
- public static final long IDLE_SLEEP_NS = TimeUnit.MILLISECONDS.toNanos(10);
+ public static final long IDLE_SLEEP_NS = TimeUnit.MILLISECONDS.toNanos(16);
/**
* Default interval between sending keepalive control messages to the driver.
|
[Java] Increase idle sleep from <I> to <I>ms in client conductor duty cycle.
|
diff --git a/malcolm/modules/stats/parts/statspart.py b/malcolm/modules/stats/parts/statspart.py
index <HASH>..<HASH> 100644
--- a/malcolm/modules/stats/parts/statspart.py
+++ b/malcolm/modules/stats/parts/statspart.py
@@ -392,7 +392,10 @@ class StatsPart(parts.ChildPart):
'/dls_sw/work',
'/dls_sw/prod')
- self.stats["pymalcolm_ver"] = version.__version__
+ if self.stats["pymalcolm_path"].startswith('/dls_sw/prod'):
+ self.stats["pymalcolm_ver"] = version.__version__
+ else:
+ self.stats["pymalcolm_ver"] = "Work"
hostname = os.uname()[1]
self.stats["kernel"] = "%s %s" % (os.uname()[0], os.uname()[2])
self.stats["hostname"] = hostname if len(hostname) < 39 else hostname[
|
check if pymalcolm is running from prod before setting version stat
|
diff --git a/bika/lims/browser/worksheet.py b/bika/lims/browser/worksheet.py
index <HASH>..<HASH> 100644
--- a/bika/lims/browser/worksheet.py
+++ b/bika/lims/browser/worksheet.py
@@ -1253,6 +1253,8 @@ class WorksheetServicesView(BikaListingView):
self.show_select_column = True
self.pagesize = 0
self.show_workflow_action_buttons = False
+ self.show_categories=context.bika_setup.getCategoriseAnalysisServices()
+ self.expand_all_categories=True
self.columns = {
'Service': {'title': _('Service'),
@@ -1276,7 +1278,8 @@ class WorksheetServicesView(BikaListingView):
self.categories = []
catalog = getToolByName(self, self.catalog)
services = catalog(portal_type = "AnalysisService",
- inactive_state = "active")
+ inactive_state = "active",
+ sort_on = 'sortable_title')
items = []
for service in services:
# if the service has dependencies, it can't have reference analyses
@@ -1311,7 +1314,6 @@ class WorksheetServicesView(BikaListingView):
}
items.append(item)
- items = sorted(items, key = itemgetter('Service'))
self.categories.sort(lambda x, y: cmp(x.lower(), y.lower()))
return items
|
dbw#<I> add_reference: group and sort services list
|
diff --git a/src/sap.ui.core/src/sap/ui/thirdparty/RequestRecorder.js b/src/sap.ui.core/src/sap/ui/thirdparty/RequestRecorder.js
index <HASH>..<HASH> 100644
--- a/src/sap.ui.core/src/sap/ui/thirdparty/RequestRecorder.js
+++ b/src/sap.ui.core/src/sap/ui/thirdparty/RequestRecorder.js
@@ -690,6 +690,7 @@
// Get next entry
var sUrl = resolveURL(oXhr.url);
+ sUrl = new URI(sUrl).resource();
sUrl = _private.replaceEntriesUrlByRegex(sUrl);
var sUrlGroup = oXhr.method + sUrl;
@@ -851,4 +852,4 @@
}
};
return RequestRecorder;
-}));
\ No newline at end of file
+}));
|
[INTERNAL][FIX] RequestRecorder: Get correct URL part
The RequestRecorder uses the URL resource part as part of the index
for the its saved requests. The resource call got missing and the
URLs could not be found because the index of the map differs
with the check for the current request.
Change-Id: I6f<I>c<I>c<I>bc8a<I>cff<I>c<I>
|
diff --git a/models/cad-status.js b/models/cad-status.js
index <HASH>..<HASH> 100644
--- a/models/cad-status.js
+++ b/models/cad-status.js
@@ -21,6 +21,8 @@ var StatusOptionValue = new Schema({
type: String,
default: ""
}
+}, {
+ _id: false
});
var StatusOption = new Schema({
@@ -44,6 +46,8 @@ var StatusOption = new Schema({
type: [StatusOptionValue],
default: []
}
+}, {
+ _id: false
});
var modelSchema = new Schema({
diff --git a/models/department.js b/models/department.js
index <HASH>..<HASH> 100644
--- a/models/department.js
+++ b/models/department.js
@@ -14,6 +14,8 @@ var Agency = new Schema({
type: String,
default: ""
}
+}, {
+ _id: false
});
var EsriToken = new Schema({
diff --git a/models/user.js b/models/user.js
index <HASH>..<HASH> 100644
--- a/models/user.js
+++ b/models/user.js
@@ -26,6 +26,8 @@ var Agency = new Schema({
type: String,
default: ""
}
+}, {
+ _id: false
});
var modelSchema = new Schema({
|
Added missing _id: false to child objects
|
diff --git a/wilson/util/wetutil.py b/wilson/util/wetutil.py
index <HASH>..<HASH> 100644
--- a/wilson/util/wetutil.py
+++ b/wilson/util/wetutil.py
@@ -171,7 +171,7 @@ def rotate_down(C_in, p):
UdL.conj(), UdL,
C_in[k])
# type dL X dL X
- for k in ['S1ddRR', ]:
+ for k in ['S1ddRR', 'S8ddRR']:
C[k] = np.einsum('ia,kc,ijkl->ajcl',
UdL.conj(), UdL.conj(),
C_in[k])
|
[wetutil] Add missing operator to d_L rotation
|
diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go
index <HASH>..<HASH> 100644
--- a/core/corehttp/gateway_handler.go
+++ b/core/corehttp/gateway_handler.go
@@ -662,6 +662,7 @@ func (i *gatewayHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {
nnode, err := root.GetDirectory().GetNode()
if err != nil {
webError(w, "WritableGateway: failed to finalize", err, http.StatusInternalServerError)
+ return
}
ncid := nnode.Cid()
|
fix(gw): missing return if dir fails to finalize (#<I>)
|
diff --git a/src/Helpers/helpers.php b/src/Helpers/helpers.php
index <HASH>..<HASH> 100644
--- a/src/Helpers/helpers.php
+++ b/src/Helpers/helpers.php
@@ -43,6 +43,14 @@ if (! function_exists('concatenate_with_separator')) {
}
if (! function_exists('getDbPropertyId')) {
+ /**
+ * Gets the ID from a table and column based on a term
+ *
+ * @param $term
+ * @param $table
+ * @param string $column
+ * @return null
+ */
function getDbPropertyId($term, $table, $column = 'name') {
$result = \Illuminate\Support\Facades\DB::table($table)
@@ -54,4 +62,18 @@ if (! function_exists('getDbPropertyId')) {
}
return null;
}
+}
+
+if (! function_exists('ddd')) {
+ /**
+ * Adds file and line to the traditional die and dump function
+ */
+ function ddd() {
+ $from = debug_backtrace()[0];
+ $args = func_get_args();
+ array_push($args, $from['file']);
+ array_push($args, $from['line']);
+
+ call_user_func_array('dd', $args);
+ }
}
\ No newline at end of file
|
Update the helpers to include ddd
|
diff --git a/contrib/distributed_rails_event_store/dres_client/lib/dres_client/version.rb b/contrib/distributed_rails_event_store/dres_client/lib/dres_client/version.rb
index <HASH>..<HASH> 100644
--- a/contrib/distributed_rails_event_store/dres_client/lib/dres_client/version.rb
+++ b/contrib/distributed_rails_event_store/dres_client/lib/dres_client/version.rb
@@ -1,3 +1,3 @@
module DresClient
- VERSION = "0.5.0"
+ VERSION = "0.6.0"
end
diff --git a/contrib/distributed_rails_event_store/dres_rails/lib/dres_rails/identity.rb b/contrib/distributed_rails_event_store/dres_rails/lib/dres_rails/identity.rb
index <HASH>..<HASH> 100644
--- a/contrib/distributed_rails_event_store/dres_rails/lib/dres_rails/identity.rb
+++ b/contrib/distributed_rails_event_store/dres_rails/lib/dres_rails/identity.rb
@@ -12,7 +12,7 @@ module DresRails
end
def self.version
- "0.5.0"
+ "0.6.0"
end
def self.version_label
|
Increase VERSION to <I>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100755
--- a/index.js
+++ b/index.js
@@ -12,5 +12,6 @@ module.exports = {
'major_lake_changed': require('./comparators/major-lake-modified'),
'pokemon_footway': require('./comparators/pokemon-footway'),
'place_edited': require('./comparators/place-edited'),
- 'major_name_modification': require('./comparators/major_name_modification')
+ 'major_name_modification': require('./comparators/major_name_modification'),
+ 'wikidata': require('./comparators/wikidata')
};
|
Export comparator from index.js
|
diff --git a/lib/cinch/user.rb b/lib/cinch/user.rb
index <HASH>..<HASH> 100644
--- a/lib/cinch/user.rb
+++ b/lib/cinch/user.rb
@@ -365,6 +365,10 @@ module Cinch
# @return [void]
def update_nick(new_nick)
@last_nick, @name = @name, new_nick
+ # Unsync authname because some networks tie authentication to
+ # the nick, so the user might not be authenticated anymore after
+ # changing his nick
+ unsync(:authname)
@bot.user_list.update_nick(self)
end
|
unsync authname on nick change
Some networks tie authentication to the nick, so the user might not be
authenticated anymore after changing his nick
|
diff --git a/components/twofactor.js b/components/twofactor.js
index <HASH>..<HASH> 100644
--- a/components/twofactor.js
+++ b/components/twofactor.js
@@ -1,7 +1,6 @@
const StdLib = require('@doctormckay/stdlib');
const SteamTotp = require('steam-totp');
-const Helpers = require('./helpers.js');
const SteamUser = require('../index.js');
/**
|
Remove don't use require
In this file don't use Helpers
|
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -41,7 +41,9 @@ module ActionController #:nodoc:
else
pos = buffer.length
block.call
- write_fragment(name, buffer[pos..-1], options)
+ content = buffer[pos..-1]
+ content = content.as_str if content.respond_to?(:as_str)
+ write_fragment(name, content, options)
end
else
block.call
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index <HASH>..<HASH> 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -89,8 +89,12 @@ module ActiveSupport #:nodoc:
self
end
+ def as_str
+ ''.replace(self)
+ end
+
def to_yaml
- "".replace(self).to_yaml
+ as_str.to_yaml
end
end
end
|
Write strings to fragment cache, not outputbuffers
|
diff --git a/multiqc/modules/fastq_screen/fastq_screen.py b/multiqc/modules/fastq_screen/fastq_screen.py
index <HASH>..<HASH> 100755
--- a/multiqc/modules/fastq_screen/fastq_screen.py
+++ b/multiqc/modules/fastq_screen/fastq_screen.py
@@ -139,7 +139,7 @@ class MultiqcModule(BaseMultiqcModule):
thisdata = list()
if len(categories) > 0:
getCats = False
- for org in self.fq_screen_data[s]:
+ for org in sorted(self.fq_screen_data[s]):
if org == 'total_reads':
continue
try:
|
sort organisms in fastq_screen plot
|
diff --git a/src/EasyDB.php b/src/EasyDB.php
index <HASH>..<HASH> 100644
--- a/src/EasyDB.php
+++ b/src/EasyDB.php
@@ -34,7 +34,7 @@ class EasyDB
*/
public function __construct(\PDO $pdo, string $dbEngine = '')
{
- $this->pdo = clone $pdo;
+ $this->pdo = $pdo;
$this->pdo->setAttribute(
\PDO::ATTR_EMULATE_PREPARES,
false
@@ -369,7 +369,7 @@ class EasyDB
*/
public function getPdo(): \PDO
{
- return (clone $this->pdo);
+ return $this->pdo;
}
/**
|
Attempting to clone $this->pdo caused a segfault.
|
diff --git a/mod/quiz/index.php b/mod/quiz/index.php
index <HASH>..<HASH> 100644
--- a/mod/quiz/index.php
+++ b/mod/quiz/index.php
@@ -120,6 +120,8 @@
$a->studentstring = $course->students;
$data[] = "<a href=\"report.php?mode=overview&q=$quiz->id\">" .
get_string('numattempts', 'quiz', $a) . '</a>';
+ } else {
+ $data[] = '';
}
} else if ($showing = 'scores') {
|
MDL-<I> - Problem with the tables on the quiz index page. Merged from MOODLE_<I>_STABLE.
|
diff --git a/src/org/jgroups/protocols/pbcast/FLUSH.java b/src/org/jgroups/protocols/pbcast/FLUSH.java
index <HASH>..<HASH> 100644
--- a/src/org/jgroups/protocols/pbcast/FLUSH.java
+++ b/src/org/jgroups/protocols/pbcast/FLUSH.java
@@ -355,6 +355,11 @@ public class FLUSH extends Protocol {
// for processing of application messages after we join,
// lets wait for STOP_FLUSH to complete
// before we start allowing message up.
+ Address dest=msg.getDest();
+ if(dest != null && !dest.isMulticastAddress()) {
+ return up_prot.up(evt); // allow unicasts to pass, virtual synchrony olny applies to multicasts
+ }
+
if(!allowMessagesToPassUp)
return null;
}
|
allow unicast messages to pass even when blocked
|
diff --git a/src/main/org/codehaus/groovy/ant/VerifyClass.java b/src/main/org/codehaus/groovy/ant/VerifyClass.java
index <HASH>..<HASH> 100644
--- a/src/main/org/codehaus/groovy/ant/VerifyClass.java
+++ b/src/main/org/codehaus/groovy/ant/VerifyClass.java
@@ -119,7 +119,9 @@ public class VerifyClass extends MatchingTask {
log("verifying of class " + clazz + " failed");
}
if (verbose) log(method.name + method.desc);
- TraceMethodVisitor mv = new TraceMethodVisitor(null) {
+
+ TraceMethodVisitor mv = new TraceMethodVisitor(null);
+ /*= new TraceMethodVisitor(null) {
public void visitMaxs(int maxStack, int maxLocals) {
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < text.size(); ++i) {
@@ -135,7 +137,7 @@ public class VerifyClass extends MatchingTask {
}
if (verbose) log(buffer.toString());
}
- };
+ };*/
for (int j = 0; j < method.instructions.size(); ++j) {
Object insn = method.instructions.get(j);
if (insn instanceof AbstractInsnNode) {
|
comment out some of the logging to ensure the build even compiles
|
diff --git a/globus_cli/commands/logout.py b/globus_cli/commands/logout.py
index <HASH>..<HASH> 100644
--- a/globus_cli/commands/logout.py
+++ b/globus_cli/commands/logout.py
@@ -54,7 +54,7 @@ def logout_command(yes):
click.get_current_context().exit(1)
# prompt
- _confirm("Are you sure you'd like to logout?")
+ _confirm("Are you sure you want to logout?")
# check for username -- if not set, probably not logged in
username = lookup_option(WHOAMI_USERNAME_OPTNAME)
|
Make logout language stylistically consistent
We don't got no contractions in this here formal english.
|
diff --git a/lib/sinatra/param.rb b/lib/sinatra/param.rb
index <HASH>..<HASH> 100644
--- a/lib/sinatra/param.rb
+++ b/lib/sinatra/param.rb
@@ -37,19 +37,13 @@ module Sinatra
end
def one_of(*names)
- count = 0
- names.each do |name|
- if params[name] and present?(params[name])
- count += 1
- next unless count > 1
-
- error = "Parameters #{names.join(', ')} are mutually exclusive"
- if content_type and content_type.match(mime_type(:json))
- error = {message: error}.to_json
- end
-
- halt 400, error
+ if names.count{|name| params[name] and present?(params[name])} > 1
+ error = "Parameters #{names.join(', ')} are mutually exclusive"
+ if content_type and content_type.match(mime_type(:json))
+ error = {message: error}.to_json
end
+
+ halt 400, error
end
end
|
Refactoring implementation of one_of
|
diff --git a/tensorflow_datasets/text/multi_nli.py b/tensorflow_datasets/text/multi_nli.py
index <HASH>..<HASH> 100644
--- a/tensorflow_datasets/text/multi_nli.py
+++ b/tensorflow_datasets/text/multi_nli.py
@@ -63,8 +63,9 @@ class MultiNLIConfig(tfds.core.BuilderConfig):
**kwargs: keyword arguments forwarded to super.
"""
super(MultiNLIConfig, self).__init__(
- version=tfds.core.Version(
- "1.0.0", "New split API (https://tensorflow.org/datasets/splits)"),
+ version=tfds.core.Version("1.0.0"),
+ release_notes=
+ "New split API (https://tensorflow.org/datasets/splits)",
**kwargs)
self.text_encoder_config = (
text_encoder_config or tfds.deprecated.text.TextEncoderConfig())
|
Add release notes for multi_nli
|
diff --git a/pyforms/gui/Controls/ControlDockWidget.py b/pyforms/gui/Controls/ControlDockWidget.py
index <HASH>..<HASH> 100644
--- a/pyforms/gui/Controls/ControlDockWidget.py
+++ b/pyforms/gui/Controls/ControlDockWidget.py
@@ -36,10 +36,10 @@ class ControlDockWidget(ControlEmptyWidget):
"""
Show the control
"""
- self.show()
+ super(ControlDockWidget, self).show()
def hide(self):
"""
Hide the control
"""
- self.hide()
\ No newline at end of file
+ super(ControlDockWidget, self).hide()
\ No newline at end of file
|
fixed bug when calling methods hide or show in the ControlDockWidget
|
diff --git a/tests/Guzzle/Tests/Service/Command/LocationVisitor/Request/XmlVisitorTest.php b/tests/Guzzle/Tests/Service/Command/LocationVisitor/Request/XmlVisitorTest.php
index <HASH>..<HASH> 100644
--- a/tests/Guzzle/Tests/Service/Command/LocationVisitor/Request/XmlVisitorTest.php
+++ b/tests/Guzzle/Tests/Service/Command/LocationVisitor/Request/XmlVisitorTest.php
@@ -305,7 +305,7 @@ class XmlVisitorTest extends AbstractVisitorTestCase
$command = $this->getMockBuilder('Guzzle\Service\Command\OperationCommand')
->setConstructorArgs(array($input, $operation))
->getMockForAbstractClass();
- $command->setClient(new Client());
+ $command->setClient(new Client('http://www.test.com/some/path.php'));
$request = $command->prepare();
if (!empty($input)) {
$this->assertEquals('application/xml', (string) $request->getHeader('Content-Type'));
|
Changed test to show XMLVisitorTest::testSerializesXml fail
|
diff --git a/lib/chef/resource/windows_pagefile.rb b/lib/chef/resource/windows_pagefile.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/resource/windows_pagefile.rb
+++ b/lib/chef/resource/windows_pagefile.rb
@@ -120,7 +120,10 @@ class Chef
# raise an exception if the target drive location is invalid
def pagefile_drive_exist?(pagefile)
- ::Dir.exist?(pagefile[0] + ":\\") ? nil : (raise "You are trying to create a pagefile on a drive that does not exist!")
+ if (::Dir.exist?(pagefile[0] + ":\\") == false)
+ raise "You are trying to create a pagefile on a drive that does not exist!"
+ end
+ # ::Dir.exist?(pagefile[0] + ":\\") ? nil : (raise "You are trying to create a pagefile on a drive that does not exist!")
end
# See if the pagefile exists
|
Updated the Windows Pagefile resource to use PowerShell over WMI, added a corresponding test file
|
diff --git a/tilequeue/wof.py b/tilequeue/wof.py
index <HASH>..<HASH> 100644
--- a/tilequeue/wof.py
+++ b/tilequeue/wof.py
@@ -868,7 +868,6 @@ class WofProcessor(object):
# this means that we had a value for superseded_by in
# the raw json, but not in the meta file
# this should get treated as a removal
- ids_to_remove.add(failure_wof_id)
superseded_by_wof_ids.add(failure_wof_id)
failed_wof_ids.add(failure_wof_id)
@@ -896,6 +895,7 @@ class WofProcessor(object):
if superseded_by_wof_ids:
for n in prev_neighbourhoods:
if n.wof_id in superseded_by_wof_ids:
+ ids_to_remove.add(n.wof_id)
diffs.append((n, None))
# if the neighbourhood became funky and we had it in our
|
Move superseded removal for clarity
|
diff --git a/java/org.cohorte.herald.http/src/main/java/org/cohorte/herald/http/impl/HttpDirectory.java b/java/org.cohorte.herald.http/src/main/java/org/cohorte/herald/http/impl/HttpDirectory.java
index <HASH>..<HASH> 100644
--- a/java/org.cohorte.herald.http/src/main/java/org/cohorte/herald/http/impl/HttpDirectory.java
+++ b/java/org.cohorte.herald.http/src/main/java/org/cohorte/herald/http/impl/HttpDirectory.java
@@ -41,7 +41,7 @@ import org.cohorte.herald.http.IHttpConstants;
* @author Thomas Calmant
*/
@Component
-@Provides(specifications = IHttpDirectory.class)
+@Provides(specifications = { ITransportDirectory.class, IHttpDirectory.class })
@Instantiate(name = "herald-http-directory")
public class HttpDirectory implements ITransportDirectory, IHttpDirectory {
|
Added ITransportDirectory to the service provided by HttpDirectory
The HTTP Directory was never called by Herald Directory :/
|
diff --git a/core/router/downlink.go b/core/router/downlink.go
index <HASH>..<HASH> 100644
--- a/core/router/downlink.go
+++ b/core/router/downlink.go
@@ -31,7 +31,9 @@ func (r *router) SubscribeDownlink(gatewayID string, subscriptionID string) (<-c
gateway := r.getGateway(gatewayID)
if fromSchedule := gateway.Schedule.Subscribe(subscriptionID); fromSchedule != nil {
- r.Discovery.AddGatewayID(gatewayID, gateway.Token())
+ if token := gateway.Token(); gatewayID != "" && token != "" {
+ r.Discovery.AddGatewayID(gatewayID, token)
+ }
toGateway := make(chan *pb.DownlinkMessage)
go func() {
ctx.Debug("Activate downlink")
@@ -54,7 +56,9 @@ func (r *router) SubscribeDownlink(gatewayID string, subscriptionID string) (<-c
func (r *router) UnsubscribeDownlink(gatewayID string, subscriptionID string) error {
gateway := r.getGateway(gatewayID)
- r.Discovery.RemoveGatewayID(gatewayID, gateway.Token())
+ if token := gateway.Token(); gatewayID != "" && token != "" {
+ r.Discovery.RemoveGatewayID(gatewayID, token)
+ }
gateway.Schedule.Stop(subscriptionID)
return nil
}
|
Only announce downlink gateway if it has a token
|
diff --git a/lib/Doctrine/MongoDB/Query/Query.php b/lib/Doctrine/MongoDB/Query/Query.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/MongoDB/Query/Query.php
+++ b/lib/Doctrine/MongoDB/Query/Query.php
@@ -144,9 +144,6 @@ class Query implements IteratorAggregate
{
switch ($this->query['type']) {
case self::TYPE_FIND:
- if (isset($this->query['mapReduce']['reduce'])) {
- $this->query['query'][$this->cmd . 'where'] = $this->query['mapReduce']['reduce'];
- }
$cursor = $this->collection->find($this->query['query'], $this->query['select']);
return $this->prepareCursor($cursor);
|
[Query] Do not populate $where criteria with reduce JavaScript
|
diff --git a/lib/command/init.js b/lib/command/init.js
index <HASH>..<HASH> 100644
--- a/lib/command/init.js
+++ b/lib/command/init.js
@@ -90,16 +90,10 @@ module.exports = function (initPath) {
{
name: 'steps',
type: 'confirm',
- message: 'Would you like to extend I object with custom steps?',
+ message: 'Would you like to extend the "I" object with custom steps?',
default: true,
},
{
- name: 'translation',
- type: 'list',
- message: 'Do you want to choose localization for tests?',
- choices: translations,
- },
- {
name: 'steps_file',
type: 'input',
message: 'Where would you like to place custom steps?',
@@ -108,6 +102,12 @@ module.exports = function (initPath) {
return answers.steps;
},
},
+ {
+ name: 'translation',
+ type: 'list',
+ message: 'Do you want to choose localization for tests?',
+ choices: translations,
+ },
]).then((result) => {
const config = defaultConfig;
config.name = testsPath.split(path.sep).pop();
|
Fix typo. Improve order of prompts. (#<I>)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.