diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/state/pool.go b/state/pool.go
index <HASH>..<HASH> 100644
--- a/state/pool.go
+++ b/state/pool.go
@@ -10,6 +10,7 @@ import (
"sync"
"time"
+ "github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/pubsub"
@@ -185,6 +186,11 @@ func OpenStatePool(args OpenParams) (*StatePool, error) {
return pool, nil
}
+// Clock returns the clock used by the system state.
+func (p *StatePool) Clock() clock.Clock {
+ return p.systemState.clock()
+}
+
// Get returns a PooledState for a given model, creating a new State instance
// if required.
// If the State has been marked for removal, an error is returned.
|
Allow access to the StatePool's clock.
|
diff --git a/graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/TestLoadGraph.java b/graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/TestLoadGraph.java
index <HASH>..<HASH> 100755
--- a/graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/TestLoadGraph.java
+++ b/graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/TestLoadGraph.java
@@ -13,7 +13,7 @@ import com.tinkerpop.blueprints.util.io.graphml.GraphMLReader;
public class TestLoadGraph {
private static final String INPUT_FILE = "target/test-classes/graph-example-2.xml";
- private static final String DBURL = "plocal:target/databases/tinkerpop";
+ private static final String DBURL = "plocal:target/databases/GratefulDeadConcerts";
private String inputFile = INPUT_FILE;
private String dbURL = DBURL;
|
Renamed "tinkerpop" database -> "GratefulDeadConcerts"
|
diff --git a/lib/ascii-data-tools/record_type.rb b/lib/ascii-data-tools/record_type.rb
index <HASH>..<HASH> 100644
--- a/lib/ascii-data-tools/record_type.rb
+++ b/lib/ascii-data-tools/record_type.rb
@@ -66,10 +66,14 @@ module AsciiDataTools
end
end
- class Type
+ module FixedLengthType
include RecordDecoder
include RecordEncoder
include Normaliser
+ end
+
+ class Type
+ include FixedLengthType
attr_reader :name
def initialize(name, fields = [])
|
extracted the fixed length type-specific modules into own module
|
diff --git a/test/runtime/kvstore.go b/test/runtime/kvstore.go
index <HASH>..<HASH> 100644
--- a/test/runtime/kvstore.go
+++ b/test/runtime/kvstore.go
@@ -25,7 +25,7 @@ import (
"github.com/sirupsen/logrus"
)
-var _ = Describe("RuntimeKVStoreTest", func() {
+var _ = Describe("RuntimeValidatedKVStoreTest", func() {
var once sync.Once
var logger *logrus.Entry
|
test/runtime: mark KVStore test as validated
|
diff --git a/aframe.js b/aframe.js
index <HASH>..<HASH> 100644
--- a/aframe.js
+++ b/aframe.js
@@ -1548,16 +1548,20 @@ var aFrame = function(){
},
database : database,
el : el,
+ fx : fx,
+ json : json,
+ label : label,
listener : {
add : observer.add,
list : observer.list,
remove : observer.remove,
replace : observer.replace
},
- fx : fx,
- json : json,
- label : label,
- number : number,
+ number : number,
+ state : {
+ header : null,
+ pattern : /^.*$/
+ },
spinner : {
create : client.spinner,
url : null
|
Refactored the closure by moving listener{} and created state{} which will be used to implement stateful binding in observer{}.
|
diff --git a/color.js b/color.js
index <HASH>..<HASH> 100644
--- a/color.js
+++ b/color.js
@@ -277,7 +277,7 @@ Color.prototype = {
clone: function() {
return new Color(this.rgb());
- },
+ }
}
@@ -305,7 +305,7 @@ Color.prototype.setValues = function(space, vals) {
"rgb": [255, 255, 255],
"hsl": [360, 100, 100],
"hsv": [360, 100, 100],
- "cmyk": [100, 100, 100, 100],
+ "cmyk": [100, 100, 100, 100]
};
var alpha = 1;
|
remove useless commas, make IE family happy
|
diff --git a/src/org/openscience/cdk/modeling/forcefield/IPotentialFunction.java b/src/org/openscience/cdk/modeling/forcefield/IPotentialFunction.java
index <HASH>..<HASH> 100644
--- a/src/org/openscience/cdk/modeling/forcefield/IPotentialFunction.java
+++ b/src/org/openscience/cdk/modeling/forcefield/IPotentialFunction.java
@@ -18,6 +18,7 @@ public interface IPotentialFunction {
GVector energyGradient = null; //Gradient of the energy function in a 3xN point.
GMatrix energyHessian = null;
double[] forHessian = null;
+ int functionEvaluationNumber = 0;
/**
diff --git a/src/org/openscience/cdk/test/modeling/forcefield/TestPotentialFunction.java b/src/org/openscience/cdk/test/modeling/forcefield/TestPotentialFunction.java
index <HASH>..<HASH> 100644
--- a/src/org/openscience/cdk/test/modeling/forcefield/TestPotentialFunction.java
+++ b/src/org/openscience/cdk/test/modeling/forcefield/TestPotentialFunction.java
@@ -22,6 +22,7 @@ public class TestPotentialFunction implements IPotentialFunction {
double[] forHessian = null;
GMatrix order2ndErrorApproximateHessian = null;
double[] forOrder2ndErrorApproximateHessian = null;
+ int functionEvaluationNumber = 0;
/**
|
The variable functionEvaluationNumber was included in the PotentialFunction interface.
git-svn-id: <URL>
|
diff --git a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
index <HASH>..<HASH> 100644
--- a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
+++ b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
@@ -1264,7 +1264,9 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
Type::fixUpLocalType(
$docblock_info->mixin,
$this->aliases,
- $this->class_template_types
+ $this->class_template_types,
+ $this->type_aliases,
+ $fq_classlike_name
),
null,
$this->class_template_types
|
fix: mixin parameter of self should be properly resolved (#<I>)
|
diff --git a/sprout/lib/sprout.rb b/sprout/lib/sprout.rb
index <HASH>..<HASH> 100644
--- a/sprout/lib/sprout.rb
+++ b/sprout/lib/sprout.rb
@@ -9,10 +9,15 @@ require 'rake/clean'
# includes open-uri, while older versions do not.
# When open-uri is included twice, we get a bunch of nasty
# warnings because constants are being overwritten.
-if(Gem::Version.new(Gem::RubyGemsVersion) != Gem::Version.new('1.0.1'))
+gem_version = Gem::Version.new(Gem::RubyGemsVersion)
+if(gem_version != Gem::Version.new('1.0.1'))
require 'open-uri'
end
+if(gem_version < Gem::Version.new('1.3.5'))
+ puts "[WARNING] You need to update your version of RubyGems: sudo gem update --system"
+end
+
$:.unshift(File.dirname(__FILE__))
require 'sprout/dynamic_accessors'
require 'progress_bar'
|
Added warning if version of RubyGems is less than <I>
|
diff --git a/spec/gibbon/gibbon_spec.rb b/spec/gibbon/gibbon_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/gibbon/gibbon_spec.rb
+++ b/spec/gibbon/gibbon_spec.rb
@@ -73,7 +73,7 @@ describe Gibbon do
expect(@gibbon.proxy).to be_nil
end
- it "sets an proxy url key from the 'MAILCHIMP_PROXY_URL' ENV variable" do
+ it "sets a proxy url key from the 'MAILCHIMP_PROXY' ENV variable" do
ENV['MAILCHIMP_PROXY'] = @proxy
@gibbon = Gibbon::Request.new
expect(@gibbon.proxy).to eq(@proxy)
|
fix typo MAILCHIMP_PROXY in spec
|
diff --git a/python/phonenumbers/__init__.py b/python/phonenumbers/__init__.py
index <HASH>..<HASH> 100644
--- a/python/phonenumbers/__init__.py
+++ b/python/phonenumbers/__init__.py
@@ -146,7 +146,7 @@ from .phonenumbermatcher import PhoneNumberMatch, PhoneNumberMatcher, Leniency
# Version number is taken from the upstream libphonenumber version
# together with an indication of the version of the Python-specific code.
-__version__ = "8.12.47"
+__version__ = "8.12.48"
__all__ = ['PhoneNumber', 'CountryCodeSource', 'FrozenPhoneNumber',
'REGION_CODE_FOR_NON_GEO_ENTITY', 'NumberFormat', 'PhoneNumberDesc', 'PhoneMetadata',
|
Prep for <I> release
|
diff --git a/salmonella/widgets.py b/salmonella/widgets.py
index <HASH>..<HASH> 100644
--- a/salmonella/widgets.py
+++ b/salmonella/widgets.py
@@ -1,11 +1,15 @@
from django.conf import settings
from django.contrib.admin import widgets
-from django.urls import reverse, NoReverseMatch
from django.core.exceptions import ImproperlyConfigured
from django.template.loader import render_to_string
from django import VERSION
try:
+ from django.urls import reverse, NoReverseMatch
+except ImportError:
+ from django.core.urlresolvers import reverse, NoReverseMatch
+
+try:
from django.utils.encoding import force_text
except ImportError:
from django.utils.encoding import force_unicode as force_text
|
Backwards compatibility for Django <<I>
In order to preserve compatibility with Django before the <I> release, catch import errors when importing from `django.urls` and use `django.core.urlresolvers` instead.
|
diff --git a/src/Composer/Package/Locker.php b/src/Composer/Package/Locker.php
index <HASH>..<HASH> 100644
--- a/src/Composer/Package/Locker.php
+++ b/src/Composer/Package/Locker.php
@@ -258,7 +258,10 @@ class Locker
$lock['packages-dev'] = $this->lockPackages($devPackages);
}
- if (empty($lock['packages']) && empty($lock['packages-dev'])) {
+ $lock['platform'] = $platformReqs;
+ $lock['platform-dev'] = $platformDevReqs;
+
+ if (empty($lock['packages']) && empty($lock['packages-dev']) && empty($lock['platform']) && empty($lock['platform-dev'])) {
if ($this->lockFile->exists()) {
unlink($this->lockFile->getPath());
}
@@ -266,9 +269,6 @@ class Locker
return false;
}
- $lock['platform'] = $platformReqs;
- $lock['platform-dev'] = $platformDevReqs;
-
if (!$this->isLocked() || $lock !== $this->getLockData()) {
$this->lockFile->write($lock);
$this->lockDataCache = null;
|
Create lock if we only have platform dependencies
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,8 @@ from setuptools import setup
setup(
name='django-extra-views',
- version='0.6.1',
- url='https://github.com/miguelrestrepo/django-extra-views',
+ version='0.6.2',
+ url='https://github.com/AndrewIngram/django-extra-views',
install_requires=[
'Django >=1.3',
],
|
corrected url in setup.py
|
diff --git a/src/TwitterApio.php b/src/TwitterApio.php
index <HASH>..<HASH> 100644
--- a/src/TwitterApio.php
+++ b/src/TwitterApio.php
@@ -50,9 +50,9 @@ class TwitterApio extends tmhOAuth
public function __construct($settings = [], $config = [])
{
include dirname(__DIR__) . '/config/config.php';
- $this->general_config = array_merge($general_config, $twitter_settings);
- $this->general_config = array_merge($this->general_config, $config);
-
+ $this->general_config = array_merge($general_config, $twitter_settings); // Original twitter settings from config file
+ $this->general_config = array_merge($this->general_config, $settings); // Supplied Oauth settings
+ $this->general_config = array_merge($this->general_config, $config); // Supplied app settings.
parent::__construct(array_merge($twitter_settings, $settings));
}
|
Fix missing merge from twitter settings into general config.
|
diff --git a/indra/sources/biopax/api.py b/indra/sources/biopax/api.py
index <HASH>..<HASH> 100644
--- a/indra/sources/biopax/api.py
+++ b/indra/sources/biopax/api.py
@@ -157,6 +157,8 @@ def process_owl(owl_filename):
A BiopaxProcessor containing the obtained BioPAX model in bp.model.
"""
model = pcc.owl_to_model(owl_filename)
+ if model is None:
+ return None
return process_model(model)
|
Don't process file if it can't be opened
|
diff --git a/src/main/java/org/dasein/cloud/azure/compute/image/AzureOSImage.java b/src/main/java/org/dasein/cloud/azure/compute/image/AzureOSImage.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/dasein/cloud/azure/compute/image/AzureOSImage.java
+++ b/src/main/java/org/dasein/cloud/azure/compute/image/AzureOSImage.java
@@ -355,7 +355,7 @@ public class AzureOSImage extends AbstractImageSupport {
@Nonnull
@Override
public Iterable<MachineImage> listImages(@Nullable ImageFilterOptions imageFilterOptions) throws CloudException, InternalException {
- if (!imageFilterOptions.getImageClass().equals(ImageClass.MACHINE)) {
+ if (imageFilterOptions.getImageClass() != null && !imageFilterOptions.getImageClass().equals(ImageClass.MACHINE)) {
return Collections.emptyList();
}
|
Avoid an NPE when image class not set in filter options
|
diff --git a/lib/socket.js b/lib/socket.js
index <HASH>..<HASH> 100644
--- a/lib/socket.js
+++ b/lib/socket.js
@@ -388,10 +388,9 @@
if (wasConnected) {
this.transport.clearTimeouts();
-
this.publish('disconnect', reason);
- if (this.options.reconnect && !this.reconnecting) {
+ if ('booted' != reason && this.options.reconnect && !this.reconnecting) {
this.reconnect();
}
}
|
Fixed; avoid reconnection on forced client disconnections (both for when the server
kicks a client and the client disconnects itself.
|
diff --git a/simuvex/s_helpers.py b/simuvex/s_helpers.py
index <HASH>..<HASH> 100644
--- a/simuvex/s_helpers.py
+++ b/simuvex/s_helpers.py
@@ -13,18 +13,25 @@ l = logging.getLogger("s_helpers")
### Helper functions ###
########################
-# Returns size, in BYTES, of a type
-def get_size(t):
+def size_bits(t):
+ '''Returns size, in BITS, of a type.'''
for s in 256, 128, 64, 32, 16, 8, 1:
if str(s) in t:
- return s/8
+ return s
raise Exception("Unable to determine length of %s." % t)
+def size_bytes(t):
+ '''Returns size, in BYTES, of a type.'''
+ s = size_bits(t)
+ if s == 1:
+ raise Exception("size_bytes() is seeing a bit!")
+ return s/8
+
def translate_irconst(c):
- size = get_size(c.type)
+ size = size_bits(c.type)
t = type(c.value)
if t in (int, long):
- return symexec.BitVecVal(c.value, size*8)
+ return symexec.BitVecVal(c.value, size)
raise Exception("Unsupported constant type: %s" % type(c.value))
def flip_bytes(mem_expr):
|
split get_size into size_bytes and size_bits
|
diff --git a/src/processors/save.js b/src/processors/save.js
index <HASH>..<HASH> 100644
--- a/src/processors/save.js
+++ b/src/processors/save.js
@@ -27,10 +27,12 @@
options || (options = {});
options.purge = options.purge !== false;
- if (!isDir && linq(outputs).count().run() > 1) {
+ if (!isDir && linq(inputs.all).count().run() > 1) {
return callback(new Error('Cannot save multiple outputs to a single file, consider append / to the output path'));
}
+ outputs = {};
+
// Delete orphaned files from output
async.series([
function (callback) {
@@ -38,11 +40,7 @@
var outputFilename = isDir ? path.join(dirpath, filename).replace(/\\/g, '/') : dirpath;
fs.unlink(path.resolve(outputdir, outputFilename), function (err) {
- if (!err || err.code === 'ENOENT') {
- outputs[outputFilename] = err = null;
- }
-
- callback(err);
+ callback(err && err.code !== 'ENOENT' ? err : null);
});
}, null).run(callback);
},
|
Save processor should not reuse cached outputs
|
diff --git a/lib/sub_diff/adapter.rb b/lib/sub_diff/adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/sub_diff/adapter.rb
+++ b/lib/sub_diff/adapter.rb
@@ -2,7 +2,7 @@ module SubDiff
class Adapter
extend Forwardable
- def_delegators :@differ, :builder
+ def_delegators :differ, :builder
def_delegators :builder, :type
def_delegators :instance, :diff
|
Refer to method instead of ivar
|
diff --git a/aws/data_source_aws_outposts_site_test.go b/aws/data_source_aws_outposts_site_test.go
index <HASH>..<HASH> 100644
--- a/aws/data_source_aws_outposts_site_test.go
+++ b/aws/data_source_aws_outposts_site_test.go
@@ -4,6 +4,7 @@ import (
"regexp"
"testing"
+ "github.com/aws/aws-sdk-go/service/outposts"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)
@@ -12,6 +13,7 @@ func TestAccAWSOutpostsSiteDataSource_Id(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOutpostsSites(t) },
+ ErrorCheck: testAccErrorCheck(t, outposts.EndpointsID),
Providers: testAccProviders,
CheckDestroy: nil,
Steps: []resource.TestStep{
@@ -34,6 +36,7 @@ func TestAccAWSOutpostsSiteDataSource_Name(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOutpostsSites(t) },
+ ErrorCheck: testAccErrorCheck(t, outposts.EndpointsID),
Providers: testAccProviders,
CheckDestroy: nil,
Steps: []resource.TestStep{
|
tests/ds/outposts_site: Add ErrorCheck
|
diff --git a/lib/modifier.js b/lib/modifier.js
index <HASH>..<HASH> 100644
--- a/lib/modifier.js
+++ b/lib/modifier.js
@@ -24,6 +24,8 @@ util.inherits(Modifier, Pipeline);
//Internals
+Modifier.prototype._aggregatePluginResults = SerializationPlugin.getHtml;
+
Modifier.prototype._enablePlugin = function (plugin, replacer) {
if (!this._isPluginEnabled(plugin)) {
var serializationPluginIdx = this.plugins.indexOf(SerializationPlugin);
@@ -34,7 +36,6 @@ Modifier.prototype._enablePlugin = function (plugin, replacer) {
}
};
-Modifier.prototype._aggregatePluginResults = SerializationPlugin.getHtml;
|
Swap code lines FTW =)
|
diff --git a/lib/resource/Application.js b/lib/resource/Application.js
index <HASH>..<HASH> 100644
--- a/lib/resource/Application.js
+++ b/lib/resource/Application.js
@@ -12,6 +12,9 @@ Application.prototype.authenticateAccount = function authenticateApplicationAcco
username = authcRequest.username,
password = authcRequest.password,
type = authcRequest.type || 'basic';
+ var accountStore = ('string' === typeof authcRequest.accountStore) ?
+ {href: authcRequest.accountStore} :
+ authcRequest.accountStore;
var loginAttempt = {
type: type,
@@ -19,7 +22,7 @@ Application.prototype.authenticateAccount = function authenticateApplicationAcco
};
if (authcRequest.accountStore){
- loginAttempt.accountStore = authcRequest.accountStore;
+ loginAttempt.accountStore = accountStore
}
_this.dataStore.createResource(_this.loginAttempts.href, {expand: 'account'}, loginAttempt, require('./AuthenticationResult'), callback);
|
added support of authcRequest.accountStore param as string
|
diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go
index <HASH>..<HASH> 100644
--- a/core/rawdb/schema.go
+++ b/core/rawdb/schema.go
@@ -29,10 +29,10 @@ var (
// databaseVerisionKey tracks the current database version.
databaseVerisionKey = []byte("DatabaseVersion")
- // headHeaderKey tracks the latest know header's hash.
+ // headHeaderKey tracks the latest known header's hash.
headHeaderKey = []byte("LastHeader")
- // headBlockKey tracks the latest know full block's hash.
+ // headBlockKey tracks the latest known full block's hash.
headBlockKey = []byte("LastBlock")
// headFastBlockKey tracks the latest known incomplete block's hash during fast sync.
|
core/rawdb: fix typo (#<I>)
|
diff --git a/lib/po2icu.js b/lib/po2icu.js
index <HASH>..<HASH> 100644
--- a/lib/po2icu.js
+++ b/lib/po2icu.js
@@ -71,7 +71,7 @@ module.exports = {
format = msg.comments.flag;
}
var msgid = msg.msgid;
- var msgstr = msg.msgstr;
+ var msgstr = msg.msgstr[0];
var icuId = '';
var icuStr = '';
@@ -80,9 +80,12 @@ module.exports = {
icuId = this.pythonToICU(msgid);
icuStr = this.pythonToICU(msgstr);
}
- if (format.match(/c-format/g) !== null) {
+ else if (format.match(/c-format/g) !== null) {
icuId = this.pythonToICU(msgid);
icuStr = this.pythonToICU(msgstr);
+ } else {
+ icuId = msgid;
+ icuStr = msgstr;
}
var icuObject = {'icuId': icuId, 'icuStr': icuStr};
|
Get string from msgstr array
since it's an array
|
diff --git a/gem-proxy/src/main/java/de/saumya/mojo/proxy/Controller.java b/gem-proxy/src/main/java/de/saumya/mojo/proxy/Controller.java
index <HASH>..<HASH> 100644
--- a/gem-proxy/src/main/java/de/saumya/mojo/proxy/Controller.java
+++ b/gem-proxy/src/main/java/de/saumya/mojo/proxy/Controller.java
@@ -187,8 +187,12 @@ public class Controller {
if(filename.endsWith(SHA1) || filename.endsWith(".pom")){
File local = new File(localStorage, filename);
if(!local.exists()){
- if (!createFiles(parts[2], parts[3])){
- return new FileLocation(filename + " is being generated", Type.TEMP_UNAVAILABLE);
+ try {
+ if (!createFiles(parts[2], parts[3])){
+ return new FileLocation(filename + " is being generated", Type.TEMP_UNAVAILABLE);
+ }
+ } catch (FileNotFoundException e) {
+ return notFound("not found");
}
}
return new FileLocation(local, filename.endsWith(SHA1)? Type.ASCII_FILE: Type.XML_FILE);
|
Return <I> instead of <I> from the gem proxy when asked for files it doesn't have
|
diff --git a/google-cloud-storage/lib/google/cloud/storage/file/verifier.rb b/google-cloud-storage/lib/google/cloud/storage/file/verifier.rb
index <HASH>..<HASH> 100644
--- a/google-cloud-storage/lib/google/cloud/storage/file/verifier.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/file/verifier.rb
@@ -50,7 +50,7 @@ module Google
end
def self.md5_for local_file
- if local_file.respond_to? :path
+ if local_file.respond_to? :to_path
::File.open Pathname(local_file).to_path, "rb" do |f|
::Digest::MD5.file(f).base64digest
end
@@ -63,7 +63,7 @@ module Google
end
def self.crc32c_for local_file
- if local_file.respond_to? :path
+ if local_file.respond_to? :to_path
::File.open Pathname(local_file).to_path, "rb" do |f|
::Digest::CRC32c.file(f).base64digest
end
|
fix(storage): Update File::Verifier to test for File#to_path
closes: #<I>
|
diff --git a/Kwf/Config.php b/Kwf/Config.php
index <HASH>..<HASH> 100644
--- a/Kwf/Config.php
+++ b/Kwf/Config.php
@@ -11,6 +11,10 @@ class Kwf_Config
$cfg = Kwf_Registry::get('config');
foreach (explode('.', $var) as $i) {
+ if (!isset($cfg->$i)) {
+ $cfg = null;
+ break;
+ }
$cfg = $cfg->$i;
}
if ($cfg) {
|
change Kwf_Config::getValueArray to not cause error if parent setting doesn't exist, like getValue does
|
diff --git a/lib/geocoder/openstreetmapgeocoder.js b/lib/geocoder/openstreetmapgeocoder.js
index <HASH>..<HASH> 100644
--- a/lib/geocoder/openstreetmapgeocoder.js
+++ b/lib/geocoder/openstreetmapgeocoder.js
@@ -53,7 +53,7 @@ OpenStreetMapGeocoder.prototype._formatResult = function(result) {
'latitude' : result.lat,
'longitude' : result.lon,
'country' : result.address.country,
- 'city' : result.address.city,
+ 'city' : result.address.city || result.address.town,
'state': result.address.state,
'zipcode' : result.address.postcode,
'streetName': result.address.road || result.address.cycleway,
|
OpenSteetMap : fix town result
In some cases, in results `city` is `town`...
Fallback it !
|
diff --git a/lib/twitter.rb b/lib/twitter.rb
index <HASH>..<HASH> 100644
--- a/lib/twitter.rb
+++ b/lib/twitter.rb
@@ -21,7 +21,7 @@ module Twitter
client.send(method, *args, &block)
end
- def self.respond_to?(method)
- client.respond_to?(method) || super
+ def self.respond_to?(method, include_private = false)
+ client.respond_to?(method, include_private) || super(method, include_private)
end
end
diff --git a/spec/twitter_spec.rb b/spec/twitter_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/twitter_spec.rb
+++ b/spec/twitter_spec.rb
@@ -26,6 +26,12 @@ describe Twitter do
end
+ describe '.respond_to?' do
+ it 'takes an optional include private argument' do
+ Twitter.respond_to?(:client, true).should be_true
+ end
+ end
+
describe ".client" do
it "should be a Twitter::Client" do
Twitter.client.should be_a Twitter::Client
|
Fix respond_to parameter list
`respond_to?` should take two arguments, first the method name and
second whether to include private methods.
<URL>
|
diff --git a/ProxyQuery/ElasticaProxyQuery.php b/ProxyQuery/ElasticaProxyQuery.php
index <HASH>..<HASH> 100644
--- a/ProxyQuery/ElasticaProxyQuery.php
+++ b/ProxyQuery/ElasticaProxyQuery.php
@@ -51,7 +51,7 @@ class ElasticaProxyQuery implements ProxyQueryInterface
) {
$this->finder = $finder;
$this->query = new \Elastica\Query();
- $this->boolQuery = new \Elastica\Query\Bool();
+ $this->boolQuery = new \Elastica\Query\BoolQuery();
}
/**
|
use BoolQuery instead of Bool
Bool is incompatible with php 7.
|
diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/ExpressionSupportSmokeTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/ExpressionSupportSmokeTestCase.java
index <HASH>..<HASH> 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/ExpressionSupportSmokeTestCase.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/ExpressionSupportSmokeTestCase.java
@@ -157,6 +157,8 @@ public class ExpressionSupportSmokeTestCase extends BuildConfigurationTestBase {
public void setUp() throws IOException {
final WildFlyManagedConfiguration config = createConfiguration("domain.xml", "host.xml", getClass().getSimpleName());
config.setAdminOnly(true);
+ config.setReadOnlyDomain(true);
+ config.setReadOnlyHost(true);
// Trigger the servers to fail on boot if there are runtime errors
String hostProps = config.getHostCommandLineProperties();
|
Use read-only configs in ExpressionSupportSmokeTestCase to save thousands of config copies
|
diff --git a/lib/duse/cli/api_command.rb b/lib/duse/cli/api_command.rb
index <HASH>..<HASH> 100644
--- a/lib/duse/cli/api_command.rb
+++ b/lib/duse/cli/api_command.rb
@@ -15,6 +15,8 @@ module Duse
rescue JSON::ParserError => e
error 'Parsing error'
end
+ rescue Duse::Client::NotLoggedIn
+ error "not logged in, run `#$0 login`"
rescue Duse::Client::Error => e
error e.message
rescue Interrupt
@@ -24,11 +26,11 @@ module Duse
private
def ensure_uri_is_set
- error 'not configured, please run "duse config"' if config.uri.nil?
+ error "client not configured, run `#$0 config`" if config.uri.nil?
end
def authenticate
- error 'not logged in, please run "duse login"' if config.token.nil?
+ fail Duse::Client::NotLoggedIn if config.token.nil?
Duse.session = Duse::Client::Session.new(
uri: config.uri,
token: config.token
|
better not logged in handling and error messages
|
diff --git a/src/EchoIt/JsonApi/Model.php b/src/EchoIt/JsonApi/Model.php
index <HASH>..<HASH> 100644
--- a/src/EchoIt/JsonApi/Model.php
+++ b/src/EchoIt/JsonApi/Model.php
@@ -37,6 +37,14 @@ class Model extends \Eloquent
protected $resourceType = null;
/**
+ * Expose the resource relations links by default when viewing a
+ * resource
+ *
+ * @var array
+ */
+ protected $exposedRelations = [];
+
+ /**
* mark this model as changed
*
* @return void
@@ -76,6 +84,12 @@ class Model extends \Eloquent
public function toArray()
{
$relations = [];
+
+ // include any relations exposed by default
+ foreach ($this->exposedRelations as $relation) {
+ $this->load($relation);
+ }
+
foreach ($this->getArrayableRelations() as $relation => $value) {
if (in_array($relation, $this->hidden)) {
continue;
|
Ability to automatically expose relations for a resource
As per specification a resource may choose to expose relations within a
links node (this happens currently when including a relation)
This PR adds an attribute to the model which enables a resource to
identify relations it wishes to expose via the links permanently (when
no include is specified).
This identifies the resource within the links node but DOES NOT include
the relation.
<URL>
|
diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.java b/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.java
index <HASH>..<HASH> 100644
--- a/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.java
+++ b/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.java
@@ -126,6 +126,10 @@ public class ScreenStackFragment extends ScreenFragment {
AppBarLayout.LayoutParams.MATCH_PARENT, AppBarLayout.LayoutParams.WRAP_CONTENT));
view.addView(mAppBarLayout);
+ if (mShadowHidden) {
+ mAppBarLayout.setTargetElevation(0);
+ }
+
if (mToolbar != null) {
mAppBarLayout.addView(recycleView(mToolbar));
}
|
fix: disable shadow if needed (#<I>)
mAppBarLayout is created on every screen change so we need to check if the shadow shouldn't be disabled. This method is needed here since the if clause in setToolbarShadowHidden will return false e.g. when going back to the previous screen.
|
diff --git a/python/ray/_private/worker.py b/python/ray/_private/worker.py
index <HASH>..<HASH> 100644
--- a/python/ray/_private/worker.py
+++ b/python/ray/_private/worker.py
@@ -597,11 +597,9 @@ class Worker:
# Make sure that the value is not an object ref.
if isinstance(value, ObjectRef):
raise TypeError(
- "Calling 'put' on an ray.ObjectRef is not allowed "
- "(similarly, returning an ray.ObjectRef from a remote "
- "function is not allowed). If you really want to "
- "do this, you can wrap the ray.ObjectRef in a list and "
- "call 'put' on it (or return it)."
+ "Calling 'put' on an ray.ObjectRef is not allowed. "
+ "If you really want to do this, you can wrap the "
+ "ray.ObjectRef in a list and call 'put' on it."
)
if self.mode == LOCAL_MODE:
|
[Cleanup] Update Put error message (#<I>)
We allow tasks to return ObjectRefs. I'm not sure when this support was added, but I think for quite a while.
|
diff --git a/dispatch/modules/content/models.py b/dispatch/modules/content/models.py
index <HASH>..<HASH> 100644
--- a/dispatch/modules/content/models.py
+++ b/dispatch/modules/content/models.py
@@ -439,6 +439,11 @@ class Column(Model, AuthorMixin):
def get_published_articles(self):
return Article.objects.filter(column=self, is_published=True)
+ def get_absolute_url(self):
+ """
+ Returns the column URL.
+ """
+ return "%s%s/" % (settings.BASE_URL, self.slug)
class Page(Publishable):
parent = ForeignKey('Page', related_name='page_parent', blank=True, null=True)
|
added get absolute url to column model
|
diff --git a/src/main/java/jcifs/smb/SmbFile.java b/src/main/java/jcifs/smb/SmbFile.java
index <HASH>..<HASH> 100644
--- a/src/main/java/jcifs/smb/SmbFile.java
+++ b/src/main/java/jcifs/smb/SmbFile.java
@@ -1440,20 +1440,6 @@ public class SmbFile extends URLConnection implements SmbResource, SmbConstants
close();
}
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#finalize()
- */
- @Override
- protected void finalize () throws Throwable {
- if ( this.treeHandle != null ) {
- log.debug("File was not properly released " + this);
- }
- }
-
-
void delete ( String fileName ) throws CIFSException {
if ( this.fileLocator.isRootOrShare() ) {
throw new SmbException("Invalid operation for workgroups, servers, or shares");
|
Remove SmbFile finalizer (#<I>)
Likely to cause GC performance issues, not very useful.
|
diff --git a/src/AdminServiceProvider.php b/src/AdminServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/AdminServiceProvider.php
+++ b/src/AdminServiceProvider.php
@@ -67,7 +67,7 @@ class AdminServiceProvider extends ServiceProvider
if ($this->app->runningInConsole()) {
$this->publishes([__DIR__.'/../config' => config_path()], 'laravel-admin-config');
$this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'laravel-admin-lang');
-// $this->publishes([__DIR__.'/../resources/views' => resource_path('views/admin')], 'laravel-admin-views');
+// $this->publishes([__DIR__.'/../resources/views' => resource_path('views/vendor/admin')], 'laravel-admin-views');
$this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')], 'laravel-admin-migrations');
$this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-admin')], 'laravel-admin-assets');
}
|
Update AdminServiceProvider.php
fix view publish path
|
diff --git a/lib/dataflow/nodes/join_node.rb b/lib/dataflow/nodes/join_node.rb
index <HASH>..<HASH> 100644
--- a/lib/dataflow/nodes/join_node.rb
+++ b/lib/dataflow/nodes/join_node.rb
@@ -35,9 +35,9 @@ module Dataflow
# merge both dependencies schemas
sch1 = dependencies.first.schema || {}
- sch1 = sch1.select { |k,v| select_keys1.include?(k) } if select_keys1.present?
+ sch1 = sch1.select { |k,v| select_keys1.include?(k.to_s) } if select_keys1.present?
sch2 = dependencies.second.schema || {}
- sch2 = sch2.select { |k,v| select_keys2.include?(k) } if select_keys2.present?
+ sch2 = sch2.select { |k,v| select_keys2.include?(k.to_s) } if select_keys2.present?
sch = sch1.merge(sch2)
sch
|
Support symbols in schema keys when merging schemas in the join node
|
diff --git a/src/p4p/nt/scalar.py b/src/p4p/nt/scalar.py
index <HASH>..<HASH> 100644
--- a/src/p4p/nt/scalar.py
+++ b/src/p4p/nt/scalar.py
@@ -67,7 +67,7 @@ class ntbool(ntwrappercommon, int):
return int.__new__(cls, bool(value))
def __repr__(self):
- return bool(self).__repr__()
+ return bool(self).__repr__().lower()
class ntstr(ntwrappercommon, unicode):
|
lower() bool
Avoid ambiguity with True/False singletons
|
diff --git a/grimoire/elk/git.py b/grimoire/elk/git.py
index <HASH>..<HASH> 100644
--- a/grimoire/elk/git.py
+++ b/grimoire/elk/git.py
@@ -140,7 +140,7 @@ class GitEnrich(Enrich):
def get_rich_commit(self, commit):
eitem = {}
# Fields that are the same in item and eitem
- copy_fields = ["message","Author","metadata__updated_on","ocean-unique-id"]
+ copy_fields = ["message","Author","metadata__updated_on","ocean-unique-id","metadata__origin"]
for f in copy_fields:
if f in commit:
eitem[f] = commit[f]
|
[Enrich Git] Add metadata__origin to enriched items for update filtering.
|
diff --git a/src/Application.php b/src/Application.php
index <HASH>..<HASH> 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -282,6 +282,10 @@ class Application extends Container
return $this->loadComponent('auth', 'Illuminate\Auth\AuthServiceProvider', 'auth.driver');
});
+ $this->singleton('Illuminate\Auth\AuthManager', function () {
+ return $this->loadComponent('auth', 'Illuminate\Auth\AuthServiceProvider', 'auth');
+ });
+
$this->singleton('Illuminate\Contracts\Auth\Access\Gate', function () {
return $this->loadComponent('auth', 'Illuminate\Auth\AuthServiceProvider', 'Illuminate\Contracts\Auth\Access\Gate');
});
|
Fix AuthManager resolving
|
diff --git a/lib/request.js b/lib/request.js
index <HASH>..<HASH> 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -23,7 +23,9 @@ module.exports = {
}
const rejectErrors = async res => {
- const body = await res.json()
+ let body = await res.text()
+ // When Wikibase crash it doesn't return JSON errors anymore
+ if (body[0] === '{') body = JSON.parse(body)
let { status: statusCode } = res
if (statusCode >= 400) {
throw newError(statusCode, body)
@@ -37,7 +39,11 @@ const rejectErrors = async res => {
}
const newError = (statusCode, body, statusMessage) => {
- statusMessage = statusMessage || body.message || statusCode
+ if (typeof body === 'string') {
+ statusMessage = body
+ } else {
+ statusMessage = statusMessage || body.message || statusCode
+ }
const err = new Error(statusMessage)
err.statusMessage = statusMessage
err.status = err.statusCode = statusCode
|
request: handle case where the body isn't json
|
diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
index <HASH>..<HASH> 100644
--- a/alot/commands/envelope.py
+++ b/alot/commands/envelope.py
@@ -196,7 +196,10 @@ class EditCommand(Command):
# remove to be edited lines from envelope
del self.envelope[key]
+
for value in vlist:
+ # remove newlines in values
+ value = value.replace('\n', ' ')
headertext += '%s: %s\n' % (key, value)
bodytext = self.envelope.body
|
don't write newlines to templates
issue #<I>
|
diff --git a/regdeferred.rb b/regdeferred.rb
index <HASH>..<HASH> 100755
--- a/regdeferred.rb
+++ b/regdeferred.rb
@@ -89,7 +89,7 @@ module Reg
include BlankSlate
restore :inspect,:extend
restore :respond_to?
- restore :respond_to?
+# restore :respond_to?
include Formula
attr_reader :operation, :args, :target, :block
|
no need to restore :respond_to? twice, is there?
|
diff --git a/lib/devise.rb b/lib/devise.rb
index <HASH>..<HASH> 100644
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -18,7 +18,6 @@ module Devise
module Encryptors
autoload :Base, 'devise/encryptors/base'
- autoload :Bcrypt, 'devise/encryptors/bcrypt'
autoload :AuthlogicSha512, 'devise/encryptors/authlogic_sha512'
autoload :ClearanceSha1, 'devise/encryptors/clearance_sha1'
autoload :RestfulAuthenticationSha1, 'devise/encryptors/restful_authentication_sha1'
|
Remove autoload for Bcrypt encryptor, it does not exist anymore
|
diff --git a/vendor/broccoli-fontawesome-pack.js b/vendor/broccoli-fontawesome-pack.js
index <HASH>..<HASH> 100644
--- a/vendor/broccoli-fontawesome-pack.js
+++ b/vendor/broccoli-fontawesome-pack.js
@@ -3,7 +3,7 @@
var Plugin = require('broccoli-plugin')
var path = require('path')
var fs = require('fs')
-var { camelCase } = require('camel-case')
+var { camelCase, camelCaseTransformMerge } = require('camel-case')
var { config } = require('@fortawesome/fontawesome-svg-core');
class FontAwesomePack extends Plugin {
@@ -54,7 +54,7 @@ class FontAwesomePack extends Plugin {
iconName = `${prefix}-${iconName}`;
}
- return camelCase(iconName);
+ return camelCase(iconName, { transform: camelCaseTransformMerge });
});
}
|
remove prefixing behaviour before numbers.
|
diff --git a/src/Intahwebz/ViewModel.php b/src/Intahwebz/ViewModel.php
index <HASH>..<HASH> 100644
--- a/src/Intahwebz/ViewModel.php
+++ b/src/Intahwebz/ViewModel.php
@@ -20,7 +20,7 @@ interface ViewModel {
function setTemplate($templateFile);
-
+ function getTemplate();
/**
* @param $message
diff --git a/src/Intahwebz/ViewModel/BasicViewModel.php b/src/Intahwebz/ViewModel/BasicViewModel.php
index <HASH>..<HASH> 100644
--- a/src/Intahwebz/ViewModel/BasicViewModel.php
+++ b/src/Intahwebz/ViewModel/BasicViewModel.php
@@ -12,6 +12,8 @@ class BasicViewModel implements ViewModel {
*/
private $boundFunctions = array();
+ protected $template;
+
/**
* @var array Stores the variables available in the ViewModel
*/
@@ -78,11 +80,16 @@ class BasicViewModel implements ViewModel {
throw new ViewModelException("No method [$functionName]");
}
- //Todo - this should not be in here
+
function setTemplate($templateFile) {
- // TODO: Implement setTemplate() method.
+ $this->template = $templateFile;
}
+ function getTemplate() {
+ return $this->template;
+ }
+
+
/**
* @param $message
* @return mixed
|
Added template to ViewModel because YOLO.
|
diff --git a/packages/teraslice/lib/cluster/services/api.js b/packages/teraslice/lib/cluster/services/api.js
index <HASH>..<HASH> 100644
--- a/packages/teraslice/lib/cluster/services/api.js
+++ b/packages/teraslice/lib/cluster/services/api.js
@@ -114,6 +114,8 @@ module.exports = function apiService(context, { assetsUrl, app }) {
if (req.query.active === 'true') {
query = 'job_id:* AND !active:false';
+ } else if (req.query.active === 'false') {
+ query = 'job_id:* AND active:false';
} else {
query = 'job_id:*';
}
@@ -367,6 +369,8 @@ module.exports = function apiService(context, { assetsUrl, app }) {
if (req.query.active === 'true') {
query = 'job_id:* AND !active:false';
+ } else if (req.query.active === 'false') {
+ query = 'job_id:* AND active:false';
} else {
query = 'job_id:*';
}
|
handle active:false on txt and json job endpoints
|
diff --git a/raus_test.go b/raus_test.go
index <HASH>..<HASH> 100644
--- a/raus_test.go
+++ b/raus_test.go
@@ -51,20 +51,24 @@ var parseTestSet = []parseTest{
},
}
+func testWithLocalRedis(run func() int) int {
+ conf := redistest.Config{"port": "26379", "save": ""}
+ s, err := redistest.NewServer(true, conf)
+ if err != nil {
+ panic(err)
+ }
+ defer s.Stop()
+ return run()
+}
+
func TestMain(m *testing.M) {
- var s *redistest.Server
+ var code int
if path, err := exec.LookPath("redis-server"); err == nil {
log.Printf("testing with local %s", path)
- conf := make(redistest.Config)
- conf["port"] = "26379"
- conf["save"] = ""
- s, err = redistest.NewServer(true, conf)
- if err != nil {
- panic(err)
- }
+ code = testWithLocalRedis(m.Run)
+ } else {
+ code = m.Run()
}
- code := m.Run()
- s.Stop()
os.Exit(code)
}
|
refactor test with local/remote redis.
|
diff --git a/squad/ci/backend/lava.py b/squad/ci/backend/lava.py
index <HASH>..<HASH> 100644
--- a/squad/ci/backend/lava.py
+++ b/squad/ci/backend/lava.py
@@ -226,7 +226,7 @@ class Backend(BaseBackend):
else:
for result in data['results']:
if result['suite'] != 'lava':
- suite = result['suite'].split("_", 1)[1]
+ suite = result['suite'].split("_", 1)[-1]
res_name = "%s/%s" % (suite, result['name'])
# YAML from LAVA has all values serialized to strings
if result['measurement'] == 'None':
|
ci/lava: fix parsing of test suite names
This fixes the case where result['suite'] does not contain any _
characters, so result['suite'].split('_', 1) has a single element. For
the case where there is at least one underscore,
result['suite'].split('_', 1) will always have just 2 elements. In both
cases, indexing with -1 will return the last element.
|
diff --git a/Tone/core/Transport.js b/Tone/core/Transport.js
index <HASH>..<HASH> 100644
--- a/Tone/core/Transport.js
+++ b/Tone/core/Transport.js
@@ -606,15 +606,17 @@ function(Tone){
return this._clock.ticks;
},
set : function(t){
- var now = this.now();
- //stop everything synced to the transport
- if (this.state === Tone.State.Started){
- this.emit("stop", now);
- this._clock.ticks = t;
- //restart it with the new time
- this.emit("start", now, this.seconds);
- } else {
- this._clock.ticks = t;
+ if (this._clock.ticks !== t){
+ var now = this.now();
+ //stop everything synced to the transport
+ if (this.state === Tone.State.Started){
+ this.emit("stop", now);
+ this._clock.ticks = t;
+ //restart it with the new time
+ this.emit("start", now, this.seconds);
+ } else {
+ this._clock.ticks = t;
+ }
}
}
});
|
only set the clock ticks when the value has changed
optimization
|
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -80,6 +80,7 @@ module ActiveRecord
disconnect!
connect
end
+ alias :reset! :reconnect!
# Disconnects from the database if already connected.
# Otherwise, this method does nothing.
@@ -90,11 +91,6 @@ module ActiveRecord
end
end
- def reset!
- disconnect!
- connect
- end
-
# DATABASE STATEMENTS ======================================
def explain(arel, binds = [])
|
Alias reconnect! to reset! for Mysql2 adapter since they have same
behavior.
|
diff --git a/src/extensions/default/StaticServer/main.js b/src/extensions/default/StaticServer/main.js
index <HASH>..<HASH> 100644
--- a/src/extensions/default/StaticServer/main.js
+++ b/src/extensions/default/StaticServer/main.js
@@ -62,9 +62,13 @@ define(function (require, exports, module) {
* request -- Passes {location: {hostname: string, port: number, root: string, pathname: string}, send: function({body: string}) }
* Listeners define paths to intercept requests for by supplying those
* paths to setRequestFilterPaths([path1,...,pathN]).
+ *
* When requests for those paths are received on the server, StaticServerProvider
* creates a "request" event with a send() callback that allows the listener to
* override the default static file server response.
+ *
+ * Listeners to this event should be installed before any HTTP
+ * requests are sent to the server.
*/
function StaticServerProvider() {}
|
update comment to clarify when request listeners should be installed
|
diff --git a/modules/es/models/es.SurfaceModel.js b/modules/es/models/es.SurfaceModel.js
index <HASH>..<HASH> 100644
--- a/modules/es/models/es.SurfaceModel.js
+++ b/modules/es/models/es.SurfaceModel.js
@@ -28,6 +28,9 @@ es.SurfaceModel = function( doc ) {
es.SurfaceModel.prototype.purgeHistory = function() {
this.selection = null;
+ this.smallStack = [];
+ this.bigStack = [];
+ this.undoIndex = 0;
};
/**
@@ -87,7 +90,7 @@ es.SurfaceModel.prototype.select = function( selection, isManual ) {
* (such as when replacing - delete, then insert)
*/
es.SurfaceModel.prototype.transact = function( transaction ) {
- this.bigStack = this.bigStack.slice( 0, this.bigStack.length - this.undoIndex + 1 );
+ this.bigStack = this.bigStack.slice( 0, this.bigStack.length - this.undoIndex );
this.undoIndex = 0;
this.smallStack.push( transaction );
this.doc.commit( transaction );
|
Make purgeHistory method work in SurfaceModel with new data structure
|
diff --git a/Database/ObjectCollection.php b/Database/ObjectCollection.php
index <HASH>..<HASH> 100644
--- a/Database/ObjectCollection.php
+++ b/Database/ObjectCollection.php
@@ -265,11 +265,11 @@ abstract class ObjectCollection extends DynamicCollection implements IDynamicCol
*/
protected function rebuildQueryForCustomLoad($query)
{
- if ($this->where !== null) {
- if ($this->getFieldsAndTypes() === false) {
- return false;
- }
+ if ($this->getFieldsAndTypes() === false) {
+ return false;
+ }
+ if ($this->where !== null) {
$where = $this->where;
if (count($where) !== 1) {
return false;
|
fix not loaded Model properties through many-to-many
|
diff --git a/Services/Yadis/XRDS.php b/Services/Yadis/XRDS.php
index <HASH>..<HASH> 100644
--- a/Services/Yadis/XRDS.php
+++ b/Services/Yadis/XRDS.php
@@ -30,6 +30,10 @@ define('SERVICES_YADIS_MATCH_ALL', 101);
*/
define('SERVICES_YADIS_MATCH_ANY', 102);
+/**
+ * The priority value used for service elements with no priority
+ * specified.
+ */
define('SERVICES_YADIS_MAX_PRIORITY', pow(2, 30));
function Services_Yadis_getNSMap()
|
[project @ Max priority docstring]
|
diff --git a/rxjava-core/src/test/java/rx/schedulers/ExecutorSchedulerTest.java b/rxjava-core/src/test/java/rx/schedulers/ExecutorSchedulerTest.java
index <HASH>..<HASH> 100644
--- a/rxjava-core/src/test/java/rx/schedulers/ExecutorSchedulerTest.java
+++ b/rxjava-core/src/test/java/rx/schedulers/ExecutorSchedulerTest.java
@@ -18,13 +18,16 @@ package rx.schedulers;
import rx.Scheduler;
import rx.internal.util.RxThreadFactory;
+import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
public class ExecutorSchedulerTest extends AbstractSchedulerConcurrencyTests {
+ final static Executor executor = Executors.newFixedThreadPool(2, new RxThreadFactory("TestCustomPool-"));
+
@Override
protected Scheduler getScheduler() {
- return Schedulers.from(Executors.newFixedThreadPool(2, new RxThreadFactory("TestCustomPool-")));
+ return Schedulers.from(executor);
}
}
|
Use single Executor for all tests
... so it doesn't leak for every test.
|
diff --git a/openquake/db/models.py b/openquake/db/models.py
index <HASH>..<HASH> 100644
--- a/openquake/db/models.py
+++ b/openquake/db/models.py
@@ -325,6 +325,24 @@ class ComplexFault(models.Model):
db_table = 'hzrdi\".\"complex_fault'
+
+class FaultEdge(models.Model):
+ '''
+ Fault edge
+ '''
+ id = models.IntegerField(primary_key=True)
+ owner = models.ForeignKey('OqUser')
+ gid = models.TextField()
+ name = models.TextField(null=True)
+ description = models.TextField(null=True)
+ last_update = models.DateTimeField(editable=False, default=datetime.utcnow)
+ top = models.LineStringField(srid=4326)
+ bottom = models.LineStringField(srid=4326)
+
+ class Meta:
+ db_table = 'hzrdi\".\"fault_edge'
+
+
class RDepthDistr(models.Model):
'''
Rupture Depth Distribution
|
added missing model
Former-commit-id: aadb9d3dfb6b<I>dd6e9b<I>b9ff<I>fdb<I>d
|
diff --git a/Tests/Resource/FileReplicatorTest.php b/Tests/Resource/FileReplicatorTest.php
index <HASH>..<HASH> 100644
--- a/Tests/Resource/FileReplicatorTest.php
+++ b/Tests/Resource/FileReplicatorTest.php
@@ -25,8 +25,8 @@ class FileReplicatorTest extends \PHPUnit_Framework_TestCase
{
$directory = $this->generateDirectory();
$replicator = new FileReplicator('http://example.com/', $directory);
- $replicator->replicate(new GenericResource('test'));
- $file = $directory.'/test';
+ $replicator->replicate(new GenericResource('test/nested'));
+ $file = $directory.'/test/nested';
$this->assertTrue(file_exists($file));
$this->assertGreaterThan(0, filesize($file));
}
@@ -51,7 +51,7 @@ class FileReplicatorTest extends \PHPUnit_Framework_TestCase
*/
public function testReplicateBadDirectory()
{
- $replicator = new FileReplicator('http://example.com/', '/probably/a/bad/directory');
+ $replicator = new FileReplicator('http://example.com/', '/@%%:;5#_+');
$replicator->replicate(new GenericResource('test'));
}
|
Test for nested directory and invalid directory names (to avoid permissive file system for testing).
|
diff --git a/Entity/MediaManager.php b/Entity/MediaManager.php
index <HASH>..<HASH> 100644
--- a/Entity/MediaManager.php
+++ b/Entity/MediaManager.php
@@ -37,7 +37,7 @@ class MediaManager extends BaseEntityManager implements MediaManagerInterface
$media->setProviderName(func_get_arg(2));
}
- if ($andFlush && is_bool($andFlush)) {
+ if (is_bool($andFlush)) {
parent::save($media, $andFlush);
} else {
// BC compatibility with previous signature
|
Flush whatever of the $andFlush value
Take $andFlush into account when it is boolean
If $andFlush is false, save() will be called with true, so $andFlush
will not
be taken into account at all.
|
diff --git a/src/nami.js b/src/nami.js
index <HASH>..<HASH> 100644
--- a/src/nami.js
+++ b/src/nami.js
@@ -186,6 +186,8 @@ Nami.prototype.onWelcomeMessage = function (data) {
* @returns void
*/
Nami.prototype.close = function () {
+ var self = this;
+ this.send(new action.Logoff(), function () { self.logger.info('Logged out'); });
this.logger.info('Closing connection');
this.removeAllListeners();
this.socket.removeAllListeners();
|
now sends logoff action when closing connection
|
diff --git a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/command/OServerCommandAbstract.java b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/command/OServerCommandAbstract.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/command/OServerCommandAbstract.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/command/OServerCommandAbstract.java
@@ -87,9 +87,6 @@ public abstract class OServerCommandAbstract implements OServerCommand {
writeLine(iRequest, null);
- if (!empty)
- writeContent(iRequest, content);
-
if (binaryContent != null)
iRequest.channel.outStream.write(binaryContent);
iRequest.channel.flush();
|
Fix by Luca Molino to close issue <I>
|
diff --git a/pdb.py b/pdb.py
index <HASH>..<HASH> 100644
--- a/pdb.py
+++ b/pdb.py
@@ -453,6 +453,12 @@ Frames can marked as hidden in the following ways:
do_l = do_list
+ def do_continue(self, arg):
+ if arg != '':
+ self.do_tbreak(arg)
+ return pdb.Pdb.do_continue(self, '')
+ do_c = do_cont = do_continue
+
def do_pp(self, arg):
width, height = self.get_terminal_size()
try:
diff --git a/testing/test_pdb.py b/testing/test_pdb.py
index <HASH>..<HASH> 100644
--- a/testing/test_pdb.py
+++ b/testing/test_pdb.py
@@ -999,3 +999,24 @@ def test_unicode_bug():
# c
""")
+
+def test_continue_arg():
+ def fn():
+ set_trace()
+ x = 1
+ y = 2
+ z = 3
+ return x+y+z
+ _, lineno = inspect.getsourcelines(fn)
+ line_z = lineno+4
+
+ check(fn, """
+> .*fn()
+-> x = 1
+# c %d
+Breakpoint 1 at .*/test_pdb.py:%d
+Deleted breakpoint 1
+> .*fn()
+-> z = 3
+# c
+""" % (line_z, line_z))
|
a new feature: now you can type 'continue n' to continue the execution until line n'
|
diff --git a/AdminModule/presenters/CloningPresenter.php b/AdminModule/presenters/CloningPresenter.php
index <HASH>..<HASH> 100755
--- a/AdminModule/presenters/CloningPresenter.php
+++ b/AdminModule/presenters/CloningPresenter.php
@@ -92,7 +92,7 @@ class CloningPresenter extends BasePresenter
}
foreach ($pages as $page) {
- $this->pageCreateBoxes($page);
+ $this->pageCreateBoxes($page, $transformTable);
}
// clone all data
@@ -147,14 +147,14 @@ class CloningPresenter extends BasePresenter
*
* @return [type] [description]
*/
- private function pageCreateBoxes($page)
+ private function pageCreateBoxes($page, $transformTable)
{
$boxes = $this->em->getRepository('WebCMS\Entity\Box')->findBy(array(
'pageTo' => $page,
));
foreach ($boxes as $box) {
- $newBox = $this->createNewBox($box);
+ $newBox = $this->createNewBox($box, $transformTable);
$this->em->persist($newBox);
}
}
@@ -222,7 +222,7 @@ class CloningPresenter extends BasePresenter
* @param [type] $box [description]
* @return [type] [description]
*/
- private function createNewBox($box)
+ private function createNewBox($box, $transformTable)
{
$newBox = new \WebCMS\Entity\Box();
$newBox->setBox($box->getBox());
|
Bugfix - cloning of boxes
|
diff --git a/hug/interface.py b/hug/interface.py
index <HASH>..<HASH> 100644
--- a/hug/interface.py
+++ b/hug/interface.py
@@ -178,6 +178,8 @@ class Interface(object):
usage = self.interface.spec.__doc__
if usage:
doc['usage'] = usage
+ if getattr(self, 'requires', None):
+ doc['requires'] = [getattr(requirement, '__doc__', requirement.__name__) for requirement in self.requires]
doc['outputs'] = OrderedDict()
doc['outputs']['format'] = self.outputs.__doc__
doc['outputs']['content_type'] = self.outputs.content_type
|
Add support for showing requriments in documentation
|
diff --git a/setup_utils.py b/setup_utils.py
index <HASH>..<HASH> 100755
--- a/setup_utils.py
+++ b/setup_utils.py
@@ -121,6 +121,7 @@ class changelog(Command):
for line in lines:
print(line, file=f)
+
CMDCLASS['changelog'] = changelog
SETUP_REQUIRES.append(('changelog', ['GitPython']))
@@ -155,6 +156,7 @@ class bdist_spec(bdist_rpm):
# execute distutils version of bdist_rpm.run to avoid calling egg_info
distutils_bdist_rpm.run(self)
+
CMDCLASS['bdist_spec'] = bdist_spec
orig_egg_info = CMDCLASS.pop('egg_info', _egg_info)
@@ -177,6 +179,7 @@ class egg_info(orig_egg_info):
orig_egg_info.run(self)
+
CMDCLASS['egg_info'] = egg_info
@@ -210,6 +213,7 @@ class clean(CMDCLASS.pop('clean', _clean)):
os.unlink(portfile)
clean.run(self)
+
CMDCLASS['clean'] = clean
@@ -272,6 +276,7 @@ class port(Command):
out = subprocess.check_output(['openssl', 'rmd160', filename])
return out.splitlines()[0].rsplit(' ', 1)[-1]
+
CMDCLASS['port'] = port
SETUP_REQUIRES.append(('port', ['jinja2']))
|
setup_utils.py: fixed pep8 issues [ci skip]
|
diff --git a/src/main/java/org/eluder/jersey/mustache/MustacheViewProcessor.java b/src/main/java/org/eluder/jersey/mustache/MustacheViewProcessor.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/eluder/jersey/mustache/MustacheViewProcessor.java
+++ b/src/main/java/org/eluder/jersey/mustache/MustacheViewProcessor.java
@@ -122,7 +122,7 @@ public class MustacheViewProcessor implements ViewProcessor<Mustache> {
// render the actual template
OutputStreamWriter writer = new OutputStreamWriter(out);
- t.execute(writer, getScope(viewable)).flush();
+ t.execute(writer, getScope(viewable)).close();
}
/**
|
Writer must be closed to correctly flush asynchronous data to response. Closing underlying stream is not enough.
|
diff --git a/src/components/checkbox/checkbox.js b/src/components/checkbox/checkbox.js
index <HASH>..<HASH> 100644
--- a/src/components/checkbox/checkbox.js
+++ b/src/components/checkbox/checkbox.js
@@ -111,7 +111,8 @@ function MdCheckboxDirective(inputDirective, $mdAria, $mdConstant, $mdTheming, $
attr.$set('aria-labelledby', labelId);
var label = element.children()[1];
- label.remove();
+ // Use jQLite here since ChildNode.remove() is not supported in IE11.
+ angular.element(label).remove();
label.removeAttribute('ng-transclude');
label.className = 'md-checkbox-link-label';
label.setAttribute('id', labelId);
|
fix(checkbox): labels with links throw exception in IE<I>
|
diff --git a/angr/procedures/posix/accept.py b/angr/procedures/posix/accept.py
index <HASH>..<HASH> 100644
--- a/angr/procedures/posix/accept.py
+++ b/angr/procedures/posix/accept.py
@@ -18,7 +18,8 @@ class accept(angr.SimProcedure):
if sockfd in self.state.posix.fd:
simsockfd = self.state.posix.fd[sockfd]
for potential_ident in self.state.posix.sockets:
- if self.state.posix.sockets[potential_ident] is simsockfd:
+ if self.state.posix.sockets[potential_ident][0] is simsockfd.read_storage and \
+ self.state.posix.sockets[potential_ident][1] is simsockfd.write_storage:
ident = potential_ident
break
|
Fix `accept` finds ident in a wrong way.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -18,5 +18,5 @@ setup(name = "amqplib",
author = "Barry Pederson",
author_email = "bp@barryp.org",
url = "http://barryp.org/software/py-amqplib/",
- packages = ['amqplib']
+ packages = ['amqplib', 'amqplib.client_0_8']
)
|
Need to add another item to setup.py for this to actually build and install.
|
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -302,6 +302,7 @@ class FrameworkExtension extends Extension
$this->addClassesToCompile(array(
'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy',
$container->getDefinition('session')->getClass(),
|
Added NativeFileSessionHandler to classes to compile .
|
diff --git a/juicer/juicer/Juicer.py b/juicer/juicer/Juicer.py
index <HASH>..<HASH> 100644
--- a/juicer/juicer/Juicer.py
+++ b/juicer/juicer/Juicer.py
@@ -404,7 +404,9 @@ class Juicer(object):
'type_ids': ['rpm'],
'filters': {
'unit': {
- 'filename': rpm
+ 'filename': {
+ "$regex": rpm
+ }
}
}
}
|
Deleting with a regex seems to work better.
|
diff --git a/test/interop_sanity_test.js b/test/interop_sanity_test.js
index <HASH>..<HASH> 100644
--- a/test/interop_sanity_test.js
+++ b/test/interop_sanity_test.js
@@ -48,6 +48,9 @@ describe('Interop tests', function() {
port = 'localhost:' + server_obj.port;
done();
});
+ after(function() {
+ server.shutdown();
+ });
// This depends on not using a binary stream
it('should pass empty_unary', function(done) {
interop_client.runTest(port, name_override, 'empty_unary', true, done);
|
Added missing server shutdown to interop test runner
|
diff --git a/migrate.go b/migrate.go
index <HASH>..<HASH> 100644
--- a/migrate.go
+++ b/migrate.go
@@ -261,7 +261,7 @@ func ParseMigration(id string, r io.ReadSeeker) (*Migration, error) {
parsed, err := sqlparse.ParseMigration(r)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("Error parsing migration (%s): %s", id, err)
}
m.Up = parsed.UpStatements
|
Make it more clear which migration causes a parse error
|
diff --git a/opal/clearwater/application.rb b/opal/clearwater/application.rb
index <HASH>..<HASH> 100644
--- a/opal/clearwater/application.rb
+++ b/opal/clearwater/application.rb
@@ -98,7 +98,7 @@ module Clearwater
raise TypeError, "Cannot render to a non-existent element. Make sure the document ready event has been triggered before invoking the application."
end
- rendered = benchmark('Generated virtual DOM') { component.render }
+ rendered = benchmark('Generated virtual DOM') { Component.sanitize_content(component.render) }
benchmark('Rendered to actual DOM') { virtual_dom.render rendered }
@will_render = false
run_callbacks
|
Sanitize root component
Previously, if the root component delegated directly to another
component, this caused a problem because that delegate component's
render method was never invoked. Sanitizing it handles that.
|
diff --git a/generator/classes/propel/engine/platform/PlatformMssqlImpl.php b/generator/classes/propel/engine/platform/PlatformMssqlImpl.php
index <HASH>..<HASH> 100644
--- a/generator/classes/propel/engine/platform/PlatformMssqlImpl.php
+++ b/generator/classes/propel/engine/platform/PlatformMssqlImpl.php
@@ -79,5 +79,13 @@ class PlatformMssqlImpl extends PlatformDefaultImpl {
{
return true;
}
+
+ /**
+ * @see Platform::hasSize(String)
+ */
+ public function hasSize($sqlType)
+ {
+ return !("INT" == $sqlType || "TEXT" == $sqlType);
+ }
}
|
Added a better (though certainly not conclusive) hasSize() method for the MSSQL platform class.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ Welcome
setup(
name='synonyms',
- version='1.9',
+ version='2.0',
description='Chinese Synonyms for Natural Language Processing and Understanding',
long_description=LONGDOC,
author='Hai Liang Wang, Hu Ying Xi',
diff --git a/synonyms/__init__.py b/synonyms/__init__.py
index <HASH>..<HASH> 100755
--- a/synonyms/__init__.py
+++ b/synonyms/__init__.py
@@ -219,8 +219,8 @@ def _similarity_distance(s1, s2):
# https://docs.scipy.org/doc/numpy-1.13.0/reference/generated/numpy.linalg.norm.html
g = 1 / (np.linalg.norm(a - b) + 1)
u = _levenshtein_distance(s1, s2)
- r = g * 1.8 + u * 0.4
- r = min((r * 18), 1.0)
+ r = g * 5 + u * 0.8
+ r = min(r, 1.0)
return float("%.3f" % r)
|
Refine distance params, upgrade to v2
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -167,8 +167,8 @@ module.exports = function(grunt) {
browsers: [
{browserName: 'chrome'},
{browserName: 'firefox', platform: 'Linux'},
- {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
- {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
+ // {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
+ // {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
{browserName: 'internet explorer', version: 11, platform: 'Windows 8.1'},
{browserName: 'internet explorer', version: 10, platform: 'Windows 8'}
]
|
test: remove safari from saucelabs
|
diff --git a/test/test_requests.rb b/test/test_requests.rb
index <HASH>..<HASH> 100644
--- a/test/test_requests.rb
+++ b/test/test_requests.rb
@@ -100,12 +100,10 @@ describe "when handling requests" do
end
it "should return status 404 for 'directory' without index.html" do
- skip
@request.get("/dir-without-index").status.must_equal 404
end
it "should return status 404 for 'directory/' without index.html" do
- skip
@request.get("/dir-without-index/").status.must_equal 404
end
end
|
Unskip test cases that are now passing
The path is now normalized before testing for a file, not after.
|
diff --git a/hypervisor/network.go b/hypervisor/network.go
index <HASH>..<HASH> 100644
--- a/hypervisor/network.go
+++ b/hypervisor/network.go
@@ -70,13 +70,13 @@ func (nc *NetworkContext) freeSlot(slot int) {
if inf, ok := nc.eth[slot]; !ok {
nc.sandbox.Log(WARNING, "Freeing an unoccupied eth slot %d", slot)
return
- } else {
+ } else if inf != nil {
if _, ok := nc.idMap[inf.Id]; ok {
delete(nc.idMap, inf.Id)
}
- nc.sandbox.Log(DEBUG, "Free slot %d of eth", slot)
- delete(nc.eth, slot)
}
+ nc.sandbox.Log(DEBUG, "Free slot %d of eth", slot)
+ delete(nc.eth, slot)
}
func (nc *NetworkContext) addInterface(inf *api.InterfaceDescription, result chan api.Result) {
|
fix panic in freeSlot
inf may be nil if configureInterface failed
|
diff --git a/test/ost_test.rb b/test/ost_test.rb
index <HASH>..<HASH> 100644
--- a/test/ost_test.rb
+++ b/test/ost_test.rb
@@ -58,7 +58,7 @@ scope do
Thread.new do
sleep 2
- enqueue(1)
+ redis.lpush(Ost[:events].key, 1)
end
ost do |item|
|
Use a different connection in threaded test.
|
diff --git a/sos/jupyter/sos_step.py b/sos/jupyter/sos_step.py
index <HASH>..<HASH> 100755
--- a/sos/jupyter/sos_step.py
+++ b/sos/jupyter/sos_step.py
@@ -35,7 +35,7 @@ class Interactive_Step_Executor(SP_Step_Executor):
Base_Step_Executor.__init__(self, step)
def pending_tasks(self, tasks):
- host = Host(start_task_engine=True)
+ host = Host()
for task in tasks:
host.submit_task(task)
while True:
|
Fix jupyter for the removal of option start_task_engine
|
diff --git a/test/lib/rules/disallow-objectcontroller.js b/test/lib/rules/disallow-objectcontroller.js
index <HASH>..<HASH> 100644
--- a/test/lib/rules/disallow-objectcontroller.js
+++ b/test/lib/rules/disallow-objectcontroller.js
@@ -37,6 +37,11 @@ describe('lib/rules/disallow-objectcontroller', function () {
var foo = Ember.ObjectController;
}
}, {
+ it: 'should not report',
+ code: function() {
+ Ember.ObjectController.foo();
+ }
+ }, {
it: 'should report deprecated use',
errors: 1,
code: function() {
|
add test for calls to objectcontroller that aren't real
|
diff --git a/addon/components/power-select-multiple/trigger.js b/addon/components/power-select-multiple/trigger.js
index <HASH>..<HASH> 100644
--- a/addon/components/power-select-multiple/trigger.js
+++ b/addon/components/power-select-multiple/trigger.js
@@ -5,7 +5,7 @@ import updateInput from '../../utils/update-input-value';
const { computed, get, isBlank, run } = Ember;
const { htmlSafe } = Ember.String;
-const ua = window.navigator.userAgent;
+const ua = self.window ? self.window.navigator.userAgent : '';
const isIE = ua.indexOf('MSIE ') > -1 || ua.indexOf('Trident/') > -1;
export default Ember.Component.extend({
tagName: '',
|
Protect for the ausence of window in fastboot mode
|
diff --git a/keyboard/mouse.py b/keyboard/mouse.py
index <HASH>..<HASH> 100644
--- a/keyboard/mouse.py
+++ b/keyboard/mouse.py
@@ -157,7 +157,7 @@ def unhook_all():
Removes all hooks registered by this application. Note this may include
hooks installed by high level functions, such as `record`.
"""
- _listener.handlers.clear()
+ del _listener.handlers[:]
def record(button=RIGHT, target_types=(DOWN,)):
"""
|
Remove python3-only method in mouse too
|
diff --git a/lib/dimples/version.rb b/lib/dimples/version.rb
index <HASH>..<HASH> 100644
--- a/lib/dimples/version.rb
+++ b/lib/dimples/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module Dimples
- VERSION = '6.5.4'
+ VERSION = '6.6.0'
end
|
Bump dimples to <I>
|
diff --git a/src/main/java/io/github/bonigarcia/wdm/Downloader.java b/src/main/java/io/github/bonigarcia/wdm/Downloader.java
index <HASH>..<HASH> 100644
--- a/src/main/java/io/github/bonigarcia/wdm/Downloader.java
+++ b/src/main/java/io/github/bonigarcia/wdm/Downloader.java
@@ -236,8 +236,11 @@ public class Downloader {
compressedFile.delete();
file = browserManager.postDownload(compressedFile);
- log.trace("Resulting binary file {}", file.getAbsoluteFile());
- return file.getAbsoluteFile();
+ File result = file.getAbsoluteFile();
+ result.setExecutable(true);
+ log.trace("Resulting binary file {}", result);
+
+ return result;
}
public static File unGzip(File archive) throws IOException {
|
Force to be executable resulting binary after extracting
|
diff --git a/internal/service/macie2/classification_job.go b/internal/service/macie2/classification_job.go
index <HASH>..<HASH> 100644
--- a/internal/service/macie2/classification_job.go
+++ b/internal/service/macie2/classification_job.go
@@ -551,12 +551,18 @@ func resourceClassificationJobCustomizeDiff(_ context.Context, diff *schema.Reso
if diff.Id() != "" {
for _, key := range diff.GetChangedKeysPrefix("s3_job_definition.0.scoping.0.excludes") {
if strings.Contains(key, "tag_scope_term") && strings.Contains(key, "target") {
- diff.Clear(key)
+ err := diff.Clear(key)
+ if err != nil {
+ return err
+ }
}
}
for _, key := range diff.GetChangedKeysPrefix("s3_job_definition.0.scoping.0.includes") {
if strings.Contains(key, "tag_scope_term") && strings.Contains(key, "target") {
- diff.Clear(key)
+ err := diff.Clear(key)
+ if err != nil {
+ return err
+ }
}
}
}
|
#<I> check return value for diff
|
diff --git a/server/sonar-web/src/main/js/apps/component-measures/details/history/MeasureHistory.js b/server/sonar-web/src/main/js/apps/component-measures/details/history/MeasureHistory.js
index <HASH>..<HASH> 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/details/history/MeasureHistory.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/details/history/MeasureHistory.js
@@ -90,6 +90,10 @@ export default class MeasureHistory extends React.Component {
}
fetchEvents () {
+ if (this.props.component.qualifier !== 'TRK') {
+ return Promise.resolve([]);
+ }
+
return getProjectActivity(this.props.component.key, { category: 'VERSION' }).then(({ analyses }) => {
const events = analyses.map(analysis => {
const version = analysis.events.find(event => event.category === 'VERSION');
|
do not request activity for views on the measure history page
|
diff --git a/src/watch.js b/src/watch.js
index <HASH>..<HASH> 100644
--- a/src/watch.js
+++ b/src/watch.js
@@ -50,10 +50,9 @@ export default function(files, command, options = {}) {
Config.WATCHING = true; // Enable plumber
Gulp.watch(files, function watcher(event) {
- if (!event) {
- console.error('Unexpected event object in watch', event, new Error().stack);
+ if (event) {
+ changed.push(event);
}
- changed.push(event);
if (running) {
rerun = true;
|
Avoid inserting null change on tast rerun.
|
diff --git a/tests/test_request_construction.py b/tests/test_request_construction.py
index <HASH>..<HASH> 100644
--- a/tests/test_request_construction.py
+++ b/tests/test_request_construction.py
@@ -148,6 +148,9 @@ class TestExtraParameters:
self.expect_no_error(1)
self.expect_no_error(a=1)
+ self.expect_no_error(None, 1, 2)
+ self.expect_no_error(b1=2, b2=3)
+ self.expect_no_error(None, b1=2, b2=3)
self.expect_no_error(1, b1=None, b2=None)
def test_multiple_consecutive_choice_parameters(self):
|
update the 'sequence inside a choice' extra parameter test
In case the subsequence contains multiple elements, specifying non-None values
for more than one of those elements should not be interpreted as a 'multiple
values defined for a single choice group' error.
|
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
@@ -89,11 +89,14 @@ class NioWorker implements Runnable {
boolean firstChannel = started.compareAndSet(false, true);
Selector selector;
if (firstChannel) {
+ selectorGuard.writeLock().lock();
try {
this.selector = selector = Selector.open();
} catch (IOException e) {
throw new ChannelException(
"Failed to create a selector.", e);
+ } finally {
+ selectorGuard.writeLock().unlock();
}
} else {
selector = this.selector;
|
Potential fix for NPE during SocketChannel.register(..)
|
diff --git a/bin/methods/generateAction.js b/bin/methods/generateAction.js
index <HASH>..<HASH> 100755
--- a/bin/methods/generateAction.js
+++ b/bin/methods/generateAction.js
@@ -18,6 +18,7 @@ exports['generateAction'] = function(binary, next){
templateLines.push(' outputExample: {},');
templateLines.push(' matchExtensionMimeType: false,');
templateLines.push(' version: 1.0,');
+ templateLines.push(' toDocument: true,');
templateLines.push(' run: function(api, connection, next){');
templateLines.push(' // your logic here');
templateLines.push(' next(connection, true);');
|
note that actions can be hidden from documentation
|
diff --git a/lib/dhis2/api/organisation_unit.rb b/lib/dhis2/api/organisation_unit.rb
index <HASH>..<HASH> 100644
--- a/lib/dhis2/api/organisation_unit.rb
+++ b/lib/dhis2/api/organisation_unit.rb
@@ -45,7 +45,13 @@ module Dhis2
short_name: orgunit[:short_name],
opening_date: orgunit[:opening_date]
}
- organisation_unit[:parent] = {id: orgunit[:parent_id]} if orgunit[:parent_id]
+ organisation_unit[:parent] = {id: orgunit[:parent_id]} if orgunit[:parent_id]
+
+ organisation_unit[:contact_person] = {contact_person: orgunit[:contact_person]} if orgunit[:contact_person]
+ organisation_unit[:phone_number] = {phone_number: orgunit[:phone_number]} if orgunit[:phone_number]
+ organisation_unit[:email] = {email: orgunit[:email]} if orgunit[:email]
+ organisation_unit[:address] = {address: orgunit[:address]} if orgunit[:address]
+
organisation_unit
end
}
|
Adding the missing org unit fields
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -73,7 +73,7 @@ fn = function (req, res, next) {
};
if (Churchill.options.reqLogger && loggers.length === 1 && req.logger === undefined) {
- req.logger = loggers[0];
+ req.logger = loggers[0][0];
}
next();
|
Bugfix not using logger at that point
|
diff --git a/src/org/jgroups/protocols/pbcast/GMS.java b/src/org/jgroups/protocols/pbcast/GMS.java
index <HASH>..<HASH> 100644
--- a/src/org/jgroups/protocols/pbcast/GMS.java
+++ b/src/org/jgroups/protocols/pbcast/GMS.java
@@ -1,4 +1,4 @@
-// $Id: GMS.java,v 1.14 2004/08/19 09:24:11 belaban Exp $
+// $Id: GMS.java,v 1.15 2004/08/31 16:29:25 belaban Exp $
package org.jgroups.protocols.pbcast;
@@ -367,7 +367,9 @@ public class GMS extends Protocol {
passUp(view_event);
coord=determineCoordinator();
- if(coord != null && coord.equals(local_addr) && !(coord.equals(vid.getCoordAddress()))) {
+ // if(coord != null && coord.equals(local_addr) && !(coord.equals(vid.getCoordAddress()))) {
+ // changed on suggestion by yaronr
+ if(coord != null && coord.equals(local_addr)) {
becomeCoordinator();
}
else {
|
correct handling of new coord determination after merge
|
diff --git a/monoseq/monoseq.py b/monoseq/monoseq.py
index <HASH>..<HASH> 100644
--- a/monoseq/monoseq.py
+++ b/monoseq/monoseq.py
@@ -43,7 +43,7 @@ AnsiFormat = Format([('\033[91m', '\033[0m'), # Red.
#: HTML output format.
HtmlFormat = Format([('<span class="monoseq-annotation-%i">' % i, '</span>')
- for i in range(5)],
+ for i in range(10)],
('<span class="monoseq-margin">', '</span>'))
|
Support <I> annotation levels in HtmlFormat
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.