diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
index <HASH>..<HASH> 100644
--- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js
+++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
@@ -781,7 +781,7 @@ Guacamole.Keyboard = function(element) {
keysym = keysym_from_charcode(next.charCode);
if (keysym) {
recentKeysym[first.keyCode] = keysym;
- first.defaultPrevented = !press_key(keysym);
+ first.defaultPrevented = next.defaultPrevented = !press_key(keysym);
return eventLog.shift();
}
|
GUAC-<I>: Set defaultPrevented of keypress, not just keydown.
|
diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php
index <HASH>..<HASH> 100644
--- a/message/output/email/message_output_email.php
+++ b/message/output/email/message_output_email.php
@@ -56,8 +56,7 @@ class message_output_email extends message_output {
$result = email_to_user($eventdata->userto, $eventdata->userfrom,
$eventdata->subject, $eventdata->fullmessage, $eventdata->fullmessagehtml);
- return $result===true; //email_to_user() can return true, false or "emailstop"
- //return true;//do we want to report an error if email sending fails?
+ return ($result===true || $result=='emailstop'); //email_to_user() can return true, false or "emailstop"
}
/**
|
message MDL-<I> made the email message processor report success if the recipient has said they don't want to receive emails so that code sending messages isnt bothered by what looks like a failure.
|
diff --git a/gns3server/compute/base_node.py b/gns3server/compute/base_node.py
index <HASH>..<HASH> 100644
--- a/gns3server/compute/base_node.py
+++ b/gns3server/compute/base_node.py
@@ -524,10 +524,10 @@ class BaseNode:
"""
if self.ubridge_path is None:
- raise NodeError("uBridge is not available or path doesn't exist. Or you just install GNS3 and need to restart your user session to refresh user permissions.")
+ raise NodeError("uBridge is not available, path doesn't exist, or you just installed GNS3 and need to restart your user session to refresh user permissions.")
if not self._manager.has_privileged_access(self.ubridge_path):
- raise NodeError("uBridge requires root access or capability to interact with network adapters")
+ raise NodeError("uBridge requires root access or the capability to interact with network adapters")
server_config = self._manager.config.get_section_config("Server")
server_host = server_config.get("host")
|
Fix grammar (#<I>)
* Fixed small grammatical error
* Fixed small grammatical error
|
diff --git a/src/scs_core/aws/manager/configuration_check_requester.py b/src/scs_core/aws/manager/configuration_check_requester.py
index <HASH>..<HASH> 100644
--- a/src/scs_core/aws/manager/configuration_check_requester.py
+++ b/src/scs_core/aws/manager/configuration_check_requester.py
@@ -32,15 +32,15 @@ class ConfigurationCheckRequester(object):
# ----------------------------------------------------------------------------------------------------------------
def request(self, tag):
- params = {'ta': tag}
+ params = {'tag': tag}
headers = {'Authorization': self.__auth.email_address}
response = self.__http_client.get(self.__URL, headers=headers, params=params)
- print("response: %s" % response.text)
+ print("response: %s" % response)
response.raise_for_status()
- return ConfigurationCheckRequesterResponse.construct_from_jdict(response.text)
+ return ConfigurationCheckRequesterResponse.construct_from_jdict(response.json())
# ----------------------------------------------------------------------------------------------------------------
|
Added ConfigurationCheckRequesterResponse
|
diff --git a/core/src/test/java/org/infinispan/manager/CacheManagerTest.java b/core/src/test/java/org/infinispan/manager/CacheManagerTest.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/org/infinispan/manager/CacheManagerTest.java
+++ b/core/src/test/java/org/infinispan/manager/CacheManagerTest.java
@@ -152,7 +152,6 @@ public class CacheManagerTest extends AbstractInfinispanTest {
org.infinispan.config.Configuration c = new org.infinispan.config.Configuration();
c.setL1CacheEnabled(false);
c.setL1OnRehash(false);
- c.fluent().hash().numVirtualNodes(48);
c.setTransactionManagerLookup(new GenericTransactionManagerLookup());
c.setIsolationLevel(IsolationLevel.NONE);
org.infinispan.config.Configuration oneCacheConfiguration = cm.defineConfiguration("oneCache", c);
|
ISPN-<I> Fix CacheManagerTest failure related to numVirtualNodes.
|
diff --git a/devices/paulmann.js b/devices/paulmann.js
index <HASH>..<HASH> 100644
--- a/devices/paulmann.js
+++ b/devices/paulmann.js
@@ -71,6 +71,7 @@ module.exports = [
extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
},
{
+ fingerprint: [{modelID: 'CCT Light', manufacturerName: 'Paulmann lamp'}],
zigbeeModel: ['CCT light', 'CCT_light', 'CCT light '],
model: '50064',
vendor: 'Paulmann',
|
Add CCT Light/Paulmann lamp fingerprint to <I> (#<I>)
* Add "CCT Light" model to paulmann devices
* Update paulmann.js
|
diff --git a/core/frontend/services/theme-engine/middleware.js b/core/frontend/services/theme-engine/middleware.js
index <HASH>..<HASH> 100644
--- a/core/frontend/services/theme-engine/middleware.js
+++ b/core/frontend/services/theme-engine/middleware.js
@@ -76,7 +76,11 @@ async function haxGetMembersPriceData() {
const defaultProduct = products[0];
- const nonZeroPrices = defaultProduct.stripe_prices.filter((price) => {
+ const activePrices = defaultProduct.stripe_prices.filter((price) => {
+ return price.active;
+ });
+
+ const nonZeroPrices = activePrices.filter((price) => {
return price.amount !== 0;
});
|
Updated `@price` data to not use archived prices
no-issue
Since we now allow archiving prices, we should filter them out from
being considered the monthly or yearly plan, as they are unable to be
subscribed to.
|
diff --git a/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb b/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
index <HASH>..<HASH> 100644
--- a/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
+++ b/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
@@ -21,7 +21,7 @@ module RailsEventStoreActiveRecord
hashes << import_hash(record, record.serialize(serializer))
event_ids << record.event_id
end
- add_to_stream(event_ids, stream, expected_version) { @event_klass.insert_all(hashes) }
+ add_to_stream(event_ids, stream, expected_version) { @event_klass.insert_all!(hashes) }
end
def link_to_stream(event_ids, stream, expected_version)
@@ -94,7 +94,7 @@ module RailsEventStoreActiveRecord
event_ids.map.with_index do |event_id, index|
{ stream: stream.name, position: compute_position(resolved_version, index), event_id: event_id }
end
- @stream_klass.insert_all(in_stream) unless stream.global?
+ @stream_klass.insert_all!(in_stream) unless stream.global?
end
self
rescue ActiveRecord::RecordNotUnique => e
|
When replacing activerecord-import, don't change behaviour
<URL>
|
diff --git a/visidata/loaders/postgres.py b/visidata/loaders/postgres.py
index <HASH>..<HASH> 100644
--- a/visidata/loaders/postgres.py
+++ b/visidata/loaders/postgres.py
@@ -52,8 +52,7 @@ def openurl_postgres(url, filetype=None):
return PgTablesSheet(dbname+"_tables", sql=SQL(conn))
-def openurl_postgresql(url, filetype):
- return openurl_postgres(url, filetype)
+openurl_postgresql=openurl_postgres
class SQL:
|
simplify aliasing openurl_postgres
|
diff --git a/src/commands/view/ComponentDrag.js b/src/commands/view/ComponentDrag.js
index <HASH>..<HASH> 100644
--- a/src/commands/view/ComponentDrag.js
+++ b/src/commands/view/ComponentDrag.js
@@ -308,7 +308,7 @@ export default {
};
},
- onStart() {
+ onStart(event) {
const { target, editor, isTran, opts } = this;
const { center, onStart } = opts;
const { Canvas } = editor;
|
Use the right event in drag component command
|
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index <HASH>..<HASH> 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -997,19 +997,6 @@ class RouteSetTest < ActiveSupport::TestCase
end
end
- def test_non_path_route_requirements_match_all
- set.draw do |map|
- map.connect 'page/37s', :controller => 'pages', :action => 'show', :name => /(jamis|david)/
- end
- assert_equal '/page/37s', set.generate(:controller => 'pages', :action => 'show', :name => 'jamis')
- assert_raise ActionController::RoutingError do
- set.generate(:controller => 'pages', :action => 'show', :name => 'not_jamis')
- end
- assert_raise ActionController::RoutingError do
- set.generate(:controller => 'pages', :action => 'show', :name => 'nor_jamis_and_david')
- end
- end
-
def test_recognize_with_encoded_id_and_regex
set.draw do |map|
map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /[a-zA-Z0-9\+]+/
|
Relax generation requirements and only enforce the requirements used in the path segment
|
diff --git a/kafka/config.go b/kafka/config.go
index <HASH>..<HASH> 100644
--- a/kafka/config.go
+++ b/kafka/config.go
@@ -187,6 +187,11 @@ func configConvertAnyconf(m ConfigMap, anyconf rdkAnyconf) (err error) {
func (m ConfigMap) convert() (cConf *C.rd_kafka_conf_t, err error) {
cConf = C.rd_kafka_conf_new()
+ // Set the client.software.name and .version (use librdkafka version).
+ _, librdkafkaVersion := LibraryVersion()
+ anyconfSet((*rdkConf)(cConf), "client.software.name", "confluent-kafka-go")
+ anyconfSet((*rdkConf)(cConf), "client.software.version", librdkafkaVersion)
+
err = configConvertAnyconf(m, (*rdkConf)(cConf))
if err != nil {
C.rd_kafka_conf_destroy(cConf)
|
KIP-<I>: Set client software name and version
|
diff --git a/internal/services/machinelearning/machine_learning_compute_instance_resource.go b/internal/services/machinelearning/machine_learning_compute_instance_resource.go
index <HASH>..<HASH> 100644
--- a/internal/services/machinelearning/machine_learning_compute_instance_resource.go
+++ b/internal/services/machinelearning/machine_learning_compute_instance_resource.go
@@ -49,8 +49,8 @@ func resourceComputeInstance() *pluginsdk.Resource {
Required: true,
ForceNew: true,
ValidateFunc: validation.StringMatch(
- regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9-]{2,16}$`),
- "It can include letters, digits and dashes. It must start with a letter, end with a letter or digit, and be between 2 and 16 characters in length."),
+ regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9-]{2,23}$`),
+ "It can include letters, digits and dashes. It must start with a letter, end with a letter or digit, and be between 3 and 24 characters in length."),
},
"machine_learning_workspace_id": {
|
updated character length (#<I>)
|
diff --git a/lib/Manager/Manager.php b/lib/Manager/Manager.php
index <HASH>..<HASH> 100644
--- a/lib/Manager/Manager.php
+++ b/lib/Manager/Manager.php
@@ -106,13 +106,13 @@ class Manager implements ManagerInterface
}
// Either way, if the config is null we check the global cache
- if ($config === null) {
+ if ($config === null && $currentConfigItem !== null) {
$config = $this->cache->getItem($currentConfigItem);
if ($config !== null) {
if ($this->localCache instanceof StorageInterface) {
$this->localCache->setItem($currentConfigItem, $config);
}
- }
+ }
}
if ($config) {
|
Fixed an issue that may occur in an empty cache
|
diff --git a/tpot/base.py b/tpot/base.py
index <HASH>..<HASH> 100644
--- a/tpot/base.py
+++ b/tpot/base.py
@@ -608,9 +608,9 @@ class TPOTBase(BaseEstimator):
if not self.warm_start or not self._pareto_front:
self._pareto_front = tools.ParetoFront(similar=pareto_eq)
- # Set offspring_size equal to population_size by default
+ # Set lambda_ (offspring size in GP) equal to population_size by default
if not self.offspring_size:
- self.lambda_ = population_size
+ self.lambda_ = self.population_size
else:
self.lambda_ = self.offspring_size
|
update comments for lambda_ of init ref #<I>
|
diff --git a/test/espower_option_test.js b/test/espower_option_test.js
index <HASH>..<HASH> 100644
--- a/test/espower_option_test.js
+++ b/test/espower_option_test.js
@@ -430,7 +430,7 @@ describe('sourceRoot option', function () {
function sourceRootTest (testName, config) {
it(testName, function () {
var jsCode = 'assert(falsyStr);';
- var jsAST = acorn.parse(jsCode, {ecmaVersion: 6, locations: true, sourceFile: config.path});
+ var jsAST = acorn.parse(jsCode, {ecmaVersion: 6, locations: true, sourceFile: config.incomingFilepath});
var espoweredAST = espower(jsAST, {
path: config.incomingFilepath,
sourceRoot: config.espowerSourceRoot
|
chore(espower): fix paths test that does not use `incomingFilepath`
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,6 @@ setup(
],
'dev': [
'coverage>=4.5.1',
- 'factory_boy>=2.11.1',
'IPython>=7.1.1',
'mock>=2.0.0',
'pytest>=4.6.5',
@@ -92,6 +91,7 @@ setup(
'flask-session>=0.3.1',
],
'sqlalchemy': [
+ 'factory_boy>=2.11.1',
'flask-migrate>=2.5.3',
'flask-sqlalchemy-unchained>=0.7.3',
'sqlalchemy-unchained>=0.11.0',
|
move factory_boy to be an extras require of sqlalchemy instead of dev
|
diff --git a/js/bleutrade.js b/js/bleutrade.js
index <HASH>..<HASH> 100644
--- a/js/bleutrade.js
+++ b/js/bleutrade.js
@@ -123,7 +123,6 @@ module.exports = class bleutrade extends bittrex {
},
'options': {
'parseOrderStatus': true,
- 'disableNonce': false,
'symbolSeparator': '_',
},
});
|
[bleutrade] removed disableNonce flag as its not supported by the exchange anymore (now that you can generate multiples api keys)
|
diff --git a/src/dawguk/GarminConnect/Connector.php b/src/dawguk/GarminConnect/Connector.php
index <HASH>..<HASH> 100755
--- a/src/dawguk/GarminConnect/Connector.php
+++ b/src/dawguk/GarminConnect/Connector.php
@@ -88,6 +88,9 @@ class Connector
$strUrl .= '?' . http_build_query($arrParams);
}
+ curl_setopt($this->objCurl, CURLOPT_HTTPHEADER, array(
+ 'NK: NT'
+ ));
curl_setopt($this->objCurl, CURLOPT_URL, $strUrl);
curl_setopt($this->objCurl, CURLOPT_FOLLOWLOCATION, (bool)$bolAllowRedirects);
curl_setopt($this->objCurl, CURLOPT_CUSTOMREQUEST, 'GET');
@@ -130,7 +133,6 @@ class Connector
if (! empty($arrParams)) {
$strUrl .= '?' . http_build_query($arrParams);
}
-
curl_setopt($this->objCurl, CURLOPT_HTTPHEADER, $headers);
curl_setopt($this->objCurl, CURLOPT_HEADER, false);
curl_setopt($this->objCurl, CURLOPT_FRESH_CONNECT, true);
|
fix: <I> response code on get calls
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ setup(
'flask-components >= 0.1',
'sqlalchemy >= 0.8',
'sqlalchemy-utils >= 0.16',
+ 'alembic >= 0.6, < 0.7',
'pytest >= 2.4',
'pytest-pep8 >= 1.0',
'pytest-cov >= 1.6',
|
Add alembic as a requirement.
|
diff --git a/lib/filelib.php b/lib/filelib.php
index <HASH>..<HASH> 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -342,7 +342,9 @@ function download_file_content($url, $headers=null, $postdata=null, $fullrespons
}
// check if proxy (if used) should be bypassed for this url
- $proxybypass = is_proxybypass( $url );
+ $proxybypass = is_proxybypass($url);
+
+ $ch = curl_init($url);
// set extra headers
if (is_array($headers) ) {
|
MDL-<I> - fixed regressions - missing $ch
|
diff --git a/lib/node_modules/@stdlib/repl/lib/namespace/b.js b/lib/node_modules/@stdlib/repl/lib/namespace/b.js
index <HASH>..<HASH> 100644
--- a/lib/node_modules/@stdlib/repl/lib/namespace/b.js
+++ b/lib/node_modules/@stdlib/repl/lib/namespace/b.js
@@ -683,6 +683,14 @@ ns.push({
});
ns.push({
+ 'alias': 'base.dist.betaprime.BetaPrime',
+ 'path': '@stdlib/math/base/dist/betaprime/ctor',
+ 'value': require( '@stdlib/math/base/dist/betaprime/ctor' ),
+ 'type': 'Function',
+ 'related': []
+});
+
+ns.push({
'alias': 'base.dist.betaprime.cdf',
'path': '@stdlib/math/base/dist/betaprime/cdf',
'value': require( '@stdlib/math/base/dist/betaprime/cdf' ),
|
Add beta prime constructor to REPL
|
diff --git a/main.go b/main.go
index <HASH>..<HASH> 100644
--- a/main.go
+++ b/main.go
@@ -208,7 +208,7 @@ func main() {
return
}
- if len(args) < 1 {
+ if len(args) != 1 {
usage()
os.Exit(2)
}
|
fail on too many arguments; only the first one is used
|
diff --git a/GVRf/Framework/src/org/gearvrf/utility/FileNameUtils.java b/GVRf/Framework/src/org/gearvrf/utility/FileNameUtils.java
index <HASH>..<HASH> 100644
--- a/GVRf/Framework/src/org/gearvrf/utility/FileNameUtils.java
+++ b/GVRf/Framework/src/org/gearvrf/utility/FileNameUtils.java
@@ -114,7 +114,7 @@ public class FileNameUtils {
int lastSlashIndex = path.lastIndexOf("/");
String directory = lastSlashIndex == -1 ? "" : path.substring(0, lastSlashIndex);
return String.format("%s://%s%s%s%s", url.getProtocol(),
- url.getUserInfo() == null ? "" : url.getUserInfo(),
+ url.getUserInfo() == null ? "" : url.getUserInfo() + "@",
url.getHost(),
url.getPort() == -1 ? "" : Integer.toString(url.getPort()),
directory);
|
Adding missing '@' after userinfo in URL
|
diff --git a/lib/FeatureServices.js b/lib/FeatureServices.js
index <HASH>..<HASH> 100644
--- a/lib/FeatureServices.js
+++ b/lib/FeatureServices.js
@@ -39,7 +39,7 @@ module.exports = {
var self = this;
var fields = [];
Object.keys( props ).forEach(function( key ){
- var type = (( idField && key == idField ) ? 'esriFieldTypeOID' : self.fieldType( props[ key ] ));
+ var type = (( idField && key == idField ) ? 'esriFieldTypeOID' : (self.fieldType( props[ key ])||'esriFieldTypeString') );
if (type){
var fld = {
name: key,
@@ -75,6 +75,7 @@ module.exports = {
} else {
template.fields = [];
}
+ console.log(template.fields)
return template;
},
|
null values cast as strings in featureservice fields
|
diff --git a/resources/views/menu/group.blade.php b/resources/views/menu/group.blade.php
index <HASH>..<HASH> 100644
--- a/resources/views/menu/group.blade.php
+++ b/resources/views/menu/group.blade.php
@@ -1,5 +1,5 @@
-@if (isset($group['children']) && count($group['children']))
+@if (count($group->children()))
<?php
$levelClass = '';
|
Small cleanup of children menu node reference
|
diff --git a/fabfile.py b/fabfile.py
index <HASH>..<HASH> 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -678,6 +678,10 @@ def docker(subtask='info'):
docker_configuration = all_docker_hosts[config_name]
+ if 'inheritsFrom' in docker_configuration and docker_configuration['inheritsFrom'] in all_docker_hosts:
+ base_configuration = all_docker_hosts[docker_configuration['inheritsFrom']]
+ docker_configuration = data_merge(base_configuration, docker_configuration)
+
keys = ("host", "port", "user", "tasks", "rootFolder")
validate_dict(keys, docker_configuration, 'dockerHosts-Configuraton '+config_name+' has missing key')
|
implement inheritsFrom for dockerHosts
|
diff --git a/color.js b/color.js
index <HASH>..<HASH> 100644
--- a/color.js
+++ b/color.js
@@ -329,7 +329,7 @@ Color.prototype = {
Color.prototype.getValues = function(space) {
var vals = {};
for (var i = 0; i < space.length; i++) {
- vals[space[i]] = this.values[space][i];
+ vals[space.charAt(i)] = this.values[space][i];
}
if (this.values.alpha != 1) {
vals["a"] = this.values.alpha;
@@ -364,10 +364,10 @@ Color.prototype.setValues = function(space, vals) {
this.values[space] = vals.slice(0, space.length);
alpha = vals[space.length];
}
- else if (vals[space[0]] !== undefined) {
+ else if (vals[space.charAt(0)] !== undefined) {
// {r: 10, g: 10, b: 10}
for (var i = 0; i < space.length; i++) {
- this.values[space][i] = vals[space[i]];
+ this.values[space][i] = vals[space.charAt(i)];
}
alpha = vals.a;
}
|
access to string's char with '.charAt)()' method (makr ie8 compatible)
|
diff --git a/OrgLinkoScope.php b/OrgLinkoScope.php
index <HASH>..<HASH> 100755
--- a/OrgLinkoScope.php
+++ b/OrgLinkoScope.php
@@ -148,7 +148,7 @@ class OrgLinkoScope implements iLinkoScope
public function getComments($postId)
{
- $sort = ['orderby' => 'karma'];
+ $sort = ['orderby' => 'karma', 'type' => 'linkoscope_comment'];
$results = $this->api->listComments($postId, $sort);
return $this->apiToComments($results);
}
@@ -272,6 +272,7 @@ class OrgLinkoScope implements iLinkoScope
'status' => 'publish',
'karma' => $comment->score,
'linkoscope_likes' => implode(';', $comment->likeList ?: []),
+ 'type' => 'linkoscope_comment',
];
}
}
|
Use special comment type for linkoscope comments
This will allow us to seperate linkoscope specfic comments from regular comments
|
diff --git a/packages/ember-metal/lib/events.js b/packages/ember-metal/lib/events.js
index <HASH>..<HASH> 100644
--- a/packages/ember-metal/lib/events.js
+++ b/packages/ember-metal/lib/events.js
@@ -267,10 +267,6 @@ function suspendListeners(obj, eventNames, target, method, callback) {
}
}
-// TODO: This knowledge should really be a part of the
-// meta system.
-var SKIP_PROPERTIES = { __ember_source__: true };
-
/**
@private
@@ -285,9 +281,7 @@ function watchedEvents(obj) {
if (listeners) {
for(var eventName in listeners) {
- if (!SKIP_PROPERTIES[eventName] && listeners[eventName]) {
- ret.push(eventName);
- }
+ if (listeners[eventName]) { ret.push(eventName); }
}
}
return ret;
|
Remove SKIP_PROPERTIES, not necessary anymore since we're using hasOwnProperty
|
diff --git a/admin/controllers/accounts.php b/admin/controllers/accounts.php
index <HASH>..<HASH> 100644
--- a/admin/controllers/accounts.php
+++ b/admin/controllers/accounts.php
@@ -679,7 +679,8 @@ class NAILS_Accounts extends NAILS_Admin_Controller
$_data['last_name'] = $this->input->post( 'last_name' );
$_data['username'] = $this->input->post( 'username' );
$_data['gender'] = $this->input->post( 'gender' );
- $_data['dob'] = ! empty( $this->input->post( 'dob' ) ) ? $this->input->post( 'dob' ) : NULL;
+ $_data['dob'] = $this->input->post( 'dob' );
+ $_data['dob'] = ! empty( $_data['dob'] ) ? $_data['dob'] : NULL;
$_data['timezone'] = $this->input->post( 'timezone' );
$_data['datetime_format_date'] = $this->input->post( 'datetime_format_date' );
$_data['datetime_format_time'] = $this->input->post( 'datetime_format_time' );
|
changing logic, for backwards compatability
|
diff --git a/request.go b/request.go
index <HASH>..<HASH> 100644
--- a/request.go
+++ b/request.go
@@ -3,6 +3,7 @@ package kite
import (
"errors"
"fmt"
+ "runtime/debug"
"strings"
"github.com/dgrijalva/jwt-go"
@@ -38,6 +39,7 @@ func (c *Client) runMethod(method *Method, args *dnode.Partial) {
// functions like MustString(), MustSlice()... without the fear of panic.
defer func() {
if r := recover(); r != nil {
+ debug.PrintStack()
callFunc(nil, createError(r))
}
}()
|
kite/request: print debug stack if we have recovered from something
|
diff --git a/tasks/uncss-inline.js b/tasks/uncss-inline.js
index <HASH>..<HASH> 100644
--- a/tasks/uncss-inline.js
+++ b/tasks/uncss-inline.js
@@ -66,9 +66,8 @@ module.exports = function ( grunt ) {
throw error;
}
- // remove all `<style>` tags except the last one
- var styleTags = $('style');
- styleTags.slice(0, styleTags.length - 1).remove();
+ // remove all `<style>` tags except the first one
+ $('style').slice(1).remove();
$('style').text(output);
var html = $.html();
grunt.file.write( file.dest, html );
|
feat: preserve the first for final process
|
diff --git a/wallet/notifications.go b/wallet/notifications.go
index <HASH>..<HASH> 100644
--- a/wallet/notifications.go
+++ b/wallet/notifications.go
@@ -119,8 +119,8 @@ func makeTxSummary(w *Wallet, details *wtxmgr.TxDetails) TransactionSummary {
}
}
outputs := make([]TransactionSummaryOutput, 0, len(details.MsgTx.TxOut))
- var credIndex int
for i := range details.MsgTx.TxOut {
+ credIndex := len(outputs)
mine := len(details.Credits) > credIndex && details.Credits[credIndex].Index == uint32(i)
if !mine {
continue
|
Fix credit slice indexing for transaction notifications.
Previously, this would always check a transaction output index against
the 0th credit's index.
|
diff --git a/src/jquery.jcarousel.js b/src/jquery.jcarousel.js
index <HASH>..<HASH> 100644
--- a/src/jquery.jcarousel.js
+++ b/src/jquery.jcarousel.js
@@ -573,11 +573,16 @@
});
$.fn.jcarousel = function(o) {
- var args = Array.prototype.slice.call(arguments, 1);
- return this.each(function() {
+ var args = Array.prototype.slice.call(arguments, 1), returnResult = false, result;
+ this.each(function() {
var j = $(this).data('jcarousel');
if (typeof o === 'string') {
- j[o].apply(j, args);
+ var r = j[o].apply(j, args);
+ if (r !== j) {
+ returnResult = true;
+ result = r;
+ return false;
+ }
} else {
if (j) {
$.extend(j.options, o || {});
@@ -586,6 +591,8 @@
}
}
});
+
+ return returnResult ? result : this;
};
})(jQuery, window);
|
Return correct if a getter is called
|
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index <HASH>..<HASH> 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -176,6 +176,11 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
assert_file "bukkits.gemspec", /s.version = "0.0.1"/
end
+ def test_shebang
+ run_generator
+ assert_file "script/rails", /#!\/usr\/bin\/env ruby/
+ end
+
def test_passing_dummy_path_as_a_parameter
run_generator [destination_root, "--dummy_path", "spec/dummy"]
assert_file "spec/dummy"
|
Add test for shebang in engine's script/rails file
|
diff --git a/opal/browser/dom/element.rb b/opal/browser/dom/element.rb
index <HASH>..<HASH> 100644
--- a/opal/browser/dom/element.rb
+++ b/opal/browser/dom/element.rb
@@ -14,11 +14,12 @@ class Element < Node
def self.new(node)
if self == Element
- case `node.nodeName`.downcase
- when :input
- Input.new(node)
+ name = `node.nodeName`.capitalize
- else super
+ if Element.const_defined?(name)
+ Element.const_get(name).new(node)
+ else
+ super
end
else
super
diff --git a/opal/browser/dom/element/image.rb b/opal/browser/dom/element/image.rb
index <HASH>..<HASH> 100644
--- a/opal/browser/dom/element/image.rb
+++ b/opal/browser/dom/element/image.rb
@@ -18,4 +18,6 @@ class Image < Element
end
end
+Img = Image
+
end; end; end
|
dom/element: fix specialization creation
|
diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -308,7 +308,7 @@ module Vagrant
logger.debug("Querying installed WSL from Windows registry.")
- PowerShell.execute_cmd('(Get-ChildItem HKCU:\Software\Microsoft\Windows\CurrentVersion\Lxss | ForEach-Object {Get-ItemProperty $_.PSPath}).BasePath').split(" ").each do |path|
+ PowerShell.execute_cmd('(Get-ChildItem HKCU:\Software\Microsoft\Windows\CurrentVersion\Lxss | ForEach-Object {Get-ItemProperty $_.PSPath}).BasePath').split("\r\n").each do |path|
# Lowercase the drive letter, skip the next symbol (which is a
# colon from a Windows path) and convert path to UNIX style.
path = "/mnt/#{path[0, 1].downcase}#{path[2..-1].tr('\\', '/')}/rootfs"
|
#<I>: Respect usernames with spaces
|
diff --git a/containers/pax-exam-container-tomee/src/test/java/org/ops4j/pax/exam/tomee/TomEEDeploymentTest.java b/containers/pax-exam-container-tomee/src/test/java/org/ops4j/pax/exam/tomee/TomEEDeploymentTest.java
index <HASH>..<HASH> 100644
--- a/containers/pax-exam-container-tomee/src/test/java/org/ops4j/pax/exam/tomee/TomEEDeploymentTest.java
+++ b/containers/pax-exam-container-tomee/src/test/java/org/ops4j/pax/exam/tomee/TomEEDeploymentTest.java
@@ -32,7 +32,7 @@ public class TomEEDeploymentTest {
public void deployWebapp() throws IOException {
System.setProperty("java.protocol.handler.pkgs", "org.ops4j.pax.url");
ExamSystem system = DefaultExamSystem.create(options(war(
- "mvn:org.ops4j.pax.exam.samples/pax-exam-sample1-web/3.0.0-SNAPSHOT/war").name(
+ "mvn:org.ops4j.pax.exam.samples/pax-exam-sample1-web/3.0.0/war").name(
"sample1")));
TomEETestContainer container = new TomEETestContainer(system);
container.start();
|
do not use SNAPSHOT version in deployment test
|
diff --git a/src/apex/plugins/id/__init__.py b/src/apex/plugins/id/__init__.py
index <HASH>..<HASH> 100644
--- a/src/apex/plugins/id/__init__.py
+++ b/src/apex/plugins/id/__init__.py
@@ -53,7 +53,7 @@ class IdPlugin(object):
port = self.port_map[port_name]
id_frame = {'source': port['identifier'], 'destination': 'ID', 'path': port['id_path'].split(','),
- 'text': list(port['id_text'].encode('ascii'))}
+ 'text': port['id_text']}
frame_hash = apex.aprs.util.hash_frame(id_frame)
if frame_hash not in self.packet_cache.values():
self.packet_cache[str(frame_hash)] = frame_hash
|
Fixed a bug in the id plugin where the text field was int he wrong format.
|
diff --git a/tests/binary/PharTest.php b/tests/binary/PharTest.php
index <HASH>..<HASH> 100644
--- a/tests/binary/PharTest.php
+++ b/tests/binary/PharTest.php
@@ -7,8 +7,7 @@ namespace Test\Binary;
class PharTest extends \PHPUnit_Framework_TestCase
{
- //private $phar = __DIR__ . '/../binary/../../build/phpmetrics.phar';
- private $phar = __DIR__ . '/../../bin/phpmetrics';
+ private $phar = __DIR__ . '/../../build/phpmetrics.phar';
public function testICanRunPhar()
{
|
fixed error in test of phar
|
diff --git a/Rakefile b/Rakefile
index <HASH>..<HASH> 100755
--- a/Rakefile
+++ b/Rakefile
@@ -1,13 +1,14 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -KU
+
require 'pathname'
require 'rubygems'
require 'rake'
require 'rake/rdoctask'
-require 'lib/dm-core/version'
-
ROOT = Pathname(__FILE__).dirname.expand_path
+require ROOT + 'lib/dm-core/version'
+
AUTHOR = 'Dan Kubb'
EMAIL = 'dan.kubb@gmail.com'
GEM_NAME = 'dm-core'
diff --git a/script/performance.rb b/script/performance.rb
index <HASH>..<HASH> 100755
--- a/script/performance.rb
+++ b/script/performance.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -KU
require 'ftools'
require 'rubygems'
diff --git a/script/profile.rb b/script/profile.rb
index <HASH>..<HASH> 100755
--- a/script/profile.rb
+++ b/script/profile.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -KU
require 'ftools'
require 'rubygems'
|
Minor code update to Rakefile require and ruby command line in scripts
|
diff --git a/test/index_test.rb b/test/index_test.rb
index <HASH>..<HASH> 100644
--- a/test/index_test.rb
+++ b/test/index_test.rb
@@ -93,6 +93,7 @@ class IndexTest < Minitest::Test
assert_search "product", ["Product A"], {}, Region
assert_search "hello", ["Product A"], {fields: [:name, :text]}, Region
assert_search "hello", ["Product A"], {}, Region
+ assert_search "*", ["Product A"], {where: {text: large_value}}, Region
end
def test_very_large_value
@@ -102,6 +103,8 @@ class IndexTest < Minitest::Test
assert_search "product", ["Product A"], {}, Region
assert_search "hello", ["Product A"], {fields: [:name, :text]}, Region
assert_search "hello", ["Product A"], {}, Region
+ # keyword not indexed
+ assert_search "*", [], {where: {text: large_value}}, Region
end
def test_bulk_import_raises_error
|
Improved tests [skip ci]
|
diff --git a/scipy_data_fitting/fit.py b/scipy_data_fitting/fit.py
index <HASH>..<HASH> 100644
--- a/scipy_data_fitting/fit.py
+++ b/scipy_data_fitting/fit.py
@@ -263,7 +263,7 @@ class Fit:
from `scipy_data_fitting.Model.expressions`.
The expressions must not contain the symbols corresponding to
- `scipy_data_fitting.Fit.free_variables`, scipy_data_fitting.Fit.independent`,
+ `scipy_data_fitting.Fit.free_variables`, `scipy_data_fitting.Fit.independent`,
or `scipy_data_fitting.Fit.dependent`.
The other keys are the same as the optional ones explained
|
Missing a backtick in docstring.
|
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -987,7 +987,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
if (logger.isTraceEnabled())
logger.trace(ep + "local generation " + localGeneration + ", remote generation " + remoteGeneration);
- if (remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
+ if (localGeneration != 0 && remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
{
// assume some peer has corrupted memory and is broadcasting an unbelievable generation about another peer (or itself)
logger.warn("received an invalid gossip generation for peer {}; local generation = {}, received generation = {}", ep, localGeneration, remoteGeneration);
|
Don't do generation safety check when the local gen is zero
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-<I>
|
diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py
index <HASH>..<HASH> 100644
--- a/salt/client/ssh/__init__.py
+++ b/salt/client/ssh/__init__.py
@@ -1219,6 +1219,8 @@ def _convert_args(args):
for arg in args:
if isinstance(arg, dict):
for key in list(arg.keys()):
+ if key == '__kwarg__':
+ continue
converted.append('{0}={1}'.format(key, arg[key]))
else:
converted.append(arg)
|
Remove __kwarg__ from salt-ssh keyword args
Currently this keyword arg is actually being removed as a side effect
of salt.utils.args.parse_input. If that ever changed then this code
would break. Prevent that future breakage. (I considered removing that
side effect but wasn't sure what else it would break so I held off for
now)
|
diff --git a/src/main/java/org/jfrog/hudson/pipeline/types/Docker.java b/src/main/java/org/jfrog/hudson/pipeline/types/Docker.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jfrog/hudson/pipeline/types/Docker.java
+++ b/src/main/java/org/jfrog/hudson/pipeline/types/Docker.java
@@ -13,7 +13,7 @@ import java.util.Map;
* Created by romang on 7/28/16.
*/
public class Docker implements Serializable {
- private CpsScript script;
+ private transient CpsScript script;
private String username;
private String password;
private String credentialsId;
|
HAP-<I> - Serializable exception after upgrade when doing server.upload
|
diff --git a/mot/runtime_configuration.py b/mot/runtime_configuration.py
index <HASH>..<HASH> 100644
--- a/mot/runtime_configuration.py
+++ b/mot/runtime_configuration.py
@@ -1,6 +1,6 @@
from contextlib import contextmanager
from .cl_environments import CLEnvironmentFactory
-from .load_balance_strategies import EvenDistribution
+from .load_balance_strategies import PreferGPU
__author__ = 'Robbert Harms'
__date__ = "2015-07-22"
@@ -25,10 +25,11 @@ known from the context defaults can be obtained from this module.
ignore_kernel_warnings = True
runtime_config = {
- 'cl_environments': CLEnvironmentFactory.all_devices(cl_device_type='GPU'),
- 'load_balancer': EvenDistribution(),
+ 'cl_environments': CLEnvironmentFactory.all_devices(),
+ 'load_balancer': PreferGPU(),
}
+
@contextmanager
def runtime_config_context(cl_environments=None, load_balancer=None):
old_config = {k: v for k, v in runtime_config.items()}
|
Reverted the default runtime configuration settings to all devices with GPUPreferred load balancer.
|
diff --git a/proso/util.py b/proso/util.py
index <HASH>..<HASH> 100644
--- a/proso/util.py
+++ b/proso/util.py
@@ -6,11 +6,12 @@ _timers = {}
def timer(name):
- now = time.clock()
+ now = time.time()
+ diff = None
if name in _timers:
diff = now - _timers[name]
- return diff
_timers[name] = now
+ return diff
def instantiate(classname, *args, **kwargs):
|
update timer to be able to measure time more times
|
diff --git a/resources/lang/nl-NL/cachet.php b/resources/lang/nl-NL/cachet.php
index <HASH>..<HASH> 100644
--- a/resources/lang/nl-NL/cachet.php
+++ b/resources/lang/nl-NL/cachet.php
@@ -92,6 +92,7 @@ return [
'email' => [
'subscribe' => 'Abonneren op e-mail updates.',
'subscribed' => 'U bent geabonneerd op e-mail notificaties, controleer uw e-mail om uw abonnement te bevestigen.',
+ 'updated-subscribe' => 'You\'ve succesfully updated your subscriptions.',
'verified' => 'Uw e-mail abonnement is bevestigd. Bedankt!',
'manage' => 'Beheer je abonnement',
'unsubscribe' => 'Afmelden voor e-mail updates.',
|
New translations cachet.php (Dutch)
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -697,6 +697,9 @@ function readToMatch(stream, regexp, options) {
}
module.exports = {
+ AbortError: AbortError,
+ EOFError: EOFError,
+ TimeoutError: TimeoutError,
read: read,
readUntil: readUntil,
readTo: readTo,
|
Expose Error classes
In case callers want to do instanceof checks or construct their own
error instances.
|
diff --git a/test/integration/sanity/proxy-http.test.js b/test/integration/sanity/proxy-http.test.js
index <HASH>..<HASH> 100644
--- a/test/integration/sanity/proxy-http.test.js
+++ b/test/integration/sanity/proxy-http.test.js
@@ -6,15 +6,8 @@ describe('sanity test', function () {
testrun;
before(function (done) {
- var port = 9090, // @todo: configure port dynamically via random number generation
- fakeProxyManager = {
- getProxyConfiguration: function (url, callback) {
- callback(null, {
- proxy: 'http://localhost:' + port,
- tunnel: false
- });
- }
- };
+ var port = 9090,
+ proxyList = [{match: '*://*.getpostman.com/*', server: 'http://localhost:' + port, tunnel: false}];
server = new proxy.createProxyServer({
target: 'http://echo.getpostman.com',
@@ -22,7 +15,7 @@ describe('sanity test', function () {
'x-postman-proxy': 'true'
}
});
-
+ console.log(proxyList);
server.listen(port);
this.run({
@@ -32,7 +25,7 @@ describe('sanity test', function () {
}
},
requester: {
- proxyManager: fakeProxyManager
+ proxyList: proxyList
}
}, function (err, results) {
testrun = results;
|
Fixed the tests for proxyList over the proxyManager
|
diff --git a/gocd_cli/commands/pipeline/__init__.py b/gocd_cli/commands/pipeline/__init__.py
index <HASH>..<HASH> 100644
--- a/gocd_cli/commands/pipeline/__init__.py
+++ b/gocd_cli/commands/pipeline/__init__.py
@@ -2,7 +2,7 @@ from gocd_cli.command import BaseCommand
from .retrigger_failed import RetriggerFailed
-__all__ = ['Pause', 'RetriggerFailed', 'Trigger', 'Unlock']
+__all__ = ['Pause', 'RetriggerFailed', 'Trigger', 'Unlock', 'Unpause']
def unlock_pipeline(pipeline):
|
Add Unpause to the list of available pipeline commands
|
diff --git a/psiturk/example/static/js/task.js b/psiturk/example/static/js/task.js
index <HASH>..<HASH> 100644
--- a/psiturk/example/static/js/task.js
+++ b/psiturk/example/static/js/task.js
@@ -244,7 +244,7 @@ var Questionnaire = function() {
var completeHIT = function() {
// save data one last time here?
- window.location= adServerLoc + "/complete?uniqueId=" + psiTurk.taskdata.id;
+ window.location= adServerLoc + "?uniqueId=" + psiTurk.taskdata.id;
}
diff --git a/psiturk/experiment.py b/psiturk/experiment.py
index <HASH>..<HASH> 100644
--- a/psiturk/experiment.py
+++ b/psiturk/experiment.py
@@ -350,7 +350,7 @@ def start_exp():
# if everything goes ok here relatively safe to assume we can lookup the ad
ad_id = get_ad_via_hitid(hitId)
if ad_id != "error":
- ad_server_location = 'https://ad.psiturk.org/view/' + str(ad_id)
+ ad_server_location = 'https://ad.psiturk.org/complete/' + str(ad_id)
else:
raise ExperimentError('hit_not_registered_with_ad_server')
|
dealing with complete hit.
WARNING... your task.js may need to be update to point to the correct URL to complete the hit (see new example)
var completeHIT = function() {
// save data one last time here?
window.location= adServerLoc + "?uniqueId=" + psiTurk.taskdata.id;
}
|
diff --git a/lxc/launch.go b/lxc/launch.go
index <HASH>..<HASH> 100644
--- a/lxc/launch.go
+++ b/lxc/launch.go
@@ -21,7 +21,7 @@ func (c *launchCmd) usage() string {
return gettext.Gettext(
`Launch a container from a particular image.
-lxc launch [remote:]<image> [remote:][<name>] [--ephemeral|-e] [--profile|-p <profile>...]
+lxc launch [remote:]<image> [remote:][<name>] [--ephemeral|-e] [--profile|-p <profile>...] [--config|-c <key=value>...]
Launches a container using the specified image and name.
|
launch: show --config in help text
|
diff --git a/stats/aggregated_stats.go b/stats/aggregated_stats.go
index <HASH>..<HASH> 100644
--- a/stats/aggregated_stats.go
+++ b/stats/aggregated_stats.go
@@ -18,8 +18,11 @@ type AggregatedStat struct {
}
func convertToAggregatedStats(id string, containerIds map[string]string, resourceType string, stats []info.ContainerInfo, memLimit uint64) []AggregatedStats {
- maxDataPoints := len(stats[0].Stats)
totalAggregatedStats := []AggregatedStats{}
+ if len(stats) == 0 {
+ return totalAggregatedStats
+ }
+ maxDataPoints := len(stats[0].Stats)
for i := 0; i < maxDataPoints; i++ {
aggregatedStats := []AggregatedStat{}
|
Avoid panic in aggregating stats
|
diff --git a/app/modules/App/Run.php b/app/modules/App/Run.php
index <HASH>..<HASH> 100644
--- a/app/modules/App/Run.php
+++ b/app/modules/App/Run.php
@@ -13,11 +13,11 @@ use \Devvoh\Parable\App as App;
class Run {
public function preDispatch() {
- echo 'preDispatch RUN';
+ // Do whatever preDispatch stuff you want to do here. This is BEFORE the controller/closure is called.
}
public function postDispatch() {
- echo 'postDispatch RUN';
+ // Do whatever postDispatch stuff you want to do here. This is AFTER the view template is included.
}
}
\ No newline at end of file
|
Removed debug echoes and placed comments instead.
|
diff --git a/spec/validator.spec.js b/spec/validator.spec.js
index <HASH>..<HASH> 100644
--- a/spec/validator.spec.js
+++ b/spec/validator.spec.js
@@ -17,7 +17,7 @@ describe('Validator()', function() {
});
it('should have a rules property containing all the validation rules', function() {
- expect(validator.rules).toBeTruthy();
+ expect(validator.rules4).toBeTruthy();
});
it('should have an input property containing the input data to be validated', function() {
|
travis setup -test failed test with jasmine-node
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,12 +13,13 @@ install_requires = [
test_requires = [
'nose2',
'pandas',
- 'pathlib',
- 'anndata',
'coverage',
'coveralls'
]
+if sys.version_info[0] == 3:
+ test_requires += ['anndata']
+
doc_requires = [
'sphinx',
'sphinxcontrib-napoleon',
|
don't install anndata on python2
|
diff --git a/src/draw/handler/Draw.Polyline.js b/src/draw/handler/Draw.Polyline.js
index <HASH>..<HASH> 100644
--- a/src/draw/handler/Draw.Polyline.js
+++ b/src/draw/handler/Draw.Polyline.js
@@ -107,13 +107,10 @@ L.Draw.Polyline = L.Draw.Feature.extend({
},
_finishShape: function () {
- if (!this.options.allowIntersection && this._poly.newLatLngIntersects(this._poly.getLatLngs()[0], true)) {
- this._showErrorTooltip();
- return;
- }
+ var intersects = this._poly.newLatLngIntersects(this._poly.getLatLngs()[0], true);
- if (!this._shapeIsValid()) {
- this._showErrorLabel();
+ if ((!this.options.allowIntersection && intersects) || !this._shapeIsValid()) {
+ this._showErrorTooltip();
return;
}
|
Refactor check for intserection and valid shape.
|
diff --git a/modules/social_features/social_group/src/Controller/SocialGroupController.php b/modules/social_features/social_group/src/Controller/SocialGroupController.php
index <HASH>..<HASH> 100644
--- a/modules/social_features/social_group/src/Controller/SocialGroupController.php
+++ b/modules/social_features/social_group/src/Controller/SocialGroupController.php
@@ -133,7 +133,7 @@ class SocialGroupController extends ControllerBase {
if ($group instanceof GroupInterface) {
return $this->t('Add members to group: @group_name', ['@group_name' => $group->label()]);
}
-
+
return $this->t('Add members');
}
|
When adding members directly, remove the hero and make sure the page title reflects to what group you are adding a member to
|
diff --git a/dvc/repo/experiments/base.py b/dvc/repo/experiments/base.py
index <HASH>..<HASH> 100644
--- a/dvc/repo/experiments/base.py
+++ b/dvc/repo/experiments/base.py
@@ -135,7 +135,7 @@ class ExpRefInfo:
or len(parts) > 5
or "/".join(parts[:2]) != EXPS_NAMESPACE
):
- InvalidExpRefError(ref)
+ raise InvalidExpRefError(ref)
except ValueError:
raise InvalidExpRefError(ref)
baseline_sha = parts[2] + parts[3] if len(parts) >= 4 else None
|
exp: raise InvalidExpRefError properly
Before it was just left instantiated, but was not raised.
|
diff --git a/backtrader/indicators/macd.py b/backtrader/indicators/macd.py
index <HASH>..<HASH> 100644
--- a/backtrader/indicators/macd.py
+++ b/backtrader/indicators/macd.py
@@ -46,7 +46,7 @@ class MACD(Indicator):
class MACDHisto(MACD):
lines = ('histo',)
- plotlines = dict(histo=dict(_method='bar', alpha=0.50, width=0.66))
+ plotlines = dict(histo=dict(_method='bar', alpha=0.50, width=1.0))
def __init__(self):
super(MACDHisto, self).__init__()
|
macd cosmetic plot change for the histo line
|
diff --git a/server/src/main/java/org/uiautomation/ios/utils/SimulatorSettings.java b/server/src/main/java/org/uiautomation/ios/utils/SimulatorSettings.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/org/uiautomation/ios/utils/SimulatorSettings.java
+++ b/server/src/main/java/org/uiautomation/ios/utils/SimulatorSettings.java
@@ -292,9 +292,10 @@ public class SimulatorSettings {
private String getSimulateDeviceValue(DeviceType device, DeviceVariation variation, String desiredSDKVersion)
throws WebDriverException {
if (!DeviceVariation.compatibleWithSDKVersion(device, variation, desiredSDKVersion)) {
- throw new WebDriverException(String.format("%s incompatible with SDK %s",
+ DeviceVariation compatibleVariation = DeviceVariation.getCompatibleVersion(device, desiredSDKVersion);
+ throw new WebDriverException(String.format("%s variation incompatible with SDK %s, a compatible variation is %s",
DeviceVariation.deviceString(device, variation),
- desiredSDKVersion));
+ desiredSDKVersion, compatibleVariation));
}
return DeviceVariation.deviceString(device, variation);
}
|
Suggest compatible variation in the no compatible variation error.
|
diff --git a/tangy-form.js b/tangy-form.js
index <HASH>..<HASH> 100644
--- a/tangy-form.js
+++ b/tangy-form.js
@@ -281,7 +281,7 @@ export class TangyForm extends PolymerElement {
}
disconnectedCallback() {
- this.unsubscribe()
+ if (this.unsubscribe) this.unsubscribe()
}
onFormResponseComplete(event) {
|
Protect in situations where disconnectedCallback may be called before connectedCallback
|
diff --git a/test/channel.spec.js b/test/channel.spec.js
index <HASH>..<HASH> 100644
--- a/test/channel.spec.js
+++ b/test/channel.spec.js
@@ -566,16 +566,18 @@ describe('Channel', function() {
let ch1 = new Channel(4);
let ch2 = new Channel(4);
let ch3 = new Channel(4);
+ let ch4 = new Channel(4);
for (let i = 0; i < 4; i++)
await ch1.put(i);
- ch1.pipe(ch2).pipe(ch3);
+ ch1.pipe(ch2).pipe(ch3).pipe(ch4);
ch1.close(true);
for (let i = 0; i < 4; i++)
- assert.equal(await ch3.take(), i);
- await ch3.done();
+ assert.equal(await ch4.take(), i);
+ await ch4.done();
assert.equal(ch1.state, STATES.ENDED);
assert.equal(ch2.state, STATES.ENDED);
assert.equal(ch3.state, STATES.ENDED);
+ assert.equal(ch4.state, STATES.ENDED);
});
});
|
test: extend full channel pipe close unit tests
Full channel pipe close now includes 4 pipes by default
in order to ensure that multiple internal pipes
will all be properly closed.
|
diff --git a/src/Web/Account/Asset/Get.php b/src/Web/Account/Asset/Get.php
index <HASH>..<HASH> 100644
--- a/src/Web/Account/Asset/Get.php
+++ b/src/Web/Account/Asset/Get.php
@@ -32,7 +32,7 @@ class Get
$custId = $data->getCustomerId();
/** TODO: add access rights validation */
- $reqCustId = $this->auth->getCurrentCustomerId($request);
+ $reqCustId = $this->auth->getCurrentUserId($request);
/** perform processing */
$items = $this->getAssets($reqCustId);
diff --git a/src/Web/Account/Asset/Transfer.php b/src/Web/Account/Asset/Transfer.php
index <HASH>..<HASH> 100644
--- a/src/Web/Account/Asset/Transfer.php
+++ b/src/Web/Account/Asset/Transfer.php
@@ -37,7 +37,7 @@ class Transfer
/** TODO: add access rights validation */
$reqAdminId = $this->auth->getCurrentAdminId($request);
- $reqCustId = $this->auth->getCurrentCustomerId($request);
+ $reqCustId = $this->auth->getCurrentUserId($request);
/** perform processing */
$resp = $this->transfer($amount, $assetTypeId, $counterPartyId, $custId, $isDirect, $reqAdminId);
|
MOBI-<I> Improve API authenticator to process frontend & backend sessions
|
diff --git a/salt/minion.py b/salt/minion.py
index <HASH>..<HASH> 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -1409,12 +1409,18 @@ class Minion(MinionBase):
'''
Refresh the pillar
'''
- self.opts['pillar'] = salt.pillar.get_pillar(
- self.opts,
- self.opts['grains'],
- self.opts['id'],
- self.opts['environment'],
- ).compile_pillar()
+ try:
+ self.opts['pillar'] = salt.pillar.get_pillar(
+ self.opts,
+ self.opts['grains'],
+ self.opts['id'],
+ self.opts['environment'],
+ ).compile_pillar()
+ except SaltClientError:
+ # Do not exit if a pillar refresh fails.
+ log.error('Pillar data could not be refreshed. '
+ 'One or more masters may be down!')
+ continue
self.module_refresh(force_refresh)
def manage_schedule(self, package):
|
Prevent multi-master from dying with pillar refresh error
|
diff --git a/setuptools/command/editable_wheel.py b/setuptools/command/editable_wheel.py
index <HASH>..<HASH> 100644
--- a/setuptools/command/editable_wheel.py
+++ b/setuptools/command/editable_wheel.py
@@ -168,7 +168,7 @@ class editable_wheel(Command):
if not dist.namespace_packages:
return
- src_root = Path(self.project_dir, self.pakcage_dir.get("", ".")).resolve()
+ src_root = Path(self.project_dir, self.package_dir.get("", ".")).resolve()
installer = _NamespaceInstaller(dist, installation_dir, pth_prefix, src_root)
installer.install_namespaces()
|
Fix typo in editable_wheel.py
|
diff --git a/vsphere/virtual_machine_config_structure.go b/vsphere/virtual_machine_config_structure.go
index <HASH>..<HASH> 100644
--- a/vsphere/virtual_machine_config_structure.go
+++ b/vsphere/virtual_machine_config_structure.go
@@ -628,7 +628,9 @@ func expandVAppConfig(d *schema.ResourceData, client *govmomi.Client) (*types.Vm
if newVApps != nil && len(newVApps) > 0 && newVApps[0] != nil {
newVApp := newVApps[0].(map[string]interface{})
if props, ok := newVApp["properties"].(map[string]interface{}); ok {
- newMap = props
+ for k, v := range props {
+ newMap[k] = v
+ }
}
}
|
Fix missing vapp properties
Due to the way maps behave in goland we ended up removing data from the
original map holding the vapp properties. The consequence was that if
expandVAppConfig was called more than once, we'd end up effectively
emptying the vapp properties map.
|
diff --git a/src/entity/entity.js b/src/entity/entity.js
index <HASH>..<HASH> 100644
--- a/src/entity/entity.js
+++ b/src/entity/entity.js
@@ -125,14 +125,11 @@
*/
this.renderable = null;
- // just to keep track of when we flip
- this.lastflipX = false;
- this.lastflipY = false;
-
// ensure mandatory properties are defined
if ((typeof settings.width !== "number") || (typeof settings.height !== "number")) {
throw new me.ObjectEntity.Error("height and width properties are mandatory when passing settings parameters to an object entity");
}
+
// call the super constructor
this._super(me.Renderable, "init", [x, y,
settings.width,
@@ -194,11 +191,6 @@
typeof(settings.collidable) !== "undefined" ?
settings.collidable : true
);
-
- // ensure mandatory properties are defined
- if ((typeof settings.width !== "number") || (typeof settings.height !== "number")) {
- throw new me.Entity.Error("height and width properties are mandatory when passing settings parameters to an object entity");
- }
/**
* the entity body object
|
[#<I>] removed duplicated code
|
diff --git a/app/js/timer.js b/app/js/timer.js
index <HASH>..<HASH> 100644
--- a/app/js/timer.js
+++ b/app/js/timer.js
@@ -12,6 +12,14 @@ angular.module('timer', [])
},
controller: ['$scope', '$element', '$attrs', '$timeout', function ($scope, $element, $attrs, $timeout) {
+ // Checking for trim function since IE8 doesn't have it
+ // If not a function, create tirm with RegEx to mimic native trim
+ if(typeof String.prototype.trim !== 'function') {
+ String.prototype.trim = function() {
+ return this.replace(/^\s+|\s+$/g, '');
+ }
+ }
+
//angular 1.2 doesn't support attributes ending in "-start", so we're
//supporting both "autostart" and "auto-start" as a solution for
//backward and forward compatibility.
|
Adding trim function check for IE8 support
|
diff --git a/cwltool/avro_ld/validate.py b/cwltool/avro_ld/validate.py
index <HASH>..<HASH> 100644
--- a/cwltool/avro_ld/validate.py
+++ b/cwltool/avro_ld/validate.py
@@ -139,8 +139,13 @@ def validate_ex(expected_schema, datum, strict=False):
errors = []
for f in expected_schema.fields:
+ if f.name in datum:
+ fieldval = datum[f.name]
+ else:
+ fieldval = f.default
+
try:
- validate_ex(f.type, datum.get(f.name), strict=strict)
+ validate_ex(f.type, fieldval, strict=strict)
except ValidationException as v:
if f.name not in datum:
errors.append("missing required field `%s`" % f.name)
|
Make validation aware of defaults, validate default (if provided) when is field
is missing.
|
diff --git a/TYPO3.Flow/Tests/Unit/Http/Component/TrustedProxiesComponentTest.php b/TYPO3.Flow/Tests/Unit/Http/Component/TrustedProxiesComponentTest.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Flow/Tests/Unit/Http/Component/TrustedProxiesComponentTest.php
+++ b/TYPO3.Flow/Tests/Unit/Http/Component/TrustedProxiesComponentTest.php
@@ -460,5 +460,4 @@ class TrustedProxiesComponentTest extends UnitTestCase
$trustedRequest = $this->callWithRequest($request);
$this->assertEquals($expectedUri, (string)$trustedRequest->getUri());
}
-
}
|
TASK: Fix CGL issue
|
diff --git a/lib/active_admin/namespace_settings.rb b/lib/active_admin/namespace_settings.rb
index <HASH>..<HASH> 100644
--- a/lib/active_admin/namespace_settings.rb
+++ b/lib/active_admin/namespace_settings.rb
@@ -23,10 +23,10 @@ module ActiveAdmin
# Set a favicon
register :favicon, false
- # Additional meta tags to place in head of logged in pages.
+ # Additional meta tags to place in head of logged in pages
register :meta_tags, {}
- # Additional meta tags to place in head of logged out pages.
+ # Additional meta tags to place in head of logged out pages
register :meta_tags_for_logged_out_pages, { robots: "noindex, nofollow" }
# The view factory to use to generate all the view classes. Take
@@ -53,10 +53,10 @@ module ActiveAdmin
# Whether filters are enabled
register :filters, true
- # The namespace root.
+ # The namespace root
register :root_to, 'dashboard#index'
- # Options that a passed to root_to.
+ # Options that are passed to root_to
register :root_to_options, {}
# Options passed to the routes, i.e. { path: '/custom' }
|
Fix a typo and extra dots for comments in NamespaceSettings
|
diff --git a/ansible_runner/__main__.py b/ansible_runner/__main__.py
index <HASH>..<HASH> 100644
--- a/ansible_runner/__main__.py
+++ b/ansible_runner/__main__.py
@@ -216,7 +216,7 @@ def main(sys_args=None):
parser.add_argument(
'private_data_dir',
- help="base directory cotnaining the ansible-runner metadata "
+ help="base directory containing the ansible-runner metadata "
"(project, inventory, env, etc)"
)
|
[Trivial] Fix typo in command help
|
diff --git a/salt/cloud/clouds/openstack.py b/salt/cloud/clouds/openstack.py
index <HASH>..<HASH> 100644
--- a/salt/cloud/clouds/openstack.py
+++ b/salt/cloud/clouds/openstack.py
@@ -260,10 +260,14 @@ def get_configured_provider():
'''
Return the first configured instance.
'''
- return config.is_provider_configured(
+ provider = config.is_provider_configured(
__opts__, __active_provider_name__ or __virtualname__,
- ('auth', 'region_name'), log_message=False,
- ) or config.is_provider_configured(
+ ('auth', 'region_name')
+ )
+ if provider:
+ return provider
+
+ return config.is_provider_configured(
__opts__, __active_provider_name__ or __virtualname__,
('cloud', 'region_name')
)
|
Return a configured provider, not a bool
|
diff --git a/api/api.go b/api/api.go
index <HASH>..<HASH> 100644
--- a/api/api.go
+++ b/api/api.go
@@ -83,6 +83,7 @@ func Mount(
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 10 * time.Second,
},
+ Timeout: 30 * time.Second,
})
if len(flags.Profile) > 0 {
|
Set a timeout on the http client
Fixes #<I>
|
diff --git a/src/main/java/nl/hsac/fitnesse/fixture/slim/JsonHttpTest.java b/src/main/java/nl/hsac/fitnesse/fixture/slim/JsonHttpTest.java
index <HASH>..<HASH> 100644
--- a/src/main/java/nl/hsac/fitnesse/fixture/slim/JsonHttpTest.java
+++ b/src/main/java/nl/hsac/fitnesse/fixture/slim/JsonHttpTest.java
@@ -20,14 +20,6 @@ public class JsonHttpTest extends HttpTest {
}
/**
- * @return request sent last time postTo() or getFrom() was called.
- */
- @Override
- public String request() {
- return formatValue(super.request());
- }
-
- /**
* @return response received last time postTo() or getFrom() was called.
*/
@Override
|
I don't expect JSON to be posted (but url encoded form) so no need to format as such.
|
diff --git a/treeherder/settings/base.py b/treeherder/settings/base.py
index <HASH>..<HASH> 100644
--- a/treeherder/settings/base.py
+++ b/treeherder/settings/base.py
@@ -9,8 +9,8 @@ from datetime import timedelta
from treeherder import path
# Insure the vendor libraries are added to the python path
-# in production
-sys.path.append(path('..', 'vendor'))
+# in production, and before the site-packages entry.
+sys.path.insert(1, path('..', 'vendor'))
# These settings can all be optionally set via env vars, or in local.py:
|
Bug <I> - Use vendor packages in preference to globally installed
There is currently duplication between the packages in vendor/ and those
globally installed on stage/production. This change ensures we use those
in vendor/ in preference to those in site-packages & so are using the
version we expected.
|
diff --git a/lib/tetra/facades/bash.rb b/lib/tetra/facades/bash.rb
index <HASH>..<HASH> 100644
--- a/lib/tetra/facades/bash.rb
+++ b/lib/tetra/facades/bash.rb
@@ -3,6 +3,7 @@
module Tetra
# runs Bash with tetra-specific options
class Bash
+ include Logging
include ProcessRunner
def initialize(project)
@@ -21,8 +22,11 @@ module Tetra
mvn_path = kit.find_executable("mvn")
mvn_commandline = Tetra::Mvn.commandline(@project.full_path, mvn_path)
- bashrc = Bashrc.new(history_file.path, ant_commandline, mvn_commandline)
- bashrc_file.write(bashrc.to_s)
+ bashrc_content = Bashrc.new(history_file.path, ant_commandline, mvn_commandline).to_s
+ log.debug "writing bashrc file: #{bashrc_file.path}"
+ log.debug bashrc_content
+
+ bashrc_file.write(bashrc_content)
bashrc_file.flush
run_interactive("bash --rcfile #{bashrc_file.path}")
|
Bash: add more verbose logging
|
diff --git a/mmcv/torchpack/runner/runner.py b/mmcv/torchpack/runner/runner.py
index <HASH>..<HASH> 100644
--- a/mmcv/torchpack/runner/runner.py
+++ b/mmcv/torchpack/runner/runner.py
@@ -108,11 +108,14 @@ class Runner(object):
Args:
optimizer (dict or :obj:`~torch.optim.Optimizer`): Either an
optimizer object or a dict used for constructing the optimizer.
- An example of the dict: ``{'algorithm': 'SGD', 'lr': 0.02,
- 'momentum': 0.9, 'weight_decay': 0.0001}``.
Returns:
:obj:`~torch.optim.Optimizer`: An optimizer object.
+
+ Examples:
+ >>> optimizer = dict(type='SGD', lr=0.01, momentum=0.9)
+ >>> type(runner.init_optimizer(optimizer))
+ <class 'torch.optim.sgd.SGD'>
"""
if isinstance(optimizer, dict):
optimizer = obj_from_dict(
|
fix a typo in docstring
|
diff --git a/lib/dotrepo/cli.rb b/lib/dotrepo/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/dotrepo/cli.rb
+++ b/lib/dotrepo/cli.rb
@@ -31,7 +31,7 @@ module Dotrepo
DotFileManager.new( config.source, config.destination ).symlink_dotfiles
end
- desc "refresh", "update linked dotfiles"
+ desc "refresh", "link new dotfiles"
def refresh
# runs the manager again to symlink new files & prune abandoned files
DotFileManager.new( config.source, config.destination ).symlink_dotfiles
|
better description for CLI#refresh
|
diff --git a/modules/dropdown/js/dropdown_directive.js b/modules/dropdown/js/dropdown_directive.js
index <HASH>..<HASH> 100644
--- a/modules/dropdown/js/dropdown_directive.js
+++ b/modules/dropdown/js/dropdown_directive.js
@@ -31,12 +31,12 @@ angular.module('lumx.dropdown', ['lumx.utils.event-scheduler'])
{
if (openScope === dropdownScope)
{
- if (angular.isDefined(openScope.idEventScheduler))
+ if (angular.isDefined(dropdownScope.idEventScheduler))
{
$timeout(function()
{
- LxEventSchedulerService.unregister(openScope.idEventScheduler);
- delete openScope.idEventScheduler;
+ LxEventSchedulerService.unregister(dropdownScope.idEventScheduler);
+ delete dropdownScope.idEventScheduler;
openScope = null;
}, 1);
|
fix dropdown: fix event scheduler on close
|
diff --git a/spylon/common.py b/spylon/common.py
index <HASH>..<HASH> 100644
--- a/spylon/common.py
+++ b/spylon/common.py
@@ -68,6 +68,8 @@ def as_iterable(iterable_or_scalar):
else:
return (iterable_or_scalar,)
+# preserve backwards compatibility
+_as_iterable = as_iterable
@add_metaclass(ABCMeta)
class JVMHelpers(object):
|
MNT: Need to preserve backwards compatibility
|
diff --git a/scripts/__init__.py b/scripts/__init__.py
index <HASH>..<HASH> 100644
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -1,4 +1,3 @@
-
from __future__ import absolute_import, division, print_function, unicode_literals
from pies.overrides import *
|
Remove unintentionaly added line
|
diff --git a/server/fsm.go b/server/fsm.go
index <HASH>..<HASH> 100644
--- a/server/fsm.go
+++ b/server/fsm.go
@@ -866,6 +866,7 @@ func (h *FSMHandler) opensent() (bgp.FSMState, FsmStateReason) {
"Key": fsm.pConf.Config.NeighborAddress,
"State": fsm.state.String(),
}).Warn("graceful restart timer expired")
+ h.conn.Close()
return bgp.BGP_FSM_IDLE, FSM_RESTART_TIMER_EXPIRED
}
case i, ok := <-h.msgCh.Out():
@@ -1076,6 +1077,7 @@ func (h *FSMHandler) openconfirm() (bgp.FSMState, FsmStateReason) {
"Key": fsm.pConf.Config.NeighborAddress,
"State": fsm.state.String(),
}).Warn("graceful restart timer expired")
+ h.conn.Close()
return bgp.BGP_FSM_IDLE, FSM_RESTART_TIMER_EXPIRED
}
case <-ticker.C:
|
server: Close conn when graceful restart timer expired
|
diff --git a/lib/fluent/plugin/out_buffered_stdout.rb b/lib/fluent/plugin/out_buffered_stdout.rb
index <HASH>..<HASH> 100644
--- a/lib/fluent/plugin/out_buffered_stdout.rb
+++ b/lib/fluent/plugin/out_buffered_stdout.rb
@@ -34,7 +34,7 @@ module Fluent
def write(chunk)
chunk.msgpack_each do |time, tag, record|
- log.write "#{time} #{tag}: #{@formatter.format(time.localtime.to_s, tag, record)}\n"
+ log.write "#{time} #{tag}: #{@formatter.format(tag, time, record)}\n"
end
log.flush
end
|
out_buffered_stdout: Fix no method error due to wrong formattter#format usage
|
diff --git a/Joomla/Sniffs/Operators/ValidLogicalOperatorsSniff.php b/Joomla/Sniffs/Operators/ValidLogicalOperatorsSniff.php
index <HASH>..<HASH> 100644
--- a/Joomla/Sniffs/Operators/ValidLogicalOperatorsSniff.php
+++ b/Joomla/Sniffs/Operators/ValidLogicalOperatorsSniff.php
@@ -52,7 +52,7 @@ class Joomla_Sniffs_Operators_ValidLogicalOperatorsSniff implements PHP_CodeSnif
return;
}
- $nextToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+ $nextToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
if ($tokens[$nextToken]['code'] === T_EXIT)
{
@@ -60,6 +60,13 @@ class Joomla_Sniffs_Operators_ValidLogicalOperatorsSniff implements PHP_CodeSnif
return;
}
+ // Special Joomla! case `jexit()`.
+ if ($tokens[$nextToken]['content'] == 'jexit')
+ {
+ // Put in an exception for things like `or jexit()`
+ return;
+ }
+
$error = 'Logical operator "%s" not allowed; use "%s" instead';
$data = array(
$operator,
|
Attempt fix for `or jexit()` case
|
diff --git a/eZ/Publish/API/Repository/Values/Content/ContentInfo.php b/eZ/Publish/API/Repository/Values/Content/ContentInfo.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/Repository/Values/Content/ContentInfo.php
+++ b/eZ/Publish/API/Repository/Values/Content/ContentInfo.php
@@ -100,4 +100,15 @@ abstract class ContentInfo extends ValueObject
* @var string
*/
protected $mainLanguageCode;
+
+ /**
+ * Identifier of the main location.
+ *
+ * If the content object has multiple locations,
+ * $mainLocationId will point to the main one.
+ *
+ * @var mixed
+ */
+ protected $mainLocationId;
+
}
diff --git a/eZ/Publish/API/Repository/Values/Content/Location.php b/eZ/Publish/API/Repository/Values/Content/Location.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/Repository/Values/Content/Location.php
+++ b/eZ/Publish/API/Repository/Values/Content/Location.php
@@ -111,16 +111,6 @@ abstract class Location extends ValueObject
protected $modifiedSubLocationDate;
/**
- * Identifier of the main location.
- *
- * If the content object in this location has multiple locations,
- * $mainLocationId will point to the main one.
- *
- * @var mixed
- */
- protected $mainLocationId;
-
- /**
* Depth location has in the location tree.
*
* @var int
|
moved main location from Location to ContentInfo
|
diff --git a/lib/3scale/core/version.rb b/lib/3scale/core/version.rb
index <HASH>..<HASH> 100644
--- a/lib/3scale/core/version.rb
+++ b/lib/3scale/core/version.rb
@@ -1,5 +1,5 @@
module ThreeScale
module Core
- VERSION = '1.2.7'
+ VERSION = '1.2.8'
end
end
|
core: bugfix release <I>
|
diff --git a/phy/cluster/views/base.py b/phy/cluster/views/base.py
index <HASH>..<HASH> 100644
--- a/phy/cluster/views/base.py
+++ b/phy/cluster/views/base.py
@@ -266,8 +266,10 @@ class ManualClusteringView(object):
connect(on_select, event='select')
# Save the view state in the GUI state.
- @connect(view=self)
+ @connect
def on_close_view(view_, gui):
+ if view_ != self:
+ return
logger.debug("Close view %s.", self.name)
self._closed = True
gui.remove_menu(self.name)
|
Fix frozen view bug: the close event was sent to all views
|
diff --git a/lib/endpoints/class-wp-rest-posts-terms-controller.php b/lib/endpoints/class-wp-rest-posts-terms-controller.php
index <HASH>..<HASH> 100644
--- a/lib/endpoints/class-wp-rest-posts-terms-controller.php
+++ b/lib/endpoints/class-wp-rest-posts-terms-controller.php
@@ -126,8 +126,9 @@ class WP_REST_Posts_Terms_Controller extends WP_REST_Controller {
if ( is_wp_error( $is_request_valid ) ) {
return $is_request_valid;
}
-
- $tt_ids = wp_set_object_terms( $post->ID, $term_id, $this->taxonomy, true );
+
+ $term = get_term_by('term_taxonomy_id', $term_id, $this->taxonomy);
+ $tt_ids = wp_set_object_terms( $post->ID, $term->term_id, $this->taxonomy, true );
if ( is_wp_error( $tt_ids ) ) {
return $tt_ids;
|
#<I>: When associating terms to posts, align WP-API use of term_taxonomy_id with WP core's use of term_id.
|
diff --git a/tests/text_encoders/test_spacy_encoder.py b/tests/text_encoders/test_spacy_encoder.py
index <HASH>..<HASH> 100644
--- a/tests/text_encoders/test_spacy_encoder.py
+++ b/tests/text_encoders/test_spacy_encoder.py
@@ -6,13 +6,16 @@ from torchnlp.text_encoders import SpacyEncoder
@pytest.fixture
-def encoder():
- input_ = 'This is a sentence'
+def input_():
+ return ('This is a sentence')
+
+
+@pytest.fixture
+def encoder(input_):
return SpacyEncoder([input_])
-def test_spacy_encoder(encoder):
- input_ = 'This is a sentence'
+def test_spacy_encoder(encoder, input_):
tokens = encoder.encode(input_)
assert encoder.decode(tokens) == input_
@@ -24,9 +27,7 @@ def test_spacy_encoder_issue_44():
assert 'n\'t' in encoder.vocab
-def test_spacy_encoder_batch():
- input_ = 'This is a sentence'
- encoder = SpacyEncoder([input_])
+def test_spacy_encoder_batch(encoder, input_):
tokens = encoder.batch_encode([input_, input_])
assert encoder.decode(tokens[0]) == input_
assert encoder.decode(tokens[1]) == input_
|
Normalize Spacy Encoder Tests
|
diff --git a/spec/neovim/host_spec.rb b/spec/neovim/host_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/neovim/host_spec.rb
+++ b/spec/neovim/host_spec.rb
@@ -25,6 +25,21 @@ module Neovim
end
end
+ describe "#run" do
+ it "runs the session event loop and handles messages" do
+ message = double(:message)
+ expect(session).to receive(:run).and_yield(message)
+ expect(host).to receive(:handle).with(message)
+
+ host.run
+ end
+
+ it "rescues session exceptions", :silence_logging do
+ expect(session).to receive(:run).and_raise("BOOM")
+ expect { host.run }.not_to raise_error
+ end
+ end
+
describe "#handlers" do
it "has a default poll handler" do
expect(host.handlers["poll"]).to respond_to(:call)
|
Add test coverage around Host#run
|
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Database/Eloquent/Model.php
+++ b/src/Illuminate/Database/Eloquent/Model.php
@@ -735,6 +735,22 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
return $instance->newQuery()->with($relations);
}
+
+ /**
+ * Append attributes to query when building a query
+ *
+ * @return $this
+ */
+ public function append($relations)
+ {
+ if (is_string($relations)) {
+ $relations = func_get_args();
+ }
+
+ $this->appends = array_merge($this->appends, $relations);
+
+ return $this;
+ }
/**
* Define a one-to-one relationship.
|
Update Model.php to allow dynamic appending of attributes after making the query.
We then could use it like this:
```
return $resource->findOrFail($id)
->append(['custom_attribute'])
->toArray();
```
|
diff --git a/reliure/pipeline.py b/reliure/pipeline.py
index <HASH>..<HASH> 100644
--- a/reliure/pipeline.py
+++ b/reliure/pipeline.py
@@ -75,7 +75,7 @@ class Composable(object):
self.name = self.__class__.__name__
else:
self.name = name
- self._logger = logging.getLogger("reliure.%s" % self.__class__.__name__)
+ self._logger = logging.getLogger("reliure.%s" % self.name)
@property
def name(self):
|
Use component name as logging name.
Class name was used before. Note that class name is used as default component name.
|
diff --git a/src/main/java/com/semanticcms/core/model/Element.java b/src/main/java/com/semanticcms/core/model/Element.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/semanticcms/core/model/Element.java
+++ b/src/main/java/com/semanticcms/core/model/Element.java
@@ -162,6 +162,15 @@ abstract public class Element extends Node {
}
/**
+ * Gets the element ID template for generating IDs.
+ *
+ * @see #getLabel() Defaults to getLabel()
+ */
+ protected String getElementIdTemplate() {
+ return getLabel();
+ }
+
+ /**
* Gets the default element ID prefix for this type of element.
*/
abstract protected String getDefaultIdPrefix();
@@ -213,7 +222,7 @@ abstract public class Element extends Node {
if(page != null) {
Map<String,Element> elementsById = page.getElementsById();
// Generate the ID now
- StringBuilder possId = Element.generateIdPrefix(getLabel(), getDefaultIdPrefix());
+ StringBuilder possId = Element.generateIdPrefix(getElementIdTemplate(), getDefaultIdPrefix());
int possIdLen = possId.length();
// Find an unused identifier
for(int i=1; i<=Integer.MAX_VALUE; i++) {
|
ID templates may now be determined by elements independently of their label.
|
diff --git a/apiserver/metricsender/metricsender.go b/apiserver/metricsender/metricsender.go
index <HASH>..<HASH> 100644
--- a/apiserver/metricsender/metricsender.go
+++ b/apiserver/metricsender/metricsender.go
@@ -47,7 +47,7 @@ func handleResponse(mm *state.MetricsManager, st ModelBackend, response wireform
}
}
}
- if response.NewGracePeriod > 0 {
+ if response.NewGracePeriod > 0 && response.NewGracePeriod != mm.GracePeriod() {
err := mm.SetGracePeriod(response.NewGracePeriod)
if err != nil {
logger.Errorf("failed to set new grace period %v", err)
|
Fixed set grace period.
We do not need to set the grace period on every send/receive if it is not changed.
|
diff --git a/tests/webdriver/fuzzer.rb b/tests/webdriver/fuzzer.rb
index <HASH>..<HASH> 100644
--- a/tests/webdriver/fuzzer.rb
+++ b/tests/webdriver/fuzzer.rb
@@ -125,7 +125,7 @@ if browserdriver == :firefox
elsif browserdriver == :chrome
log_path = FileUtils.mkpath(File.join(File.dirname(File.expand_path(__FILE__)), "fuzzer_output"))
log_path = log_path.first
- driver = Selenium::WebDriver.for browserdriver, :service_log_path => log_path
+ driver = Selenium::WebDriver.for browserdriver
else
driver = Selenium::WebDriver.for browserdriver
end
diff --git a/tests/webdriver/lib/scribe_driver.rb b/tests/webdriver/lib/scribe_driver.rb
index <HASH>..<HASH> 100644
--- a/tests/webdriver/lib/scribe_driver.rb
+++ b/tests/webdriver/lib/scribe_driver.rb
@@ -101,7 +101,7 @@ module ScribeDriver
elsif browser== :chrome
log_path = FileUtils.mkpath(File.join(File.dirname(File.expand_path(__FILE__)), "fuzzer_output"))
log_path = log_path.first
- @@driver = Selenium::WebDriver.for browser, :service_log_path => log_path
+ @@driver = Selenium::WebDriver.for browser
else
@@driver = Selenium::WebDriver.for browser
end
|
Remove log path for ChromeDriver2 compatibility.
It seems we need to use a ChromeOptions class now, which is not yet exposed in
the Ruby bindings.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.