diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/merb-core/lib/merb-core/version.rb b/merb-core/lib/merb-core/version.rb
index <HASH>..<HASH> 100644
--- a/merb-core/lib/merb-core/version.rb
+++ b/merb-core/lib/merb-core/version.rb
@@ -1,3 +1,3 @@
module Merb
- VERSION = '1.0' unless defined?(Merb::VERSION)
+ VERSION = '1.0.1' unless defined?(Merb::VERSION)
end
|
Bumps <I>.x version
|
diff --git a/lib/NavigationComponent.js b/lib/NavigationComponent.js
index <HASH>..<HASH> 100644
--- a/lib/NavigationComponent.js
+++ b/lib/NavigationComponent.js
@@ -58,6 +58,7 @@ class NavigationComponent extends PureComponent<void, NCProps, void> {
backgroundColor: bnOptions.backgroundColor,
shifting: bnOptions.shifting
}
+ const previousScene = navigationState.routes[navigationState.index]
return (
<BottomNavigation
@@ -80,7 +81,7 @@ class NavigationComponent extends PureComponent<void, NCProps, void> {
focused,
tintColor: focused ? activeTintColor : inactiveTintColor
}
- const onPress = navigationGetOnPress(scene)
+ const onPress = navigationGetOnPress(previousScene, scene)
const label = getLabel(scene)
const icon = renderIcon(scene)
|
Fix For React Navigation Beta <I>+ (#<I>)
|
diff --git a/pyqode/core/managers/file.py b/pyqode/core/managers/file.py
index <HASH>..<HASH> 100644
--- a/pyqode/core/managers/file.py
+++ b/pyqode/core/managers/file.py
@@ -375,6 +375,13 @@ class FileManager(Manager):
encoding = self._encoding
self.saving = True
self.editor.text_saving.emit(str(path))
+
+ # get file persmission on linux
+ try:
+ st_mode = os.stat(path).st_mode
+ except (ImportError, TypeError, AttributeError):
+ st_mode = None
+
# perform a safe save: we first save to a temporary file, if the save
# succeeded we just rename the temporary file to the final file name
# and remove it.
@@ -412,6 +419,12 @@ class FileManager(Manager):
_logger().debug('file saved: %s', path)
self._check_for_readonly()
+ # restore file permission
+ try:
+ os.chmod(path, st_mode)
+ except (ImportError, TypeError, AttributeError):
+ pass
+
def close(self, clear=True):
"""
Close the file open in the editor:
|
Fix file permission lost on save on posix
|
diff --git a/test/unit/services/calendarHelper.spec.js b/test/unit/services/calendarHelper.spec.js
index <HASH>..<HASH> 100644
--- a/test/unit/services/calendarHelper.spec.js
+++ b/test/unit/services/calendarHelper.spec.js
@@ -445,8 +445,8 @@ describe('calendarHelper', function() {
});
it('should only contain events for that week', function() {
- expect(weekView.eventRows[0].row[0].event).to.eql(events[0]);
- expect(weekView.eventRows[1].row[0].event).to.eql(events[1]);
+ expect(weekView.eventRows[0].row[0].event).to.eql(events[1]);
+ expect(weekView.eventRows[1].row[0].event).to.eql(events[0]);
});
describe('setting the correct span and offset', function() {
|
test(weekView): fix failing test that legitimately got fixed
|
diff --git a/test/fixtures/various_assertion_methods/expected.js b/test/fixtures/various_assertion_methods/expected.js
index <HASH>..<HASH> 100644
--- a/test/fixtures/various_assertion_methods/expected.js
+++ b/test/fixtures/various_assertion_methods/expected.js
@@ -1,4 +1,4 @@
'use strict';
-function add(a, b) {
+async function add(a, b) {
return a + b;
}
diff --git a/test/fixtures/various_assertion_methods/fixture.js b/test/fixtures/various_assertion_methods/fixture.js
index <HASH>..<HASH> 100644
--- a/test/fixtures/various_assertion_methods/fixture.js
+++ b/test/fixtures/various_assertion_methods/fixture.js
@@ -2,7 +2,7 @@
const assert = require('node:assert');
-function add (a, b) {
+async function add (a, b) {
console.assert(typeof a === 'number');
assert(!isNaN(a));
@@ -54,5 +54,9 @@ function add (a, b) {
assert.ifError(a);
assert.fail(a, b, 'assertion message', '==');
+
+ await assert.rejects(prms);
+ await assert.doesNotReject(prms2);
+
return a + b;
}
|
test: add test for AwaitExpression
|
diff --git a/suite/suite.go b/suite/suite.go
index <HASH>..<HASH> 100644
--- a/suite/suite.go
+++ b/suite/suite.go
@@ -17,21 +17,29 @@ import (
var allTestsFilter = func(_, _ string) (bool, error) { return true, nil }
var matchMethod = flag.String("testify.m", "", "regular expression to select tests of the testify suite to run")
+type TestingT interface {
+ Run(name string, f func(t *testing.T)) bool
+ Helper()
+
+ Errorf(format string, args ...interface{})
+ FailNow()
+}
+
// Suite is a basic testing suite with methods for storing and
// retrieving the current *testing.T context.
type Suite struct {
*assert.Assertions
require *require.Assertions
- t *testing.T
+ t TestingT
}
// T retrieves the current *testing.T context.
-func (suite *Suite) T() *testing.T {
+func (suite *Suite) T() TestingT {
return suite.t
}
// SetT sets the current *testing.T context.
-func (suite *Suite) SetT(t *testing.T) {
+func (suite *Suite) SetT(t TestingT) {
suite.t = t
suite.Assertions = assert.New(t)
suite.require = require.New(t)
|
changed dependency to interface, s.t. consumers can easily mock the testing.T type
|
diff --git a/lib/commands/submit.js b/lib/commands/submit.js
index <HASH>..<HASH> 100644
--- a/lib/commands/submit.js
+++ b/lib/commands/submit.js
@@ -76,7 +76,7 @@ cmd.handler = function(argv) {
let ratio = 0.0;
for (let score of scores) {
- if (parseFloat(score[0]) > myRuntime)
+ if (parseFloat(score[0]) >= myRuntime)
ratio += parseFloat(score[1]);
}
|
Update submit.js
fixed bug for "[WARN] Failed to get submission beat ratio."
|
diff --git a/salmonella/static/salmonella.js b/salmonella/static/salmonella.js
index <HASH>..<HASH> 100644
--- a/salmonella/static/salmonella.js
+++ b/salmonella/static/salmonella.js
@@ -1,13 +1,17 @@
function popup_wrapper(triggerLink, app_name, model_name){
- var name = triggerLink.id.replace(/^lookup_/, '');
- name = id_to_windowname(name);
+ var name = triggerLink.id.replace(/^lookup_/, ''),
+ windowName = id_to_windowname(name);
// Actual Django javascript function
showRelatedObjectLookupPopup(triggerLink);
// Sets focus on input field so event is
// fired correctly.
- document.getElementById(name).focus();
+ try {
+ document.getElementById(windowName).focus();
+ } catch (e) {
+ document.getElementById(name).focus();
+ }
return false;
}
|
added a quick solution to fix inline items
|
diff --git a/services/personality_insights/v3.js b/services/personality_insights/v3.js
index <HASH>..<HASH> 100644
--- a/services/personality_insights/v3.js
+++ b/services/personality_insights/v3.js
@@ -119,7 +119,7 @@ module.exports = function (RED) {
personality_insights = new PersonalityInsightsV3({
username: username,
password: password,
- version_date: '2016-10-20'
+ version_date: '2016-12-15'
});
node.status({fill:'blue', shape:'dot', text:'requesting'});
|
API version update to Personality Insights
|
diff --git a/src/opbeat.js b/src/opbeat.js
index <HASH>..<HASH> 100644
--- a/src/opbeat.js
+++ b/src/opbeat.js
@@ -42,16 +42,19 @@ Opbeat.prototype.config = function (properties) {
Opbeat.prototype.install = function () {
if (!this.isPlatformSupport()) {
+ logger.log('opbeat.install.platform.unsupported')
return this
}
config.init()
if (!config.isValid()) {
+ logger.log('opbeat.install.config.invalid')
return this
}
if (this.isInstalled) {
+ logger.log('opbeat.install.already.installed')
return this
}
|
Add logging if stuff goes wrong in install method
|
diff --git a/master/buildbot/buildslave/openstack.py b/master/buildbot/buildslave/openstack.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/buildslave/openstack.py
+++ b/master/buildbot/buildslave/openstack.py
@@ -99,7 +99,7 @@ class OpenStackLatentBuildSlave(AbstractLatentBuildSlave):
duration = 0
interval = self._poll_resolution
inst = instance
- while inst.status == BUILD:
+ while inst.status.startswith(BUILD):
time.sleep(interval)
duration += interval
if duration % 60 == 0:
|
fix build status incompatibility with hpcloud
|
diff --git a/source/core/oxmailvalidator.php b/source/core/oxmailvalidator.php
index <HASH>..<HASH> 100644
--- a/source/core/oxmailvalidator.php
+++ b/source/core/oxmailvalidator.php
@@ -71,11 +71,8 @@ class oxMailValidator
*/
public function isValidEmail( $sEmail )
{
- $blValid = true;
- if ( $sEmail != 'admin' ) {
- $sEmailRule = $this->getMailValidationRule();
- $blValid = ( getStr()->preg_match( $sEmailRule, $sEmail ) != 0 );
- }
+ $sEmailRule = $this->getMailValidationRule();
+ $blValid = ( getStr()->preg_match( $sEmailRule, $sEmail ) != 0 );
return $blValid;
}
|
no need to check for demo data in email validation
|
diff --git a/src/pyiso/pyiso.py b/src/pyiso/pyiso.py
index <HASH>..<HASH> 100644
--- a/src/pyiso/pyiso.py
+++ b/src/pyiso/pyiso.py
@@ -2859,13 +2859,14 @@ class PyIso(object):
continue
matches_boot_catalog = self.eltorito_boot_catalog is not None and self.eltorito_boot_catalog.dirrecord == child
+ is_symlink = child.rock_ridge is not None and child.rock_ridge.is_symlink()
if child.is_dir():
# If the child is a directory, and is not dot or dotdot, we
# want to descend into it to look at the children.
if not child.is_dot() and not child.is_dotdot():
dirs.append(child)
outfp.write(pad(outfp.tell(), self.pvd.logical_block_size()))
- elif child.data_length > 0 and child.target is None and not matches_boot_catalog:
+ elif child.data_length > 0 and child.target is None and not matches_boot_catalog and not is_symlink:
# If the child is a file, then we need to write the
# data to the output file.
progress.call(self._output_directory_record(outfp, blocksize, child))
|
Make sure not to try to write symlinks out.
They might have random extents, but they have no data,
so just ignore them while writing.
|
diff --git a/core/container/src/main/java/org/wildfly/swarm/SwarmInfo.java b/core/container/src/main/java/org/wildfly/swarm/SwarmInfo.java
index <HASH>..<HASH> 100644
--- a/core/container/src/main/java/org/wildfly/swarm/SwarmInfo.java
+++ b/core/container/src/main/java/org/wildfly/swarm/SwarmInfo.java
@@ -34,7 +34,7 @@ public class SwarmInfo {
public static final String GROUP_ID;
public static boolean isProduct() {
- return VERSION.contains("-redhat-");
+ return VERSION.contains("redhat-");
}
private SwarmInfo() {
|
Update check for product version (#<I>)
In altering how product version is defined, need to remove leading hyphen as it becomes a dot
|
diff --git a/tests/test_secretsmanager/test_secretsmanager.py b/tests/test_secretsmanager/test_secretsmanager.py
index <HASH>..<HASH> 100644
--- a/tests/test_secretsmanager/test_secretsmanager.py
+++ b/tests/test_secretsmanager/test_secretsmanager.py
@@ -26,13 +26,13 @@ def test_get_secret_that_does_not_exist():
result = conn.get_secret_value(SecretId='i-dont-exist')
@mock_secretsmanager
-def test_get_secret_with_mismatched_id():
+def test_get_secret_that_does_not_match():
conn = boto3.client('secretsmanager', region_name='us-west-2')
create_secret = conn.create_secret(Name='java-util-test-password',
SecretString="foosecret")
with assert_raises(ClientError):
- result = conn.get_secret_value(SecretId='i-dont-exist')
+ result = conn.get_secret_value(SecretId='i-dont-match')
@mock_secretsmanager
def test_create_secret():
|
Opportunistic update to unit test for consistency.
|
diff --git a/src/IMAP/Message.php b/src/IMAP/Message.php
index <HASH>..<HASH> 100644
--- a/src/IMAP/Message.php
+++ b/src/IMAP/Message.php
@@ -488,7 +488,11 @@ class Message {
foreach ($part->parameters as $parameter) {
if($parameter->attribute == "charset") {
$encoding = $parameter->value;
- $parameter->value = preg_replace('/Content-Transfer-Encoding/', '', $encoding);
+
+ $encoding = preg_replace('/Content-Transfer-Encoding/', '', $encoding);
+ $encoding = preg_replace('/iso-8859-8-i/', 'iso-8859-8', $encoding);
+
+ $parameter->value = $encoding;
}
}
}
|
removed -i from iso-<I>-8-i in Message::parseBody (#<I>)
|
diff --git a/framework/web/widgets/captcha/CCaptcha.php b/framework/web/widgets/captcha/CCaptcha.php
index <HASH>..<HASH> 100644
--- a/framework/web/widgets/captcha/CCaptcha.php
+++ b/framework/web/widgets/captcha/CCaptcha.php
@@ -27,6 +27,9 @@
* A {@link CCaptchaValidator} may be used to validate that the user enters
* a verification code matching the code displayed in the CAPTCHA image.
*
+ * When combining CCaptcha with CActiveForm or CForm, make sure ajaxValidation is disabled. Performing ajax validation causes
+ * your Captcha to be refreshed, rendering the code invalid on the next validation attempt.
+ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @package system.web.widgets.captcha
* @since 1.0
|
Add documentation explaining you cannot use ajaxValidation with CCaptcha
|
diff --git a/cmd/pk/get.go b/cmd/pk/get.go
index <HASH>..<HASH> 100644
--- a/cmd/pk/get.go
+++ b/cmd/pk/get.go
@@ -36,16 +36,16 @@ func init() {
}
func (c *getCmd) Describe() string {
- return "Create and upload blobs to a server."
+ return "Fetches blobs, files, and directories."
}
func (c *getCmd) Usage() {
- panic("pk put Usage should never get called, as we should always end up calling either pk's or pk-put's usage")
+ panic("pk get Usage should never get called, as we should always end up calling either pk's or pk-get's usage")
}
func (c *getCmd) RunCommand(args []string) error {
// RunCommand is only implemented to satisfy the CommandRunner interface.
- panic("pk put RunCommand should never get called, as pk is supposed to invoke pk-put instead.")
+ panic("pk get RunCommand should never get called, as pk is supposed to invoke pk-get instead.")
}
// LookPath returns the full path to the executable that "pk get" actually
|
pk: fix get Describe that was copied from put
Change-Id: I4e<I>f2a1b<I>bdae4a<I>da<I>dc<I>cfc8dcb<I>
|
diff --git a/tests/test_apev2.py b/tests/test_apev2.py
index <HASH>..<HASH> 100644
--- a/tests/test_apev2.py
+++ b/tests/test_apev2.py
@@ -111,6 +111,10 @@ class APEReader(TestCase):
def test_invalid(self):
self.failUnlessRaises(IOError, mutagen.apev2.APEv2, "dne")
+ def test_no_tag(self):
+ self.failUnlessRaises(IOError, mutagen.apev2.APEv2,
+ os.path.join("tests", "data", "empty.mp3"))
+
def test_cases(self):
self.failUnlessEqual(self.tag["artist"], self.tag["ARTIST"])
self.failUnless("artist" in self.tag)
@@ -335,6 +339,10 @@ class TAPEv2(TestCase):
def test_bad_value_type(self):
from mutagen.apev2 import APEValue
self.failUnlessRaises(ValueError, APEValue, "foo", 99)
+
+ def test_module_delete_empty(self):
+ from mutagen.apev2 import delete
+ delete(os.path.join("tests", "data", "emptyfile.mp3"))
add(TAPEv2)
|
test_apev2: Test APE-less loading, deleting.
|
diff --git a/telethon/errors/__init__.py b/telethon/errors/__init__.py
index <HASH>..<HASH> 100644
--- a/telethon/errors/__init__.py
+++ b/telethon/errors/__init__.py
@@ -24,7 +24,8 @@ def rpc_message_to_error(rpc_error, request):
:return: the RPCError as a Python exception that represents this error.
"""
# Try to get the error by direct look-up, otherwise regex
- cls = rpc_errors_dict.get(rpc_error.error_message, None)
+ # Case-insensitive, for things like "timeout" which don't conform.
+ cls = rpc_errors_dict.get(rpc_error.error_message.upper(), None)
if cls:
return cls(request=request)
|
Change error mapping to be case insensitive
|
diff --git a/esper.py b/esper.py
index <HASH>..<HASH> 100644
--- a/esper.py
+++ b/esper.py
@@ -13,8 +13,7 @@ class Processor:
appropriate world methods there, such as
`for ent, (rend, vel) in self.world.get_components(Renderable, Velocity):`
"""
- def __init__(self):
- self.world = None
+ world = None
def process(self, *args):
raise NotImplementedError
|
Removed unnecessary __init__ in Processor base class.
|
diff --git a/pyvisa/resources/resource.py b/pyvisa/resources/resource.py
index <HASH>..<HASH> 100644
--- a/pyvisa/resources/resource.py
+++ b/pyvisa/resources/resource.py
@@ -334,7 +334,7 @@ class Resource(object):
event_type, context, ret = self.visalib.wait_on_event(self.session, in_event_type, timeout)
except errors.VisaIOError as exc:
if capture_timeout and exc.error_code == constants.StatusCode.error_timeout:
- return WaitResponse(0, None, exc.error_code, self.visalib, timed_out=True)
+ return WaitResponse(in_event_type, None, exc.error_code, self.visalib, timed_out=True)
raise
return WaitResponse(event_type, context, ret, self.visalib)
|
wait_on_event: create WaitResponse object with correct event_type
If wait_on_event is called with capture_timeout=True and a timeout occurs we try to create a WaitResponse object with 0 as the event type. This will fail, as 0 is not part of the Enum. Create the object with the input event type instead.
|
diff --git a/js/bitforex.js b/js/bitforex.js
index <HASH>..<HASH> 100644
--- a/js/bitforex.js
+++ b/js/bitforex.js
@@ -220,6 +220,9 @@ module.exports = class bitforex extends Exchange {
},
},
},
+ 'commonCurrencies': {
+ 'UOS': 'UOS Network',
+ },
'exceptions': {
'4004': OrderNotFound,
'1013': AuthenticationError,
|
Bitforex UOS -> UOS Network
Conflict between
<URL>
|
diff --git a/server/jetstream_cluster.go b/server/jetstream_cluster.go
index <HASH>..<HASH> 100644
--- a/server/jetstream_cluster.go
+++ b/server/jetstream_cluster.go
@@ -1387,9 +1387,11 @@ func (js *jetStream) applyStreamEntries(mset *Stream, ce *CommittedEntry, isReco
panic(err.Error())
}
// Ignore if we are recovering and we have already processed.
- if isRecovering && mset.State().LastSeq > sp.LastSeq {
- // Make sure all messages from the purge are gone.
- mset.store.Compact(sp.LastSeq)
+ if isRecovering {
+ if mset.State().FirstSeq <= sp.LastSeq {
+ // Make sure all messages from the purge are gone.
+ mset.store.Compact(sp.LastSeq + 1)
+ }
continue
}
|
Change the way we decide to compact on purge op replay
|
diff --git a/src/test/java/io/vlingo/http/resource/sse/SseStreamResourceTest.java b/src/test/java/io/vlingo/http/resource/sse/SseStreamResourceTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/io/vlingo/http/resource/sse/SseStreamResourceTest.java
+++ b/src/test/java/io/vlingo/http/resource/sse/SseStreamResourceTest.java
@@ -133,5 +133,6 @@ public class SseStreamResourceTest {
Configuration.define();
context = new MockRequestResponseContext(new MockResponseSenderChannel());
client = new SseClient(context);
+ AllSseFeedActor.registerInstantiator();
}
}
|
Ensure ActorInstantiator is registered.
|
diff --git a/src/ol/handler/Drag.js b/src/ol/handler/Drag.js
index <HASH>..<HASH> 100644
--- a/src/ol/handler/Drag.js
+++ b/src/ol/handler/Drag.js
@@ -24,6 +24,7 @@ goog.require('goog.fx.Dragger');
* @param {Object} states An object for the handlers to share states.
*/
ol.handler.Drag = function(map, elt, states) {
+ goog.base(this);
/**
* @type {ol.Map}
|
drag handler constructor should call its parent
|
diff --git a/wct.conf.js b/wct.conf.js
index <HASH>..<HASH> 100644
--- a/wct.conf.js
+++ b/wct.conf.js
@@ -36,8 +36,8 @@ module.exports = {
},
{
"browserName": "firefox",
- "platform": "OS X 10.10",
- "version": "37"
+ "platform": "OS X 10.9",
+ "version": "40"
},
// {
// "browserName": "firefox",
|
attempt to workaround the usual saucelabs madness
|
diff --git a/components/TimelineEvent.js b/components/TimelineEvent.js
index <HASH>..<HASH> 100644
--- a/components/TimelineEvent.js
+++ b/components/TimelineEvent.js
@@ -24,8 +24,8 @@ class TimelineEvent extends Component {
containerStyle() {
const {style} = this.props
- const userStyle = style || {}
- return this.showAsCard() ? {...s.eventContainer, ...s.card, ...userStyle} : s.eventContainer
+ const containerStyle = {...s.eventContainer, ...style}
+ return this.showAsCard() ? {...containerStyle, ...s.card} : containerStyle
}
iconStyle() {
@@ -72,7 +72,8 @@ TimelineEvent.propTypes = {
TimelineEvent.defaultProps = {
iconStyle: {},
- contentStyle: {}
+ contentStyle: {},
+ style: {}
}
export default TimelineEvent
|
fix($browser): Style prop was not applied to TimelineEvent container when the container was not card
<URL>
|
diff --git a/impl/src/main/java/org/jboss/weld/logging/EventLogger.java b/impl/src/main/java/org/jboss/weld/logging/EventLogger.java
index <HASH>..<HASH> 100644
--- a/impl/src/main/java/org/jboss/weld/logging/EventLogger.java
+++ b/impl/src/main/java/org/jboss/weld/logging/EventLogger.java
@@ -71,7 +71,7 @@ public interface EventLogger extends WeldLogger {
@Message(id = 410, value = "Observer method {0} cannot define @WithAnnotations", format = Format.MESSAGE_FORMAT)
DefinitionException invalidWithAnnotations(Object param1);
- @LogMessage(level = Level.WARN)
+ @LogMessage(level=Level.INFO)
@Message(id = 411, value = "Observer method {0} receives events for all annotated types. Consider restricting events using @WithAnnotations or a generic type with bounds.", format = Format.MESSAGE_FORMAT)
void unrestrictedProcessAnnotatedTypes(Object param1);
@@ -81,4 +81,4 @@ public interface EventLogger extends WeldLogger {
@Message(id = 413, value = "{0} cannot be replaced by an observer method with a different bean class {1}", format = Format.MESSAGE_FORMAT)
DefinitionException beanClassMismatch(ObserverMethod<?> originalObserverMethod, ObserverMethod<?> observerMethod);
-}
\ No newline at end of file
+}
|
Lower log level for WELD-<I> warning (WARN -> INFO)
|
diff --git a/jre_emul/android/libcore/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java b/jre_emul/android/libcore/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
index <HASH>..<HASH> 100644
--- a/jre_emul/android/libcore/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
+++ b/jre_emul/android/libcore/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
@@ -16,6 +16,8 @@
package org.apache.harmony.xml.dom;
+import com.google.j2objc.annotations.Weak;
+
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -65,7 +67,7 @@ public abstract class NodeImpl implements Node {
* The containing document. This is non-null except for DocumentTypeImpl
* nodes created by the DOMImplementation.
*/
- DocumentImpl document;
+ @Weak DocumentImpl document;
NodeImpl(DocumentImpl document) {
this.document = document;
|
Fix a leak by making NodeImpl.document @Weak.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ setup(
'tornado>=4.2,<5',
# tchannel deps
- 'thriftrw>=0.4,<0.5',
+ 'thriftrw>=0.4,<0.6',
'threadloop>=1,<2',
],
extras_require={
|
compatibility with thriftrw <I>
|
diff --git a/documentjs.js b/documentjs.js
index <HASH>..<HASH> 100644
--- a/documentjs.js
+++ b/documentjs.js
@@ -358,7 +358,10 @@ steal('steal',
else { // assume its a directory
this.files(file, function(path, f){
if(/\.(js|md|markdown)$/.test(f)){
- collection.push( path )
+ collection.push( {
+ src: path,
+ text: readFile(path)
+ } )
}
})
diff --git a/tags/process.js b/tags/process.js
index <HASH>..<HASH> 100644
--- a/tags/process.js
+++ b/tags/process.js
@@ -111,7 +111,7 @@ steal('steal','../distance',function(s, distance){
// see if it starts with something that looks like a @tag
var line = lines[l],
match = line.match(matchTag);
-
+ print("--",line)
// if we have a tag
if ( match ) {
// lower case it
|
creates paths so DocumentJS('can',{}) works
|
diff --git a/ipyrad/analysis/window_extracter.py b/ipyrad/analysis/window_extracter.py
index <HASH>..<HASH> 100644
--- a/ipyrad/analysis/window_extracter.py
+++ b/ipyrad/analysis/window_extracter.py
@@ -360,10 +360,14 @@ class WindowExtracter(object):
# use provided name else auto gen a name (scaff-start-end)
if not name:
if isinstance(self._scaffold_idx, int):
- self.name = "scaf{}-{}-{}".format(
- self._scaffold_idx,
- int(self.start),
- int(self.end)
+ # Allow scaffold idxs to be int and don't force to set start/end
+ if self.end is None:
+ self.name = "scaf{}".format(self._scaffold_idx)
+ else:
+ self.name = "scaf{}-{}-{}".format(
+ self._scaffold_idx,
+ int(self.start),
+ int(self.end)
)
else:
self.name = "r{}".format(np.random.randint(0, 1e9))
|
Allow scaffold idxs to be int
|
diff --git a/pandas/io/tests/test_html.py b/pandas/io/tests/test_html.py
index <HASH>..<HASH> 100644
--- a/pandas/io/tests/test_html.py
+++ b/pandas/io/tests/test_html.py
@@ -358,12 +358,16 @@ class TestReadHtml(tm.TestCase, ReadHtmlMixin):
@network
def test_multiple_matches(self):
+ raise nose.SkipTest("pythonxy link seems to have changed")
+
url = 'http://code.google.com/p/pythonxy/wiki/StandardPlugins'
dfs = self.read_html(url, match='Python', attrs={'class': 'wikitable'})
self.assertTrue(len(dfs) > 1)
@network
def test_pythonxy_plugins_table(self):
+ raise nose.SkipTest("pythonxy link seems to have changed")
+
url = 'http://code.google.com/p/pythonxy/wiki/StandardPlugins'
dfs = self.read_html(url, match='Python', attrs={'class': 'wikitable'})
zz = [df.iloc[0, 0] for df in dfs]
|
TST: pythonxs link seems to have changed in test_html.py, skip tests
|
diff --git a/interp/module.go b/interp/module.go
index <HASH>..<HASH> 100644
--- a/interp/module.go
+++ b/interp/module.go
@@ -55,7 +55,7 @@ func (mc ModuleCtx) UnixPath(path string) string {
// Use a return error of type ExitStatus to set the exit status. A nil error has
// the same effect as ExitStatus(0). If the error is of any other type, the
// interpreter will come to a stop.
-type ExecModule = func(ctx context.Context, args []string) error
+type ExecModule func(ctx context.Context, args []string) error
func DefaultExec(ctx context.Context, args []string) error {
mc, _ := FromModuleContext(ctx)
@@ -263,7 +263,7 @@ func pathExts(env expand.Environ) []string {
// Use a return error of type *os.PathError to have the error printed to
// stderr and the exit status set to 1. If the error is of any other type, the
// interpreter will come to a stop.
-type OpenModule = func(ctx context.Context, path string, flag int, perm os.FileMode) (io.ReadWriteCloser, error)
+type OpenModule func(ctx context.Context, path string, flag int, perm os.FileMode) (io.ReadWriteCloser, error)
func DefaultOpen(ctx context.Context, path string, flag int, perm os.FileMode) (io.ReadWriteCloser, error) {
return os.OpenFile(path, flag, perm)
|
interp: don't use type aliases for functions
Type aliases are used to refer to types in other packages.
No need for them here.
|
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index <HASH>..<HASH> 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -467,6 +467,11 @@
var xTickEnd = this.options.position == "right" ? this.left + 5 : this.right;
helpers.each(this.ticks, function(label, index) {
+ // If the callback returned a null or undefined value, do not draw this line
+ if (label === undefined || label === null) {
+ return;
+ }
+
var yLineValue = this.getPixelForTick(index); // xvalues for grid lines
if (this.options.gridLines.show) {
|
Bail out, same as the x axis
|
diff --git a/lib/rest-ftp-daemon/jobs/video.rb b/lib/rest-ftp-daemon/jobs/video.rb
index <HASH>..<HASH> 100644
--- a/lib/rest-ftp-daemon/jobs/video.rb
+++ b/lib/rest-ftp-daemon/jobs/video.rb
@@ -59,7 +59,7 @@ module RestFtpDaemon
# Read info about source file
set_info INFO_SOURCE_CURRENT, source.name
begin
- movie = FFMPEG::Movie.new(source.path)
+ movie = FFMPEG::Movie.new(source.path_fs)
rescue Errno::ENOENT => exception
raise RestFtpDaemon::VideoNotFound, exception.message
rescue StandardError => exception
|
video job: use Location.filepath instead of .path
|
diff --git a/gorilla.py b/gorilla.py
index <HASH>..<HASH> 100644
--- a/gorilla.py
+++ b/gorilla.py
@@ -327,7 +327,6 @@ def patch(destination, name=None, settings=None):
data.patches.append(patch)
return wrapped
-
return decorator
@@ -380,7 +379,6 @@ def patches(destination, settings=None, traverse_bases=True,
data.patches.extend(patches)
return wrapped
-
return decorator
@@ -406,7 +404,6 @@ def destination(value):
data.override['destination'] = value
return wrapped
-
return decorator
@@ -432,7 +429,6 @@ def name(value):
data.override['name'] = value
return wrapped
-
return decorator
@@ -458,7 +454,6 @@ def settings(**kwargs):
data.override.setdefault('settings', {}).update(kwargs)
return wrapped
-
return decorator
@@ -486,7 +481,6 @@ def filter(value):
data.filter = value
return wrapped
-
return decorator
|
Make minor stylistic changes
Basically unrolling a previous commit since it doesn't validate against
PEP8.
|
diff --git a/src/adapter.js b/src/adapter.js
index <HASH>..<HASH> 100644
--- a/src/adapter.js
+++ b/src/adapter.js
@@ -20,7 +20,9 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
var runner = runnerPassedIn || window.QUnit
var totalNumberOfTest = 0
var timer = null
- var testResult = {}
+ var testResult = {
+ errors: []
+ }
var supportsTestTracking = false
var config = (tc.config && tc.config.qunit) || {}
var qunitOldTimeout = 13
@@ -98,7 +100,7 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
suite: (test.module && [test.module]) || [],
success: testResult.success,
skipped: test.skipped,
- log: testResult.errors || [],
+ log: testResult.errors,
time: new Date().getTime() - timer
}
|
fix: define array prior to array.push (#<I>)
|
diff --git a/pyemma/coordinates/tests/test_regspace.py b/pyemma/coordinates/tests/test_regspace.py
index <HASH>..<HASH> 100644
--- a/pyemma/coordinates/tests/test_regspace.py
+++ b/pyemma/coordinates/tests/test_regspace.py
@@ -14,15 +14,17 @@ import numpy as np
import pyemma.util.types as types
-def RandomDataSource(a=None, b=None, chunksize=1000, n_samples=5, dim=3):
- """
- creates random values in intervall [a,b]
- """
- data = np.random.random((n_samples, chunksize, dim))
- if a is not None and b is not None:
- data *= (b - a)
- data += a
- return DataInMemory(data)
+class RandomDataSource(DataInMemory):
+
+ def __init__(self, a=None, b=None, chunksize=1000, n_samples=5, dim=3):
+ """
+ creates random values in interval [a,b]
+ """
+ data = np.random.random((n_samples, chunksize, dim))
+ if a is not None and b is not None:
+ data *= (b - a)
+ data += a
+ super(RandomDataSource, self).__init__(data)
class TestRegSpaceClustering(unittest.TestCase):
|
[test-regspace] derive RandomDataSource from DataInMemory
|
diff --git a/example.py b/example.py
index <HASH>..<HASH> 100644
--- a/example.py
+++ b/example.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
# Copyright 2013-2014 DataStax, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#!/usr/bin/env python
-
import logging
log = logging.getLogger()
|
Move #! back to top of example.py
|
diff --git a/lib/combi/queue_service.rb b/lib/combi/queue_service.rb
index <HASH>..<HASH> 100644
--- a/lib/combi/queue_service.rb
+++ b/lib/combi/queue_service.rb
@@ -50,7 +50,6 @@ module Combi
def publish(*args, &block)
@exchange.publish *args do
- log "Sent to network drivers: #{args.inspect}"
block.call if block_given?
end
end
|
Remove very low-level log message to reduce noise
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -38,10 +38,24 @@ def build_ssdeep():
# libtoolize: Install required files for automake
returncode = subprocess.call(
- "(cd ssdeep-lib && libtoolize && automake --add-missing && autoreconf --force && sh configure && make)",
+ "(cd ssdeep-lib && libtoolize && autoreconf --force)",
shell=True
)
if returncode != 0:
+ # try harder
+ returncode = subprocess.call(
+ "(cd ssdeep-lib && automake --add-missing && autoreconf --force)",
+ shell=True
+ )
+ if returncode != 0:
+ sys.exit("Failed to reconfigure the project build.")
+
+ returncode = subprocess.call(
+ "(cd ssdeep-lib && sh configure && make)",
+ shell=True
+ )
+
+ if returncode != 0:
sys.exit("Failed while building ssdeep lib.")
|
build - try harder to build the lib
|
diff --git a/docs/src/Form/index.js b/docs/src/Form/index.js
index <HASH>..<HASH> 100644
--- a/docs/src/Form/index.js
+++ b/docs/src/Form/index.js
@@ -28,7 +28,7 @@ class FormExample extends React.Component {
{
fieldType: 'password',
name: 'Password',
- helpBlock: 'If you want to make your password strong you could use a password manager',
+ helpBlock: 'Setting helpBlock can be used to display helpful text',
required: true,
showLabel: true,
validation: function (value) {
|
Updating help text to something a little more explanatory
|
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -354,6 +354,22 @@ test("Escaping", function() {
}
});
+test("Escaping \\u2028", function() {
+ var text = "{{foo}}\u2028{{bar}}";
+ var t = Hogan.compile(text);
+ var s = t.render({foo: 'foo', bar: 'bar'});
+
+ is(s, "foo\u2028bar", "\\u2028 improperly escaped");
+});
+
+test("Escaping \\u2029", function() {
+ var text = "{{foo}}\u2029{{bar}}";
+ var t = Hogan.compile(text);
+ var s = t.render({foo: 'foo', bar: 'bar'});
+
+ is(s, "foo\u2029bar", "\\u2029 improperly escaped");
+});
+
test("Mustache Injection", function() {
var text = "{{foo}}";
var t = Hogan.compile(text);
|
Add tests for escaping \u<I> and \u<I>.
|
diff --git a/symphony/lib/toolkit/class.general.php b/symphony/lib/toolkit/class.general.php
index <HASH>..<HASH> 100755
--- a/symphony/lib/toolkit/class.general.php
+++ b/symphony/lib/toolkit/class.general.php
@@ -489,32 +489,7 @@
***/
public static function realiseDirectory($path, $mode=0755){
-
- if(!empty($path)){
-
- if(@file_exists($path) && !@is_dir($path)){
- return false;
-
- }elseif(!@is_dir($path)){
-
- preg_match_all('/([^\/]+)\/?/i', $path, $directories);
-
- $currDir = '';
-
- foreach($directories[0] as $dir){
-
- $currDir = $currDir . $dir;
-
- if(!@file_exists($currDir)){
- if(!mkdir($currDir, intval($mode, 8))){
- return false;
- }
- }
- }
- }
- }
-
- return true;
+ return @mkdir($path, intval($mode, 8), true);
}
/***
|
Removed outdated 'General::realiseDirectory()' code, replacing it with a single mkdir call utilising the 'recursive' flag available since PHP <I>
|
diff --git a/superset/datasets/dao.py b/superset/datasets/dao.py
index <HASH>..<HASH> 100644
--- a/superset/datasets/dao.py
+++ b/superset/datasets/dao.py
@@ -79,7 +79,7 @@ class DatasetDAO(BaseDAO):
database.get_table(table_name, schema=schema)
return True
except SQLAlchemyError as ex: # pragma: no cover
- logger.error("Got an error %s validating table: %s", str(ex), table_name)
+ logger.warning("Got an error %s validating table: %s", str(ex), table_name)
return False
@staticmethod
|
chore: downgrade expected exception from error to info (#<I>)
* chore: reduce number of error logs
* info -> warning
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -199,7 +199,7 @@ Root.prototype.route = function(request, response, callback) {
callback = callback || function(err, message) {
if (err) return response.error(err, message);
- response.error(404, 'cannot find ' + url + '\n');
+ response.error(404, 'cannot find ' + request.method + ' ' + url + '\n');
};
var loop = function(err) {
|
Better info about missing route (#<I>)
|
diff --git a/python/ray/_private/runtime_env.py b/python/ray/_private/runtime_env.py
index <HASH>..<HASH> 100644
--- a/python/ray/_private/runtime_env.py
+++ b/python/ray/_private/runtime_env.py
@@ -139,9 +139,9 @@ def _hash_modules(path: Path) -> bytes:
if not Path(from_file_name).is_dir():
with open(from_file_name, mode="rb") as f:
data = f.read(BUF_SIZE)
- if not data:
- break
- md5.update(data)
+ while len(data) != 0:
+ md5.update(data)
+ data = f.read(BUF_SIZE)
hash_val = _xor_bytes(hash_val, md5.digest())
return hash_val
|
[runtime_env] Continue hashing if data is none (#<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@ setup(
install_requires=[
"fonttools>=3.24.0",
"attrs>=17.3.0",
+ "lxml",
"typing ; python_version<'3.5'",
],
classifiers=[
|
setup.py: require lxml
|
diff --git a/lib/file-watcher.js b/lib/file-watcher.js
index <HASH>..<HASH> 100644
--- a/lib/file-watcher.js
+++ b/lib/file-watcher.js
@@ -9,6 +9,7 @@ module.exports = {
/**
* Handle changed files
* @param {Object} options
+ * @param {EventEmitter} emitter
* @returns {Function}
*/
getChangeCallback: function (options, emitter) {
@@ -57,8 +58,8 @@ module.exports = {
},
/**
* Function to be called when watching begins
- * @param {Function} log
* @param {Object} options
+ * @param {EventEmitter} emitter
* @returns {Function}
*/
getWatchCallback: function (options, emitter) {
@@ -82,11 +83,9 @@ module.exports = {
return new Gaze(files);
},
/**
- * @param {Function} changeFile
- * @param {Function} log
* @param {Array} files
- * @param {socket} io
* @param {Object} options
+ * @param {EventEmitter} emitter
*/
init: function (files, options, emitter) {
|
Keep jsdocs in order
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@ copyright = '2020, bcbio-nextgen contributors'
author = 'bcbio-nextgen contributors'
# The full version, including alpha/beta/rc tags
-version = release = '1.2.0'
+version = release = '1.2.4'
# -- General configuration ---------------------------------------------------
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ import subprocess
import setuptools
-VERSION = '1.2.3'
+VERSION = '1.2.4'
# add bcbio version number and git commit hash of the current revision to version.py
try:
|
Increment version for <I> release.
|
diff --git a/clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java b/clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java
index <HASH>..<HASH> 100644
--- a/clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java
+++ b/clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java
@@ -5137,13 +5137,15 @@ public class CleverTapAPI implements CleverTapAPIListener {
}
/**
- * Destroys the current session
+ * Destroys the current session and resets <i>firstSession</i> flag, if first session lasts more than 20 minutes
+ * <br><br>For an app like Music Player <li>user installs an app and plays music and then moves to background.
+ * <li>User then re-launches an App after listening music in background for more than 20 minutes, in this case
+ * since an app is not yet killed due to background music <i>app installed</i> event must not be raised by SDK
*/
private void destroySession() {
currentSessionId = 0;
setAppLaunchPushed(false);
if (isFirstSession()) {
- // SDK-415
firstSession = false;
}
getConfigLogger().verbose(getAccountId(), "Session destroyed; Session ID is now 0");
|
fix(Reinstall tracking): add comments SDK-<I>
|
diff --git a/lib/pavlov/command.rb b/lib/pavlov/command.rb
index <HASH>..<HASH> 100644
--- a/lib/pavlov/command.rb
+++ b/lib/pavlov/command.rb
@@ -1,4 +1,5 @@
require 'active_support/concern'
+require_relative 'operation'
module Pavlov
module Command
diff --git a/lib/pavlov/operation.rb b/lib/pavlov/operation.rb
index <HASH>..<HASH> 100644
--- a/lib/pavlov/operation.rb
+++ b/lib/pavlov/operation.rb
@@ -1,6 +1,7 @@
require 'active_support/concern'
require 'pavlov/validations'
require 'pavlov/helpers'
+require_relative 'access_denied'
module Pavlov
module Operation
diff --git a/lib/pavlov/query.rb b/lib/pavlov/query.rb
index <HASH>..<HASH> 100644
--- a/lib/pavlov/query.rb
+++ b/lib/pavlov/query.rb
@@ -1,4 +1,5 @@
require 'active_support/concern'
+require_relative 'operation'
module Pavlov
module Query
|
Fix for running test against commands and queries.
|
diff --git a/includes/generalSettings.php b/includes/generalSettings.php
index <HASH>..<HASH> 100644
--- a/includes/generalSettings.php
+++ b/includes/generalSettings.php
@@ -198,7 +198,7 @@ foreach($eduPages as $p)
<i title="<?php esc_attr_e("Shortcode to use in your page", "eduadmin"); ?>">[eduadmin-objectinterest]</i>
</td>
</tr>
- <tr>
+ <!--<tr>
<td><?php echo __("Event interest page", "eduadmin"); ?></td>
<td>
<select class="form-control" style="width: 300px;" name="eduadmin-interestEventPage" id="eduadmin-interestEventPage">
@@ -223,7 +223,7 @@ foreach($eduPages as $p)
<td>
<i title="<?php esc_attr_e("Shortcode to use in your page", "eduadmin"); ?>">[eduadmin-eventinterest]</i>
</td>
- </tr>
+ </tr>-->
</table>
<input type="hidden" name="eduadmin-options_have_changed" value="true" />
<p class="submit">
|
Removed event inquiries, not done yet
|
diff --git a/lib/cfer.rb b/lib/cfer.rb
index <HASH>..<HASH> 100644
--- a/lib/cfer.rb
+++ b/lib/cfer.rb
@@ -57,6 +57,7 @@ module Cfer
# @param options [Hash]
def converge!(stack_name, options = {})
config(options)
+ options[:on_failure].upcase! if options[:on_failure]
tmpl = options[:template] || "#{stack_name}.rb"
cfn = options[:aws_options] || {}
@@ -90,7 +91,7 @@ module Cfer
end
end
end
- describe! stack_name, options
+ describe! stack_name, options rescue nil # It's fine if we can't do this.
rescue Aws::CloudFormation::Errors::ValidationError => e
Cfer::LOGGER.info "CFN validation error: #{e.message}"
end
|
If describe fails at the end of converge, don't panic
|
diff --git a/cfgrib/dataset.py b/cfgrib/dataset.py
index <HASH>..<HASH> 100644
--- a/cfgrib/dataset.py
+++ b/cfgrib/dataset.py
@@ -283,7 +283,7 @@ def build_geography_coordinates(
return geo_dims, geo_shape, geo_coord_vars
-def encode_cf_first(data_var_attrs, encode_cf):
+def encode_cf_first(data_var_attrs, encode_cf=('parameter', 'time')):
coords_map = ENSEMBLE_KEYS[:]
if 'parameter' in encode_cf:
if 'GRIB_cfName' in data_var_attrs:
diff --git a/tests/test_30_dataset.py b/tests/test_30_dataset.py
index <HASH>..<HASH> 100644
--- a/tests/test_30_dataset.py
+++ b/tests/test_30_dataset.py
@@ -55,6 +55,10 @@ def test_dict_merge():
dataset.dict_merge(master, {'two': 3})
+def test_encode_cf_first():
+ assert dataset.encode_cf_first({})
+
+
def test_build_data_var_components_no_encode():
index = messages.FileStream(path=TEST_DATA).index(dataset.ALL_KEYS).subindex(paramId=130)
dims, data_var, coord_vars = dataset.build_variable_components(index=index)
|
<I>% test coverage for dataset.py.
|
diff --git a/djstripe/models/core.py b/djstripe/models/core.py
index <HASH>..<HASH> 100644
--- a/djstripe/models/core.py
+++ b/djstripe/models/core.py
@@ -2419,3 +2419,7 @@ class Refund(StripeModel):
return (
f"{self.human_readable_amount} ({enums.RefundStatus.humanize(self.status)})"
)
+
+ @property
+ def human_readable_amount(self) -> str:
+ return get_friendly_currency_amount(self.amount / 100, self.currency)
diff --git a/tests/test_refund.py b/tests/test_refund.py
index <HASH>..<HASH> 100644
--- a/tests/test_refund.py
+++ b/tests/test_refund.py
@@ -164,10 +164,7 @@ class RefundTest(AssertStripeFksMixin, TestCase):
refund = Refund.sync_from_stripe_data(fake_refund)
- self.assertEqual(
- f"{refund.human_readable_amount} ({enums.RefundStatus.humanize(fake_refund['status'])})",
- str(refund),
- )
+ self.assertEqual(str(refund), "$20.00 USD (Succeeded)")
self.assert_fks(refund, expected_blank_fks=self.default_expected_blank_fks)
|
Overrode Refund.human_readable_amount
This was done so that amount/<I> instead of amount could be passed to it.
|
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -32,7 +32,7 @@ module.exports = function (config) {
}
},
reporters: ['progress', 'karma-typescript'],
- browsers: ['Chrome', 'Firefox'],
+ browsers: ['Chrome'],
browserStack: {
username: process.env.BROWSERSTACK_USERNAME,
accessKey: process.env.BROWSERSTACK_KEY
|
Remove firefox from local testing to speed up local dev. (#<I>)
DEV
Firefox is covered on travis.
|
diff --git a/aws/resource_aws_mq_broker.go b/aws/resource_aws_mq_broker.go
index <HASH>..<HASH> 100644
--- a/aws/resource_aws_mq_broker.go
+++ b/aws/resource_aws_mq_broker.go
@@ -989,6 +989,10 @@ func flattenMQLDAPServerMetadata(apiObject *mq.LdapServerMetadataOutput) []inter
}
func expandMQLDAPServerMetadata(tfList []interface{}) *mq.LdapServerMetadataInput {
+ if len(tfList) == 0 || tfList[0] == nil {
+ return nil
+ }
+
apiObject := &mq.LdapServerMetadataInput{}
tfMap := tfList[0].(map[string]interface{})
|
r/mq_broker: Add zero check
|
diff --git a/infrastructure/infrastructure.go b/infrastructure/infrastructure.go
index <HASH>..<HASH> 100644
--- a/infrastructure/infrastructure.go
+++ b/infrastructure/infrastructure.go
@@ -92,7 +92,7 @@ func (infra *Infrastructure) createLambdaFunction(svc *lambda.Lambda, roleArn st
FunctionName: aws.String("goad"),
Handler: aws.String("index.handler"),
Role: aws.String(roleArn),
- Runtime: aws.String("nodejs"),
+ Runtime: aws.String("nodejs4.3"),
MemorySize: aws.Int64(1536),
Publish: aws.Bool(true),
Timeout: aws.Int64(300),
|
and, apparently nodejs(!<I>) was deprecated
|
diff --git a/subchannel.go b/subchannel.go
index <HASH>..<HASH> 100644
--- a/subchannel.go
+++ b/subchannel.go
@@ -26,8 +26,10 @@ import (
"golang.org/x/net/context"
)
+// SubChannelOption are used to set options for subchannels.
type SubChannelOption func(*SubChannel)
+// Isolated is a SubChannelOption that creates an isolated subchannel.
func Isolated(s *SubChannel) {
s.peers = s.topChannel.peers.newSibling()
}
@@ -88,6 +90,11 @@ func (c *SubChannel) Peers() *PeerList {
return c.peers
}
+// Isolated returns whether this subchannel is an isolated subchannel.
+func (c *SubChannel) Isolated() bool {
+ return c.topChannel.Peers() != c.peers
+}
+
// Register registers a handler on the subchannel for a service+operation pair
func (c *SubChannel) Register(h Handler, operationName string) {
c.handlers.register(h, c.ServiceName(), operationName)
|
Add Isolated to check whether a subchannel is isolated
|
diff --git a/lib/Emitter.php b/lib/Emitter.php
index <HASH>..<HASH> 100644
--- a/lib/Emitter.php
+++ b/lib/Emitter.php
@@ -30,7 +30,7 @@ final class Emitter
}
/**
- * @return \Amp\Promise
+ * @return \Amp\Iterator
*/
public function iterate(): Iterator
{
|
Fix annotation (#<I>)
|
diff --git a/src/js/modal.trigger.js b/src/js/modal.trigger.js
index <HASH>..<HASH> 100644
--- a/src/js/modal.trigger.js
+++ b/src/js/modal.trigger.js
@@ -195,6 +195,7 @@
that.waitTimeout = setTimeout(readyToShow, options.waittime);
}
+ var frame = document.getElementById(iframeName);
frame.onload = frame.onreadystatechange = function()
{
$modal.attr('ref', frame.contentWindow.location.href);
|
* fixed 'frame' ariable declaration in modal.trigger.js.
|
diff --git a/lib/openapi3_parser/nodes/request_body.rb b/lib/openapi3_parser/nodes/request_body.rb
index <HASH>..<HASH> 100644
--- a/lib/openapi3_parser/nodes/request_body.rb
+++ b/lib/openapi3_parser/nodes/request_body.rb
@@ -4,17 +4,21 @@ require "openapi3_parser/node/object"
module Openapi3Parser
module Nodes
+ # @see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#requestBodyObject
class RequestBody
include Node::Object
+ # @return [String, nil]
def description
node_data["description"]
end
+ # @return [Map] a map of String: {MediaType}[./MediaType.html] objects
def content
node_data["content"]
end
+ # @return [Boolean]
def required?
node_data["required"]
end
|
Documentation for RequestBody node
|
diff --git a/core/src/main/java/com/graphhopper/reader/osm/conditional/ConditionalTagsInspector.java b/core/src/main/java/com/graphhopper/reader/osm/conditional/ConditionalTagsInspector.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/graphhopper/reader/osm/conditional/ConditionalTagsInspector.java
+++ b/core/src/main/java/com/graphhopper/reader/osm/conditional/ConditionalTagsInspector.java
@@ -51,10 +51,13 @@ public class ConditionalTagsInspector
{
this.tagsToCheck.add(tagToCheck + ":conditional");
}
-
+
this.enabledLogs = enabledLogs;
- this.permitParser = new ConditionalParser(permittedValues, enabledLogs);
- this.restrictiveParser = new ConditionalParser(restrictiveValues, enabledLogs);
+
+ // enable for debugging purposes only as this is too much
+ boolean logUnsupportedFeatures = false;
+ this.permitParser = new ConditionalParser(permittedValues, logUnsupportedFeatures);
+ this.restrictiveParser = new ConditionalParser(restrictiveValues, logUnsupportedFeatures);
}
static Map<String, Object> createDefaultMapping( Object value )
|
less logging for #<I>
|
diff --git a/user-switching.php b/user-switching.php
index <HASH>..<HASH> 100644
--- a/user-switching.php
+++ b/user-switching.php
@@ -158,7 +158,7 @@ class user_switching {
# Switch user:
if ( switch_to_user( $old_user->ID, self::remember(), false ) ) {
- $redirect_to = self::get_redirect();
+ $redirect_to = self::get_redirect( $old_user );
if ( $redirect_to ) {
wp_safe_redirect( add_query_arg( array( 'user_switched' => 'true', 'switched_back' => 'true' ), $redirect_to ) );
|
Pass the old user object to `get_redirect()` when switching back, to enable the `login_redirect` filter. See #3.
|
diff --git a/src/Models/MetadataTrait.php b/src/Models/MetadataTrait.php
index <HASH>..<HASH> 100644
--- a/src/Models/MetadataTrait.php
+++ b/src/Models/MetadataTrait.php
@@ -45,7 +45,13 @@ trait MetadataTrait
$tableData = [];
- $foo = $connect->getDoctrineSchemaManager()->listTableColumns($table);
+ $rawFoo = $connect->getDoctrineSchemaManager()->listTableColumns($table);
+ $foo = [];
+ foreach ($rawFoo as $key => $val) {
+ // Work around glitch in Doctrine when reading from MariaDB which added ` characters to root key value
+ $key = trim($key, '`');
+ $foo[$key] = $val;
+ }
foreach ($columns as $column) {
// Doctrine schema manager returns columns with lowercased names
|
Work around glitch in MariaDB and/or Doctrine
|
diff --git a/test/fineuploader/S3Uploads.java b/test/fineuploader/S3Uploads.java
index <HASH>..<HASH> 100644
--- a/test/fineuploader/S3Uploads.java
+++ b/test/fineuploader/S3Uploads.java
@@ -93,7 +93,7 @@ public class S3Uploads extends HttpServlet
}
// If this is a request to sign a multipart upload-related request, we only need to sign the headers,
- // which are passed as the value of a "multipartHeaders" property from Fine Uploader. In this case,
+ // which are passed as the value of a "headers" property from Fine Uploader. In this case,
// we only need to return the signed value.
else
{
|
feat(signing S3 requests): use more generic terms when dealing with signatures
|
diff --git a/src/Model/BlogController.php b/src/Model/BlogController.php
index <HASH>..<HASH> 100644
--- a/src/Model/BlogController.php
+++ b/src/Model/BlogController.php
@@ -10,19 +10,19 @@ use SilverStripe\ORM\PaginatedList;
class BlogController extends PageController
{
- private static $allowed_actions = array(
+ private static $allowed_actions = [
'viewArchive',
'rss'
- );
+ ];
- private static $url_handlers = array(
+ private static $url_handlers = [
'archive//$Year!/$Month' => 'viewArchive'
- );
+ ];
public function index()
{
$this->blogPosts = $this->getBlogPosts();
- RSSFeed::linkToFeed($this->Link() . 'rss', $this->Title);
+ RSSFeed::linkToFeed($this->Link() . 'rss/', $this->Title);
return $this->render();
}
|
Add trailing slash for blog
|
diff --git a/actionHero.js b/actionHero.js
index <HASH>..<HASH> 100755
--- a/actionHero.js
+++ b/actionHero.js
@@ -93,7 +93,7 @@ actionHero.prototype.start = function(params, next){
orderedInitializers['_complete'] = function(){
if(self.api.configData.general.developmentMode == true){
- self.api.log("running in development mode", "info")
+ self.api.log("running in development mode", "notice")
}
self.api.running = true;
var starters = [];
|
add a note about running in development mode (notice)
|
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index <HASH>..<HASH> 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -187,6 +187,25 @@ func (b *Bslack) Send(msg config.Message) (string, error) {
b.sc.UpdateMessage(schannel.ID, ts[1], message)
return "", nil
}
+
+ if msg.Extra != nil {
+ // check if we have files to upload (from slack, telegram or mattermost)
+ if len(msg.Extra["file"]) > 0 {
+ var err error
+ for _, f := range msg.Extra["file"] {
+ fi := f.(config.FileInfo)
+ _, err = b.sc.UploadFile(slack.FileUploadParameters{
+ Reader: bytes.NewReader(*fi.Data),
+ Filename: fi.Name,
+ Channels: []string{schannel.ID},
+ })
+ if err != nil {
+ flog.Errorf("uploadfile %#v", err)
+ }
+ }
+ }
+ }
+
_, id, err := b.sc.PostMessage(schannel.ID, message, np)
if err != nil {
return "", err
|
Add support to upload files to slack, from bridges with private urls like slack/mattermost/telegram. (slack)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -142,8 +142,6 @@ class InstallWithConfigurations(install):
log.error("\nWARNING: Could not install SoS Kernel as %s user." % self.user)
log.info('And "sos -h" to start using Script of Scripts.')
-exec(open('pysos/_version.py').read())
-
setup(name = "sos",
version = __version__,
description = 'Script of Scripts (SoS): a lightweight workflow system for the creation of readable workflows',
|
Remove duplicated code in setup.py. We should have actually just removed the import pysos line
|
diff --git a/salt/runners/thin.py b/salt/runners/thin.py
index <HASH>..<HASH> 100644
--- a/salt/runners/thin.py
+++ b/salt/runners/thin.py
@@ -2,7 +2,7 @@
'''
The thin runner is used to manage the salt thin systems.
-Salt Thin is a transport-less version of Salt that can be used to run rouitines
+Salt Thin is a transport-less version of Salt that can be used to run routines
in a standalone way. This runner has tools which generate the standalone salt
system for easy consumption.
'''
|
[doc] typo on runners/thin.py
|
diff --git a/src/SDP/AssetRelation.php b/src/SDP/AssetRelation.php
index <HASH>..<HASH> 100644
--- a/src/SDP/AssetRelation.php
+++ b/src/SDP/AssetRelation.php
@@ -59,7 +59,7 @@ class SDP_AssetRelation extends Pluf_Model
),
'description' => array(
'type' => 'Pluf_DB_Field_Varchar',
- 'blank' => false,
+ 'blank' => true,
'size' => 250,
'editable' => true,
'readable' => true
|
Field "description" is edited to be not required
|
diff --git a/db/migrate/20141215203425_add_column_moderator_id_to_group.rb b/db/migrate/20141215203425_add_column_moderator_id_to_group.rb
index <HASH>..<HASH> 100644
--- a/db/migrate/20141215203425_add_column_moderator_id_to_group.rb
+++ b/db/migrate/20141215203425_add_column_moderator_id_to_group.rb
@@ -3,7 +3,13 @@ class AddColumnModeratorIdToGroup < ActiveRecord::Migration
add_column :groups, :moderator_id, :integer
Group.all.each do |group|
- moderator = ThinkFeelDoDashboard::Moderator.where(group_id: group.id).first
+
+ if defined?(ThinkFeelDoDashboard::Moderator)
+ moderator = ThinkFeelDoDashboard::Moderator.where(group_id: group.id).first
+ else
+ moderator = nil
+ end
+
if moderator
group.update_attributes(moderator_id: moderator.user_id)
else
|
updated migration to check to see if class exists
|
diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go
index <HASH>..<HASH> 100644
--- a/test/integration/apiserver/apiserver_test.go
+++ b/test/integration/apiserver/apiserver_test.go
@@ -246,6 +246,7 @@ func TestCacheControl(t *testing.T) {
if err != nil {
t.Fatal(err)
}
+ defer resp.Body.Close()
cc := resp.Header.Get("Cache-Control")
if !strings.Contains(cc, "private") {
t.Errorf("expected private cache-control, got %q", cc)
@@ -291,6 +292,7 @@ func TestHSTS(t *testing.T) {
if err != nil {
t.Fatal(err)
}
+ defer resp.Body.Close()
cc := resp.Header.Get("Strict-Transport-Security")
if !strings.Contains(cc, "max-age=31536000; includeSubDomains") {
t.Errorf("expected max-age=31536000; includeSubDomains, got %q", cc)
|
integration: TestCacheControl and TestHSTS close the ResponseBody
|
diff --git a/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java b/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
index <HASH>..<HASH> 100644
--- a/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
+++ b/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
@@ -18,6 +18,7 @@
*/
package org.jasig.cas.ticket;
+import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.jasig.cas.authentication.Authentication;
import org.jasig.cas.authentication.principal.Service;
@@ -153,7 +154,7 @@ public final class TicketGrantingTicketImpl extends AbstractTicket implements Ti
*/
@Override
public synchronized Map<String, Service> getServices() {
- return Collections.unmodifiableMap(this.services);
+ return ImmutableMap.copyOf(this.services);
}
/**
|
fixed immutable reference to the services map
|
diff --git a/src/treemap.js b/src/treemap.js
index <HASH>..<HASH> 100644
--- a/src/treemap.js
+++ b/src/treemap.js
@@ -10,7 +10,7 @@ var modes = {
};
function padNone(node) {
- return {x: node.x, y: node.y, dx: node.dx, dy: node.dy};
+ return node;
}
function padStandard(node, padding) {
|
Use identity function for padNone.
Since we don’t modify rect.
|
diff --git a/wffweb/src/main/java/com/webfirmframework/wffweb/css/BorderColorCssValues.java b/wffweb/src/main/java/com/webfirmframework/wffweb/css/BorderColorCssValues.java
index <HASH>..<HASH> 100644
--- a/wffweb/src/main/java/com/webfirmframework/wffweb/css/BorderColorCssValues.java
+++ b/wffweb/src/main/java/com/webfirmframework/wffweb/css/BorderColorCssValues.java
@@ -367,10 +367,8 @@ public class BorderColorCssValues extends AbstractBean<BorderColorCssValues>
16);
// Long.parseLong("FFFFFF", 16) gives 16777215L;
final long maxCssValue = 16777215L;
- if (value > maxCssValue || value < 0) {
- return false;
- }
- return true;
+
+ return !(value > maxCssValue || value < 0);
} catch (final NumberFormatException ex) {
}
|
Code improvement
Avoided unnecessary if..then..else statements when returning booleans
|
diff --git a/lib/dalli/cas/client.rb b/lib/dalli/cas/client.rb
index <HASH>..<HASH> 100644
--- a/lib/dalli/cas/client.rb
+++ b/lib/dalli/cas/client.rb
@@ -1 +1 @@
-puts "You can remove `require 'dalli/cas/client'` as this code has been rolled into the standard 'dalli/client'.
+puts "You can remove `require 'dalli/cas/client'` as this code has been rolled into the standard 'dalli/client'."
|
Fix SyntaxError: unterminated string meets end of file
This is meant to be a deprecation warning, but currently any code that loads this file will raise a SyntaxError.
|
diff --git a/test/multisig/commands/prepare_multisig_transfer_test.py b/test/multisig/commands/prepare_multisig_transfer_test.py
index <HASH>..<HASH> 100644
--- a/test/multisig/commands/prepare_multisig_transfer_test.py
+++ b/test/multisig/commands/prepare_multisig_transfer_test.py
@@ -4,6 +4,7 @@ from __future__ import absolute_import, division, print_function, \
from unittest import TestCase
+import filters as f
from filters.test import BaseFilterTestCase
from iota import Address, ProposedTransaction
from iota.adapter import MockAdapter
@@ -178,8 +179,33 @@ class PrepareMultisigTransferRequestFilterTestCase(BaseFilterTestCase):
"""
Request contains unexpected parameters.
"""
- # :todo: Implement test.
- self.skipTest('Not implemented yet.')
+ self.assertFilterErrors(
+ {
+ 'changeAddress':
+ Address(self.trytes_1),
+
+ 'multisigInput':
+ MultisigAddress(
+ digests = [self.digest_1, self.digest_2],
+ trytes = self.trytes_2,
+ ),
+
+ 'transfers':
+ [
+ ProposedTransaction(
+ address = Address(self.trytes_3),
+ value = 42,
+ ),
+ ],
+
+ # Oh come on!
+ 'foo': 'bar',
+ },
+
+ {
+ 'foo': [f.FilterMapper.CODE_EXTRA_KEY],
+ },
+ )
def test_fail_transfers_null(self):
"""
|
[#<I>] Documented handling of unexpected param.
|
diff --git a/tests/conftest.py b/tests/conftest.py
index <HASH>..<HASH> 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,9 +1,14 @@
import pytest
import os
+# Note that we have to do this *before* `pipenv.environments` gets imported,
+# which is why we're doing it here as a side effect of importing this module.
+# CI=1 is necessary as a workaround for https://github.com/pypa/pipenv/issues/4909
+os.environ['CI'] = '1'
+
def pytest_sessionstart(session):
- # CI=1 is necessary as a workaround for https://github.com/pypa/pipenv/issues/4909
- os.environ['CI'] = '1'
+ import pipenv.environments
+ assert pipenv.environments.PIPENV_IS_CI
@pytest.fixture()
|
Oops, set the `CI` environment variable even earlier.
If I do something like `pytest tests/integration/test_cli.py`, something
about the ordering of imports means that `pipenv.environments` gets
loaded *before* `pytest_sessionstart` runs, which means that
`pipenv.environments.PIPENV_IS_CI` ends up false.
|
diff --git a/libcentrifugo/handlers.go b/libcentrifugo/handlers.go
index <HASH>..<HASH> 100644
--- a/libcentrifugo/handlers.go
+++ b/libcentrifugo/handlers.go
@@ -233,6 +233,7 @@ func (conn *wsConn) Send(message []byte) error {
}
func (conn *wsConn) Close(status uint32, reason string) error {
+ conn.ws.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(int(status), reason), time.Now().Add(time.Second))
return conn.ws.Close()
}
@@ -274,8 +275,7 @@ func (app *Application) RawWebsocketHandler(w http.ResponseWriter, r *http.Reque
}
err = c.message(message)
if err != nil {
- logger.ERROR.Println(err)
- conn.Close(CloseStatus, "error handling message")
+ conn.Close(CloseStatus, err.Error())
break
}
}
|
send close frame with proper close reason to raw ws conn
|
diff --git a/builder/googlecompute/startup.go b/builder/googlecompute/startup.go
index <HASH>..<HASH> 100644
--- a/builder/googlecompute/startup.go
+++ b/builder/googlecompute/startup.go
@@ -21,7 +21,7 @@ GetMetadata () {
echo "$(curl -f -H "Metadata-Flavor: Google" ${BASEMETADATAURL}/${1} 2> /dev/null)"
}
-ZONE=$(GetMetadata zone | grep -oP "[^/]*$")
+ZONE=$(basename $(GetMetadata zone))
SetMetadata () {
gcloud compute instances add-metadata ${HOSTNAME} --metadata ${1}=${2} --zone ${ZONE}
|
Update to how zone is extracted from metadata
|
diff --git a/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java b/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java
+++ b/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java
@@ -469,7 +469,7 @@ public abstract class AbstractAjcCompiler extends AbstractAjcMojo {
}
ArtifactHandler artifactHandler = project.getArtifact().getArtifactHandler();
- if (!"java".equalsIgnoreCase(artifactHandler.getLanguage())) {
+ if (!forceAjcCompile && !"java".equalsIgnoreCase(artifactHandler.getLanguage())) {
getLog().warn("Not executing aspectJ compiler as the project is not a Java classpath-capable package");
return;
}
|
Issue #<I> - Skipping POM packaging check when forcing ACP compilation. (#<I>)
|
diff --git a/src/BoomCMS/Core/Page/Query.php b/src/BoomCMS/Core/Page/Query.php
index <HASH>..<HASH> 100644
--- a/src/BoomCMS/Core/Page/Query.php
+++ b/src/BoomCMS/Core/Page/Query.php
@@ -12,6 +12,8 @@ class Query
'tag' => 'Tag',
'template' => 'Template',
'uri' => 'uri',
+ 'relatedbytags' => 'RelatedByTags',
+ 'visibleinnavigation' => 'VisibleInNavigation',
];
/**
@@ -28,6 +30,8 @@ class Query
public function addFilters($finder, array $params)
{
foreach ($params as $param => $args) {
+ $param = strtolower($param);
+
if (isset($this->filterAliases[$param])) {
$class = 'BoomCMS\Core\Page\Finder\\' . $this->filterAliases[$param];
|
Added more options to page query aliases
|
diff --git a/javascript/linkfield.js b/javascript/linkfield.js
index <HASH>..<HASH> 100644
--- a/javascript/linkfield.js
+++ b/javascript/linkfield.js
@@ -63,7 +63,7 @@ jQuery.entwine("linkfield", function($) {
});
},
onunmatch: function () {
- $('.linkfield-dialog').remove();
+ $('.linkfield-dialog.ui-dialog-content').remove();
},
showDialog: function(url) {
var dlg = this.getDialog();
|
remove only dialog box/es have been created (don't remove .linkfield-dialog div which is not a dialog box)
|
diff --git a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
index <HASH>..<HASH> 100644
--- a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
+++ b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
@@ -331,8 +331,6 @@ public class RNPushNotificationHelper {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { // API 26 and higher
channel_id = channel_id + "-" + soundName;
-
- notification.setChannelId(channel_id);
}
}
}
@@ -383,6 +381,7 @@ public class RNPushNotificationHelper {
checkOrCreateChannel(notificationManager, channel_id, soundUri, priority, vibratePattern);
+ notification.setChannelId(channel_id);
notification.setContentIntent(pendingIntent);
JSONArray actionsArray = null;
|
Fix channel_id of notification.
|
diff --git a/js/jquery.fileupload-image.js b/js/jquery.fileupload-image.js
index <HASH>..<HASH> 100644
--- a/js/jquery.fileupload-image.js
+++ b/js/jquery.fileupload-image.js
@@ -272,7 +272,7 @@
var file = data.files[data.index],
blob = new Blob([
data.imageHead,
- // Resized images always have a head size of 20,
+ // Resized images always have a head size of 20 bytes,
// including the JPEG marker and a minimal JFIF header:
this._blobSlice.call(file, 20)
], {type: file.type});
|
Added unit to head size comment.
|
diff --git a/lib/image.js b/lib/image.js
index <HASH>..<HASH> 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -3,6 +3,7 @@ module.exports = image;
var debug = require('debug')('inliner');
function image(url) {
+ url = url.replace(/#.*$/, '');
this.emit('progress', 'get image ' + url);
return this.get(url, { encoding: 'binary' }).then(function then(res) {
if (url.indexOf('data:') === 0) {
|
fix: ignore fragment identifiers on urls
Since the cache is keyyed by URL, it makes sense to ignore the hash fragment identifier.
|
diff --git a/lib/govspeak/template_renderer.rb b/lib/govspeak/template_renderer.rb
index <HASH>..<HASH> 100644
--- a/lib/govspeak/template_renderer.rb
+++ b/lib/govspeak/template_renderer.rb
@@ -17,7 +17,7 @@ module Govspeak
def t(*args)
options = args.last.is_a?(Hash) ? args.last.dup : {}
key = args.shift
- I18n.t!(key, options.merge(locale: locale))
+ I18n.t!(key, **options.merge(locale: locale))
end
def format_with_html_line_breaks(string)
|
Use splat to pass keyword arguments into method
This fixes the following deprecation notice which appeared in the move from Ruby <I> to <I>:
```
lib/govspeak/template_renderer.rb:<I>: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call
```
|
diff --git a/socketio/server.py b/socketio/server.py
index <HASH>..<HASH> 100644
--- a/socketio/server.py
+++ b/socketio/server.py
@@ -31,7 +31,12 @@ class SocketIOServer(WSGIServer):
is set to true. The default value is 0.0.0.0:843
"""
self.sockets = {}
- self.resource = kwargs.pop('resource', 'socket.io')
+ if 'namespace' in kwargs:
+ print("DEPRECATION WARNING: use resource instead of namespace")
+ self.resource = kwargs.pop('namespace', 'socket.io')
+ else:
+ self.resource = kwargs.pop('resource', 'socket.io')
+
self.transports = kwargs.pop('transports', None)
if kwargs.pop('policy_server', True):
|
support old naming of namespace for now
|
diff --git a/grpc_stdio.go b/grpc_stdio.go
index <HASH>..<HASH> 100644
--- a/grpc_stdio.go
+++ b/grpc_stdio.go
@@ -134,6 +134,7 @@ func (c *grpcStdioClient) Run(stdout, stderr io.Writer) {
if err != nil {
if err == io.EOF ||
status.Code(err) == codes.Unavailable ||
+ status.Code(err) == codes.Canceled ||
err == context.Canceled {
c.log.Warn("received EOF, stopping recv loop", "err", err)
return
|
Exit stdio read loop on status code canceled too
|
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -42,8 +42,8 @@ module ActionController
# redirect_to :action=>'atom', :status => 302
#
# The status code can either be a standard {HTTP Status code}[http://www.iana.org/assignments/http-status-codes] as an
- # integer, or a symbol representing the downcased, underscored and symbolized description. Note that the status code
- # must be a 3xx HTTP code, or redirection will not occur.
+ # integer, or a symbol representing the downcased, underscored and symbolized description.
+ # Note that the status code must be a 3xx HTTP code, or redirection will not occur.
#
# It is also possible to assign a flash message as part of the redirection. There are two special accessors for commonly used the flash names
# +alert+ and +notice+ as well as a general purpose +flash+ bucket.
|
Tweak linebreak in ActionController::Redirecting doc
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -130,7 +130,7 @@ setup(
'matplotlib==3.0.3 ; python_version < "3.6"', # required for visualizing layer graph (< py36)
'requests', # required for TextA export and WebTagger
'tqdm', # progressbar: for showing progress on time-hungry operations
- 'ipython>=7.17.0 ; python_version > "3.6"', # required for integration with Jupyter Notebook-s (> py36)
+ 'ipython ; python_version > "3.6"', # required for integration with Jupyter Notebook-s (> py36)
'ipython< 7.17.0 ; python_version == "3.6"', # required for integration with Jupyter Notebook-s (= py36)
# Specific package requirements for specific Python versions
'conllu>=3.1.1 ; python_version >= "3.6"', # CONLLU for syntax
|
Updated setup.py: removed ipython version contraint for py><I> (problematic in colab)
|
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -31,6 +31,8 @@ module Rails
protected
attr_reader :file_name
+ # FIXME: We are avoiding to use alias because a bug on thor that make
+ # this method public and add it to the task list.
def singular_name
file_name
end
|
Add FIXME note about the thor bug
|
diff --git a/zipkin-ui/js/component_ui/timeStamp.js b/zipkin-ui/js/component_ui/timeStamp.js
index <HASH>..<HASH> 100644
--- a/zipkin-ui/js/component_ui/timeStamp.js
+++ b/zipkin-ui/js/component_ui/timeStamp.js
@@ -12,7 +12,7 @@ export default component(function timeStamp() {
};
this.setDateTime = function(time) {
- this.$date.val(time.format('MM-DD-YYYY'));
+ this.$date.val(time.format('YYYY-MM-DD'));
this.$time.val(time.format('HH:mm'));
};
@@ -27,7 +27,7 @@ export default component(function timeStamp() {
};
this.timeChanged = function() {
- const time = moment(this.$date.val(), 'MM-DD-YYYY');
+ const time = moment(this.$date.val(), 'YYYY-MM-DD');
time.add(moment.duration(this.$time.val()));
this.setTimestamp(moment.utc(time));
};
@@ -36,7 +36,7 @@ export default component(function timeStamp() {
this.init();
this.on(this.$time, 'change', this.timeChanged);
this.$date
- .datepicker({format: 'mm-dd-yyyy'})
+ .datepicker({format: 'yyyy-mm-dd'})
.on('changeDate', this.dateChanged.bind(this));
});
});
|
zipkin-ui: change date-picker form to yyyy-mm-dd (#<I>)
This is closer to ISO <I>, more widely accepted, and disambiguates day and month.
|
diff --git a/src/Input.php b/src/Input.php
index <HASH>..<HASH> 100644
--- a/src/Input.php
+++ b/src/Input.php
@@ -14,7 +14,7 @@ class Input
public function __construct($request = null)
{
if (empty($request)) {
- $this->request = Request::createFromGlobals();
+ $this->request = Request::createFromGlobals();
} else {
$this->request = $request;
}
|
Added shortcuts for accessing $_GET / $_POST array.
|
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
index <HASH>..<HASH> 100644
--- a/accounts/abi/bind/base.go
+++ b/accounts/abi/bind/base.go
@@ -256,13 +256,10 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i
return nil, errors.New("maxFeePerGas or maxPriorityFeePerGas specified but london is not active yet")
}
if opts.GasPrice == nil {
- price, err := c.transactor.SuggestGasTipCap(ensureContext(opts.Context))
+ price, err := c.transactor.SuggestGasPrice(ensureContext(opts.Context))
if err != nil {
return nil, err
}
- if head.BaseFee != nil {
- price.Add(price, head.BaseFee)
- }
opts.GasPrice = price
}
}
|
accounts/abi/bind: fix gas price suggestion with pre EIP-<I> clients (#<I>)
This fixes transaction sending in the case where an app using go-ethereum <I>
is talking to a pre-EIP-<I> RPC node. In this case, the eth_maxPriorityFeePerGas
endpoint is not available and we can only rely on eth_gasPrice.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.