diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/client/js/s3/uploader.js b/client/js/s3/uploader.js
index <HASH>..<HASH> 100644
--- a/client/js/s3/uploader.js
+++ b/client/js/s3/uploader.js
@@ -18,9 +18,6 @@ qq.s3.FineUploader = function(o) {
// Inherit instance data from FineUploader, which should in turn inherit from s3.FineUploaderBasic.
qq.FineUploader.call(this, options, "s3");
- // Replace any default options with user defined ones
- qq.extend(this._options, options, true);
-
if (!qq.supportedFeatures.ajaxUploading && options.request.successRedirectEndpoint === undefined) {
this._options.element.innerHTML = "<div>You MUST set the <code>successRedirectEndpoint</code> property " +
"of the <code>request</code> option since this browser does not support the File API!</div>"
|
fix(client/js/s3/uploader.js): Fix overwrite of instance values set by parent uploader in S3 FU mode
|
diff --git a/test_piplicenses.py b/test_piplicenses.py
index <HASH>..<HASH> 100644
--- a/test_piplicenses.py
+++ b/test_piplicenses.py
@@ -604,13 +604,12 @@ def test_allow_only(monkeypatch):
assert '' == mocked_stdout.printed
assert 'license MIT License not in allow-only licenses was found for ' \
- 'package attrs 🐍🐓🐿️:20.3.0' in mocked_stderr.printed
+ 'package' in mocked_stderr.printed
def test_fail_on(monkeypatch):
licenses = (
"MIT License",
- "BSD License",
)
allow_only_args = ['--fail-on={}'.format(";".join(licenses))]
mocked_stdout = MockStdStream()
@@ -623,4 +622,4 @@ def test_fail_on(monkeypatch):
assert '' == mocked_stdout.printed
assert 'fail-on license MIT License was found for ' \
- 'package attrs 🐍🐓🐿️:20.3.0' in mocked_stderr.printed
+ 'package' in mocked_stderr.printed
|
Fix test to prevent flakiness
The tests assumed an ordering of the dependencies which worked on my machine but failed on the CI machines. So I've removed the package name from the assertion.
Limiting the fail_on test to a single license should also prevent issues with ordering.
|
diff --git a/fc/__init__.py b/fc/__init__.py
index <HASH>..<HASH> 100644
--- a/fc/__init__.py
+++ b/fc/__init__.py
@@ -1,7 +1,7 @@
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
-__version__ = '0.7'
+__version__ = '0.7.1'
import io
import excel_io
|
Increased version number to <I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ setup(
license='BSD',
author='Tim van der Linden',
tests_require=['pytest'],
- install_requires=['WTForms>=2.0.1'],
+ install_requires=['WTForms>=2.0.1', 'WebOb>=1.4'],
cmdclass={'test': PyTest},
author_email='tim@shisaa.jp',
description='Simple wrapper to add "dynamic" (sets of) fields to an already instantiated WTForms form.',
diff --git a/wtforms_dynamic_fields/__init__.py b/wtforms_dynamic_fields/__init__.py
index <HASH>..<HASH> 100644
--- a/wtforms_dynamic_fields/__init__.py
+++ b/wtforms_dynamic_fields/__init__.py
@@ -1 +1,3 @@
+from wtforms_dynamic_fields import WTFormsDynamicFields
+
__version__ = '0.1a1'
|
Added WebOb dependency and made the module class availabe at top level.
|
diff --git a/spec/unit/provider/mount/mount_spec.rb b/spec/unit/provider/mount/mount_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/provider/mount/mount_spec.rb
+++ b/spec/unit/provider/mount/mount_spec.rb
@@ -107,7 +107,7 @@ describe Chef::Provider::Mount::Mount do
expect { @provider.load_current_resource(); @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
end
- %w{tmpfs fuse cgroup}.each do |fstype|
+ %w{tmpfs fuse cgroup vboxsf zfs}.each do |fstype|
it "does not expect the device to exist for #{fstype}" do
@new_resource.fstype(fstype)
@new_resource.device("whatever")
|
linux mount spec - skip device detection for zfs (and vboxsf)
|
diff --git a/polymodels/__init__.py b/polymodels/__init__.py
index <HASH>..<HASH> 100644
--- a/polymodels/__init__.py
+++ b/polymodels/__init__.py
@@ -2,6 +2,6 @@ from __future__ import unicode_literals
from django.utils.version import get_version
-VERSION = (1, 4, 4, 'alpha', 0)
+VERSION = (1, 4, 4, 'final', 0)
__version__ = get_version(VERSION)
|
Bumped version number to <I>.
|
diff --git a/src/dbFunctions.js b/src/dbFunctions.js
index <HASH>..<HASH> 100644
--- a/src/dbFunctions.js
+++ b/src/dbFunctions.js
@@ -447,11 +447,12 @@ var self = module.exports = {
var dbRequest = "INSERT INTO USRFLWINFL (FLWRID, INFLID) VALUES (" + userID + "," + influencerID + ");";
databaseClient.query(dbRequest, (err, dbResult) => {
- var dbResults = dbResult;
- if (dbResults != undefined && dbResults["rowCount"] == 1) {
+
+ if (dbResult != undefined) {
+ var dbResults = dbResult;
dbResults["createSuccess"] = true;
} else {
- dbResults = {};
+ var dbResults = err;
dbResults["createSuccess"] = false;
}
callback(dbResults);
|
Fixed a bug in dbFunctions, add_follow_influencers
|
diff --git a/astrobase/plotbase.py b/astrobase/plotbase.py
index <HASH>..<HASH> 100644
--- a/astrobase/plotbase.py
+++ b/astrobase/plotbase.py
@@ -892,7 +892,7 @@ def make_checkplot(lspinfo,
# bump the ylim of the LSP plot so that the overplotted finder and
# objectinfo can fit in this axes plot
lspylim = axes[0].get_ylim()
- axes[0].set_ylim(lspylim[0], lspylim[1]+0.75*lspylim[1])
+ axes[0].set_ylim(lspylim[0], lspylim[1]+0.75*(lspylim[1]-lspylim[0]))
# get the stamp
try:
|
checkplot has nicer LSP offset for objectinfo
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,16 @@
+import io
+
from distutils.core import setup
setup(
name='txZMQ',
- version=open('VERSION').read().strip(),
+ version=io.open('VERSION', encoding='utf-8').read().strip(),
packages=['txzmq', 'txzmq.test'],
license='GPLv2',
author='Andrey Smirnov',
author_email='me@smira.ru',
url='https://github.com/smira/txZMQ',
description='Twisted bindings for ZeroMQ',
- long_description=open('README.rst').read(),
+ long_description=io.open('README.rst', encoding='utf-8').read(),
install_requires=["Twisted>=10.0", "pyzmq>=13"],
)
|
Use io.open when reading UTF-8 encoded file for Python3 compatibility.
This way both Python2 and Python3 can use setup.py to handle the package.
|
diff --git a/ghost/members-api/index.js b/ghost/members-api/index.js
index <HASH>..<HASH> 100644
--- a/ghost/members-api/index.js
+++ b/ghost/members-api/index.js
@@ -202,14 +202,17 @@ module.exports = function MembersApi({
});
}
}
+ let extraPayload = {};
if (!allowSelfSignup) {
const member = await users.get({email});
if (member) {
- Object.assign(payload, _.pick(body, ['oldEmail']));
+ extraPayload = _.pick(req.body, ['oldEmail']);
+ Object.assign(payload, extraPayload);
await sendEmailWithMagicLink({email, requestedType: emailType, payload});
}
} else {
- Object.assign(payload, _.pick(body, ['labels', 'name', 'oldEmail']));
+ extraPayload = _.pick(req.body, ['labels', 'name', 'oldEmail']);
+ Object.assign(payload, extraPayload);
await sendEmailWithMagicLink({email, requestedType: emailType, payload});
}
res.writeHead(201);
|
🐛 Fixed incorrect payload creation for magic link token
no issue
- The extra payload added to magic link token included `name`, `labels` and `oldEmail`
- Refactor in commit [here](<URL>) changed the `body` variable assignment causing the payload objection creation to not include the extra data from request body
- Updates `body` to `req.body` to use correct data from request
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,8 @@ def setup_package():
url="http://www.statgen.org",
license="GPL",
packages=["pyplink"],
+ package_data={"pyplink.tests": ["data/test_data.*"], },
+ test_suite="pyplink.tests.test_suite",
install_requires=["numpy >= 1.8.2", "pandas >= 0.14.1"],
classifiers=["Operating System :: Linux",
"Programming Language :: Python",
|
Added the test suite to the setup.py
|
diff --git a/presto-main/src/main/java/com/facebook/presto/operator/PartitionedLookupSourceFactory.java b/presto-main/src/main/java/com/facebook/presto/operator/PartitionedLookupSourceFactory.java
index <HASH>..<HASH> 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/PartitionedLookupSourceFactory.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/PartitionedLookupSourceFactory.java
@@ -151,6 +151,7 @@ public final class PartitionedLookupSourceFactory
{
lock.writeLock().lock();
try {
+ checkState(!destroyed.isDone(), "already destroyed");
if (lookupSourceSupplier != null) {
return immediateFuture(new SpillAwareLookupSourceProvider());
}
|
Add minor state check to PartitionedLookupSourceFactory
PartitionedLookupSourceFactory#createLookupSourceProvider() should be
called before the factory is destroyed. Otherwise, the returned future
will never complete.
|
diff --git a/src/structures/MessagePayload.js b/src/structures/MessagePayload.js
index <HASH>..<HASH> 100644
--- a/src/structures/MessagePayload.js
+++ b/src/structures/MessagePayload.js
@@ -209,7 +209,7 @@ class MessagePayload {
/**
* Resolves a single file into an object sendable to the API.
* @param {BufferResolvable|Stream|FileOptions|MessageAttachment} fileLike Something that could be resolved to a file
- * @returns {MessageFile}
+ * @returns {Promise<MessageFile>}
*/
static async resolveFile(fileLike) {
let attachment;
|
docs(MessagePayload): Correct return type of `resolveFile()` (#<I>)
|
diff --git a/tests/test_constructor.py b/tests/test_constructor.py
index <HASH>..<HASH> 100644
--- a/tests/test_constructor.py
+++ b/tests/test_constructor.py
@@ -4,12 +4,12 @@ from mastodon.Mastodon import MastodonIllegalArgumentError
def test_constructor_from_filenames(tmpdir):
client = tmpdir.join('client')
- client.write_text('foo\nbar\n', 'UTF-8')
+ client.write_text(u'foo\nbar\n', 'UTF-8')
access = tmpdir.join('access')
- access.write_text('baz\n', 'UTF-8')
+ access.write_text(u'baz\n', 'UTF-8')
api = Mastodon(
str(client),
- access_token = str(access))
+ access_token=str(access))
assert api.client_id == 'foo'
assert api.client_secret == 'bar'
assert api.access_token == 'baz'
|
shouting!!!!!! ahhh python 2 is bad
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -55,11 +55,10 @@ author = 'Robin Thomas'
# built documents.
#
import os.path
-import re
with open(os.path.join(os.path.dirname(__file__), '../VERSION'), 'r') as f:
# The full version, including alpha/beta/rc tags.
- release = f.read().strip()
+ version = f.read().strip()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
|
corrected version reference in sphinx docs
|
diff --git a/lib/topologies/mongos.js b/lib/topologies/mongos.js
index <HASH>..<HASH> 100644
--- a/lib/topologies/mongos.js
+++ b/lib/topologies/mongos.js
@@ -807,17 +807,17 @@ Mongos.prototype.command = function(ns, cmd, options, callback) {
// Pick a proxy
var server = pickProxy(self);
- // No server returned we had an error
- if(server == null) {
- return callback(new MongoError('no mongos proxy available'));
- }
-
// Topology is not connected, save the call in the provided store to be
// Executed at some point when the handler deems it's reconnected
if((server == null || !server.isConnected()) && this.s.disconnectHandler != null) {
return this.s.disconnectHandler.add('command', ns, cmd, options, callback);
}
+ // No server returned we had an error
+ if(server == null) {
+ return callback(new MongoError('no mongos proxy available'));
+ }
+
// Execute the command
server.command(ns, cmd, options, callback);
}
|
fixed command execution issue for mongos
|
diff --git a/lib/web/files.go b/lib/web/files.go
index <HASH>..<HASH> 100644
--- a/lib/web/files.go
+++ b/lib/web/files.go
@@ -49,6 +49,7 @@ type fileTransferRequest struct {
func (h *Handler) transferFile(w http.ResponseWriter, r *http.Request, p httprouter.Params, ctx *SessionContext, site reversetunnel.RemoteSite) (interface{}, error) {
query := r.URL.Query()
req := fileTransferRequest{
+ cluster: p.ByName("site"),
login: p.ByName("login"),
namespace: p.ByName("namespace"),
server: p.ByName("server"),
|
Pass site name along in fileTransferRequest.
|
diff --git a/apio/managers/installer.py b/apio/managers/installer.py
index <HASH>..<HASH> 100644
--- a/apio/managers/installer.py
+++ b/apio/managers/installer.py
@@ -240,23 +240,24 @@ class Installer(object):
releases = api_request('{}/releases'.format(name), organization)
if req_version:
+ if force:
+ return req_version
# Find required version via @
return self._find_required_version(
- releases, tag_name, req_version, spec, force)
+ releases, tag_name, req_version, spec)
else:
# Find latest version release
return self._find_latest_version(
releases, tag_name, req_version, spec)
- def _find_required_version(self, releases, tag_name, req_version, spec,
- force):
+ def _find_required_version(self, releases, tag_name, req_version, spec):
version = self._check_sem_version(req_version, spec)
for release in releases:
prerelease = 'prerelease' in release and release.get('prerelease')
if 'tag_name' in release:
tag = tag_name.replace('%V', req_version)
if tag == release.get('tag_name'):
- if prerelease and not force:
+ if prerelease:
click.secho(
'Warning: ' + req_version + ' is' +
' a pre-release.\n' +
|
Elevate force tag for install command
|
diff --git a/cli/lib/cli/commands/base.rb b/cli/lib/cli/commands/base.rb
index <HASH>..<HASH> 100644
--- a/cli/lib/cli/commands/base.rb
+++ b/cli/lib/cli/commands/base.rb
@@ -1,6 +1,5 @@
require "yaml"
require "terminal-table/import"
-require "blobstore_client"
module Bosh::Cli
module Command
@@ -23,10 +22,6 @@ module Bosh::Cli
@director ||= Bosh::Cli::Director.new(target, username, password)
end
- def blobstore
- @blobstore ||= init_blobstore
- end
-
def logged_in?
username && password
end
|
Removed unused stuff from base command
|
diff --git a/tensorflow_datasets/translate/wmt19.py b/tensorflow_datasets/translate/wmt19.py
index <HASH>..<HASH> 100644
--- a/tensorflow_datasets/translate/wmt19.py
+++ b/tensorflow_datasets/translate/wmt19.py
@@ -42,7 +42,7 @@ class Wmt19Translate(wmt.WmtTranslate):
url=_URL,
citation=_CITATION,
language_pair=(l1, l2),
- version="0.0.1")
+ version="0.0.2")
for l1, l2 in _LANGUAGE_PAIRS
]
|
Increment WMT<I> version since a missing subset was added to RU-EN (commoncrawl).
PiperOrigin-RevId: <I>
|
diff --git a/category/models.py b/category/models.py
index <HASH>..<HASH> 100644
--- a/category/models.py
+++ b/category/models.py
@@ -35,7 +35,7 @@ class Category(models.Model):
)
def __unicode__(self):
- return self.title
+ return self.subtitle if self.subtitle else self.title
class Meta:
ordering = ('title',)
|
use subtitle as unicode if available
|
diff --git a/registration/models.py b/registration/models.py
index <HASH>..<HASH> 100644
--- a/registration/models.py
+++ b/registration/models.py
@@ -151,7 +151,7 @@ class RegistrationProfile(models.Model):
pass
def __str__(self):
- return "User profile for %s" % self.user.username
+ return "Registration information for %s" % self.user.username
def activation_key_expired(self):
"""
|
Tweak RegistrationProfile.__str__ to be a bit more informative
|
diff --git a/advanced_filters/forms.py b/advanced_filters/forms.py
index <HASH>..<HASH> 100644
--- a/advanced_filters/forms.py
+++ b/advanced_filters/forms.py
@@ -56,7 +56,7 @@ class AdvancedFilterQueryForm(CleanWhiteSpacesMixin, forms.Form):
("lt", _("Less Than")),
("gt", _("Greater Than")),
("lte", _("Less Than or Equal To")),
- ("gte", _("Less Than or Equal To")),
+ ("gte", _("Greater Than or Equal To")),
)
FIELD_CHOICES = (
|
Fixed labeling error with 'Greater Than or Equal To'
|
diff --git a/pygccxml/declarations/scopedef.py b/pygccxml/declarations/scopedef.py
index <HASH>..<HASH> 100644
--- a/pygccxml/declarations/scopedef.py
+++ b/pygccxml/declarations/scopedef.py
@@ -246,7 +246,6 @@ class scopedef_t(declaration.declaration_t):
"""implementation details"""
types = []
bases = list(decl.__class__.__bases__)
- visited = set()
if 'pygccxml' in decl.__class__.__module__:
types.append(decl.__class__)
while bases:
@@ -257,8 +256,6 @@ class scopedef_t(declaration.declaration_t):
continue
if base is elaborated_info.elaborated_info:
continue
- if base in visited:
- continue
if 'pygccxml' not in base.__module__:
continue
types.append(base)
|
Remove unused code path
The set is never updated, so that the continue can never be called
in the loop. There seem to be no purpose for this code path, it
is probably some legacy code that did not get cleaned up.
|
diff --git a/albumentations/augmentations/functional.py b/albumentations/augmentations/functional.py
index <HASH>..<HASH> 100644
--- a/albumentations/augmentations/functional.py
+++ b/albumentations/augmentations/functional.py
@@ -328,7 +328,7 @@ def optical_distortion(img, k=0, dx=0, dy=0, interpolation=cv2.INTER_LINEAR, bor
x = x.astype(np.float32) - width / 2 - dx
y = y.astype(np.float32) - height / 2 - dy
theta = np.arctan2(y, x)
- d = (x * x + y * y) ** 0.5
+ d = (x * x + y * y + 1e-8) ** 0.5
r = d * (1 + k * d * d)
map_x = r * np.cos(theta) + width / 2 + dx
map_y = r * np.sin(theta) + height / 2 + dy
|
Apparently, when computing sum of squares we get a very small number that in occasion cases triggers a runtime warning "RuntimeWarning: invalid value encountered in sqrt".
This commit adds tiny positive number to ensure a sum will be positive.
|
diff --git a/zinnia/urls/authors.py b/zinnia/urls/authors.py
index <HASH>..<HASH> 100644
--- a/zinnia/urls/authors.py
+++ b/zinnia/urls/authors.py
@@ -12,10 +12,10 @@ urlpatterns = patterns(
url(r'^$',
AuthorList.as_view(),
name='zinnia_author_list'),
- url(r'^(?P<username>[.+-@\w]+)/$',
- AuthorDetail.as_view(),
- name='zinnia_author_detail'),
url(_(r'^(?P<username>[.+-@\w]+)/page/(?P<page>\d+)/$'),
AuthorDetail.as_view(),
name='zinnia_author_detail_paginated'),
+ url(r'^(?P<username>[.+-@\w]+)/$',
+ AuthorDetail.as_view(),
+ name='zinnia_author_detail'),
)
|
Proper username resolution
This re r'^(?P<username>[.+-@\w]+)/$' resolve username as the whole last part of URL.
Mean this:
If URL is "/blog/authors/someusername/page/<I>/" than username is "someusername/page/<I>/"
Placing paginated view URL before UNpaginated will fix the problem.
|
diff --git a/app.js b/app.js
index <HASH>..<HASH> 100644
--- a/app.js
+++ b/app.js
@@ -1,2 +1,2 @@
require('./index')();
-console.log(new Date().toLocaleString())
+console.log(new Date().toLocaleString());
|
refactor: fix eslint
|
diff --git a/contribs/gmf/src/print/component.js b/contribs/gmf/src/print/component.js
index <HASH>..<HASH> 100644
--- a/contribs/gmf/src/print/component.js
+++ b/contribs/gmf/src/print/component.js
@@ -670,7 +670,7 @@ class Controller {
togglePrintPanel_(active) {
if (active) {
if (!this.capabilities_) {
- this.getCapabilities_();
+ this.getCapabilities_(this.gmfAuthenticationService_.getRolesIds().join(','));
}
this.capabilities_.then((resp) => {
// make sure the panel is still open
@@ -703,17 +703,15 @@ class Controller {
/**
* Gets the print capabilities.
- * @param {number|null=} opt_roleId The role id.
+ * @param {string} roleId The roles ids.
* @private
*/
- getCapabilities_(opt_roleId) {
+ getCapabilities_(roleId) {
this.capabilities_ = this.ngeoPrint_.getCapabilities(
/** @type {angular.IRequestShortcutConfig} */ ({
withCredentials: true,
- params: opt_roleId ? {
- 'role': opt_roleId,
- 'cache_version': this.cacheVersion_
- } : {
+ params: {
+ 'role': roleId,
'cache_version': this.cacheVersion_
}
}));
|
Always add a role id in print get capabilities
|
diff --git a/calendar-bundle/src/Resources/contao/dca/tl_calendar_events.php b/calendar-bundle/src/Resources/contao/dca/tl_calendar_events.php
index <HASH>..<HASH> 100644
--- a/calendar-bundle/src/Resources/contao/dca/tl_calendar_events.php
+++ b/calendar-bundle/src/Resources/contao/dca/tl_calendar_events.php
@@ -311,7 +311,7 @@ $GLOBALS['TL_DCA']['tl_calendar_events'] = array
'inputType' => 'imageSize',
'options' => System::getImageSizes(),
'reference' => &$GLOBALS['TL_LANG']['MSC'],
- 'eval' => array('rgxp'=>'digit', 'nospace'=>true, 'helpwizard'=>true, 'tl_class'=>'w50'),
+ 'eval' => array('rgxp'=>'natural', 'includeBlankOption'=>true, 'nospace'=>true, 'helpwizard'=>true, 'tl_class'=>'w50'),
'sql' => "varchar(64) NOT NULL default ''"
),
'imagemargin' => array
|
[Calendar] Add an empty option to the image size select menu (see #<I>)
|
diff --git a/flat/style/flat.editor.js b/flat/style/flat.editor.js
index <HASH>..<HASH> 100644
--- a/flat/style/flat.editor.js
+++ b/flat/style/flat.editor.js
@@ -1335,10 +1335,8 @@ function editor_submit(addtoqueue) {
parentselector += " FOR";
var forids = ""; //jshint ignore:line
sortededittargets.forEach(function(t){
- if (forids) {
- forids += " ,";
- }
forids += " ID " + t;
+ return; //only one should be enough
});
parentselector += forids;
}
|
fixed issue #<I> (prevent duplicate comments...bit patchy, may be something wrong in FQL library)
|
diff --git a/test/config/config.go b/test/config/config.go
index <HASH>..<HASH> 100644
--- a/test/config/config.go
+++ b/test/config/config.go
@@ -70,5 +70,5 @@ func (c *CiliumTestConfigType) ParseFlags() {
"Specifies timeout for test run")
flag.StringVar(&c.Kubeconfig, "cilium.kubeconfig", "",
"Kubeconfig to be used for k8s tests")
- flag.StringVar(&c.Kubeconfig, "cilium.registry", "k8s1:5000", "docker registry hostname for Cilium image")
+ flag.StringVar(&c.Registry, "cilium.registry", "k8s1:5000", "docker registry hostname for Cilium image")
}
|
CI: Fix typo setting kubeconfig variable from registry
This caused some off errors, particularly around how we determine
whether we are in the CI or running with a custom kubeconfig.
|
diff --git a/client-side/src/core/js/modules/loadEvents.js b/client-side/src/core/js/modules/loadEvents.js
index <HASH>..<HASH> 100644
--- a/client-side/src/core/js/modules/loadEvents.js
+++ b/client-side/src/core/js/modules/loadEvents.js
@@ -18,7 +18,7 @@ define(["modules/module", "modules/utils"], function(module, utils) {
complete = false,
debug = module.options.modulesEnabled.loadEvents && module.options.modulesOptions.loadEvents.debug;
- if (!module.options.modulesEnabled.loadEvents) {
+ if ( (!module.options.modulesEnabled.loadEvents) || (window.CustomEvent === undefined)) {
if (debug && utils.isDevelopmentMode()) {
console.log('LoadEvents Module disabled.');
}
|
loadEvents ie8 fix
|
diff --git a/packages/posts/photos/instagram/photoSource.js b/packages/posts/photos/instagram/photoSource.js
index <HASH>..<HASH> 100644
--- a/packages/posts/photos/instagram/photoSource.js
+++ b/packages/posts/photos/instagram/photoSource.js
@@ -46,7 +46,7 @@ class InstagramSource extends CachedDataSource {
posts = posts.concat(await this.allPostsGetter(
searchParams
.set("all", true)
- .set("beforeId", lastPost)
+ .set("beforeId", lastPost.id)
));
}
|
fix(posts): Instagram `allPostsGetter` passes an id into `beforeId`.
We're only grabbing <I> posts anyways so it's not like we actually have to have this implementation...
|
diff --git a/src/com/google/caliper/LinearTranslation.java b/src/com/google/caliper/LinearTranslation.java
index <HASH>..<HASH> 100644
--- a/src/com/google/caliper/LinearTranslation.java
+++ b/src/com/google/caliper/LinearTranslation.java
@@ -16,8 +16,6 @@
package com.google.caliper;
-import com.google.common.base.Preconditions;
-
public class LinearTranslation {
// y = mx + b
private final double m;
@@ -30,8 +28,6 @@ public class LinearTranslation {
* @throws IllegalArgumentException if {@code in1 == in2}
*/
public LinearTranslation(double in1, double out1, double in2, double out2) {
- Preconditions.checkArgument(in1 != in2);
-
double divisor = in1 - in2;
this.m = (out1 - out2) / divisor;
this.b = (in1 * out2 - in2 * out1) / divisor;
|
Remove guava dependency of LinearTranslation so it can be used by GWT
git-svn-id: <URL>
|
diff --git a/aiogram/utils/exceptions.py b/aiogram/utils/exceptions.py
index <HASH>..<HASH> 100644
--- a/aiogram/utils/exceptions.py
+++ b/aiogram/utils/exceptions.py
@@ -1,9 +1,11 @@
+_PREFIXES = ['Error: ', '[Error]: ', 'Bad Request: ']
+
+
def _clean_message(text):
- return text. \
- lstrip('Error: '). \
- lstrip('[Error]: '). \
- lstrip('Bad Request: '). \
- capitalize()
+ for prefix in _PREFIXES:
+ if text.startswith(prefix):
+ text = text[len(prefix):]
+ return text
class TelegramAPIError(Exception):
|
Oops. Fix error message cleaner. (In past it can strip first symbol in message)
|
diff --git a/bindings.js b/bindings.js
index <HASH>..<HASH> 100644
--- a/bindings.js
+++ b/bindings.js
@@ -115,7 +115,9 @@ function bindings(opts) {
}
return b;
} catch (e) {
- if (e.code !== 'MODULE_NOT_FOUND' && e.code !== 'QUALIFIED_PATH_RESOLUTION_FAILED') {
+ if (e.code !== 'MODULE_NOT_FOUND' &&
+ e.code !== 'QUALIFIED_PATH_RESOLUTION_FAILED' &&
+ !/not find/i.test(e.message)) {
throw e;
}
}
|
Add back the old module not found check
So that we don't have to do a major version bump by dropping support for
older Node.js versions.
|
diff --git a/go/service/main.go b/go/service/main.go
index <HASH>..<HASH> 100644
--- a/go/service/main.go
+++ b/go/service/main.go
@@ -549,7 +549,7 @@ func (d *Service) runHomePoller(ctx context.Context) {
}
func (d *Service) runMerkleAudit(ctx context.Context) {
- if !libkb.IsMobilePlatform() {
+ if libkb.IsMobilePlatform() {
d.G().Log.Debug("MerkleAudit disabled (not desktop, not starting)")
return
}
|
Fixed a bug where the audits would run only on mobile
|
diff --git a/findbugs/src/gui/edu/umd/cs/findbugs/gui2/MainFrameTree.java b/findbugs/src/gui/edu/umd/cs/findbugs/gui2/MainFrameTree.java
index <HASH>..<HASH> 100644
--- a/findbugs/src/gui/edu/umd/cs/findbugs/gui2/MainFrameTree.java
+++ b/findbugs/src/gui/edu/umd/cs/findbugs/gui2/MainFrameTree.java
@@ -618,6 +618,11 @@ public class MainFrameTree implements Serializable {
return;
}
+ if(currentSelectedBugLeaf == path.getLastPathComponent()) {
+ // sync mainFrame if user just clicks on the same bug
+ mainFrame.syncBugInformation();
+ }
+
if ((e.getButton() == MouseEvent.BUTTON3) || (e.getButton() == MouseEvent.BUTTON1 && e.isControlDown())) {
if (tree.getModel().isLeaf(path.getLastPathComponent())) {
|
bug#<I>: sync bug view when clicking on the already selected tree node
(useful when you scrolled away from bug position)
|
diff --git a/activerecord/lib/active_record/coders/yaml_column.rb b/activerecord/lib/active_record/coders/yaml_column.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/coders/yaml_column.rb
+++ b/activerecord/lib/active_record/coders/yaml_column.rb
@@ -45,14 +45,20 @@ module ActiveRecord
raise ArgumentError, "Cannot serialize #{object_class}. Classes passed to `serialize` must have a 0 argument constructor."
end
- def yaml_load(payload)
- if !ActiveRecord.use_yaml_unsafe_load
- YAML.safe_load(payload, permitted_classes: ActiveRecord.yaml_column_permitted_classes, aliases: true)
- else
- if YAML.respond_to?(:unsafe_load)
+ if YAML.respond_to?(:unsafe_load)
+ def yaml_load(payload)
+ if ActiveRecord.use_yaml_unsafe_load
YAML.unsafe_load(payload)
else
+ YAML.safe_load(payload, permitted_classes: ActiveRecord.yaml_column_permitted_classes, aliases: true)
+ end
+ end
+ else
+ def yaml_load(payload)
+ if ActiveRecord.use_yaml_unsafe_load
YAML.load(payload)
+ else
+ YAML.safe_load(payload, permitted_classes: ActiveRecord.yaml_column_permitted_classes, aliases: true)
end
end
end
|
Improve performance by removing respond_to? from runtime code
respond_to? is inherently slow, and the YAML class won't change whether
it does or does not respond to unsafe_load, so just check it once
during file load, and define methods accordingly.
|
diff --git a/lib/maruku/input/parse_block.rb b/lib/maruku/input/parse_block.rb
index <HASH>..<HASH> 100644
--- a/lib/maruku/input/parse_block.rb
+++ b/lib/maruku/input/parse_block.rb
@@ -603,7 +603,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
# empty cells increase the colspan of the previous cell
found = false
colspan += 1
- al = currElem.al || AttributeList.new
+ al = (currElem &&currElem.al) || AttributeList.new
if (al.size>0)
elem = find_colspan(al)
if (elem != nil)
|
Corrected a possible crash during processing a table with a blank first column.
|
diff --git a/spec/controllers/theme_controller_spec.rb b/spec/controllers/theme_controller_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/controllers/theme_controller_spec.rb
+++ b/spec/controllers/theme_controller_spec.rb
@@ -30,7 +30,8 @@ describe ThemeController do
assert @response.body =~ /Static View Test from typographic/
end
- def disabled_test_javascript
+ it "disabled_test_javascript"
+ if false
get :stylesheets, :filename => "typo.js"
assert_response :success
assert_equal "text/javascript", @response.content_type
|
Make disabled spec show up in test output.
|
diff --git a/src/View/View.php b/src/View/View.php
index <HASH>..<HASH> 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -175,13 +175,6 @@ class View implements EventDispatcherInterface
protected $theme;
/**
- * True when the view has been rendered.
- *
- * @var bool
- */
- protected $hasRendered = false;
-
- /**
* An instance of a \Cake\Http\ServerRequest object that contains information about the current request.
* This object contains all the information about a request and several methods for reading
* additional information about the request.
@@ -701,8 +694,6 @@ class View implements EventDispatcherInterface
$this->layout = $defaultLayout;
}
- $this->hasRendered = true;
-
return $this->Blocks->get('content');
}
@@ -1104,17 +1095,6 @@ class View implements EventDispatcherInterface
}
/**
- * Check whether the view has been rendered.
- *
- * @return bool
- * @since 3.7.0
- */
- public function hasRendered(): bool
- {
- return $this->hasRendered;
- }
-
- /**
* Set sub-directory for this template files.
*
* @param string $subDir Sub-directory name.
|
Remove unneeded View::$hasRendered flag.
Calling View::render() multiple times should simply render again
with given arguments and existing context.
|
diff --git a/router/galeb/router.go b/router/galeb/router.go
index <HASH>..<HASH> 100644
--- a/router/galeb/router.go
+++ b/router/galeb/router.go
@@ -289,6 +289,9 @@ func (r *galebRouter) SetHealthcheck(name string, data router.HealthcheckData) e
if err != nil {
return err
}
+ if data.Path == "" {
+ data.Path = "/"
+ }
poolProperties := galebClient.BackendPoolProperties{
HcPath: data.Path,
HcStatusCode: fmt.Sprintf("%d", data.Status),
|
router/galeb: default to healthcheck on /
|
diff --git a/lib/passport-userapp/strategy.js b/lib/passport-userapp/strategy.js
index <HASH>..<HASH> 100644
--- a/lib/passport-userapp/strategy.js
+++ b/lib/passport-userapp/strategy.js
@@ -92,18 +92,6 @@ Strategy.prototype.authenticate = function (req, options) {
}
function parseProfile(userappUser) {
- /* Function to convert an object from
- value/override structure to a simple object */
- function fixObject(object) {
- for (var i in object) {
- object[i] = object[i].value;
- }
- }
-
- var permissions = fixObject(userappUser.permissions),
- properties = fixObject(userappUser.properties),
- features = fixObject(userappUser.features);
-
return {
provider: 'userapp',
id: userappUser.user_id,
@@ -116,9 +104,9 @@ Strategy.prototype.authenticate = function (req, options) {
emails: [
{ value: userappUser.email }
],
- permissions: permissions,
- features: features,
- properties: properties,
+ permissions: userappUser.permissions,
+ features: userappUser.features,
+ properties: userappUser.properties,
subscription: userappUser.subscription,
lastLoginAt: userappUser.last_login_at,
updatedAt: userappUser.updated_at,
|
Modified the user profile fields (see docs).
|
diff --git a/src/main/java/com/buschmais/jqassistant/scm/cli/task/AbstractTask.java b/src/main/java/com/buschmais/jqassistant/scm/cli/task/AbstractTask.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/buschmais/jqassistant/scm/cli/task/AbstractTask.java
+++ b/src/main/java/com/buschmais/jqassistant/scm/cli/task/AbstractTask.java
@@ -110,7 +110,9 @@ public abstract class AbstractTask implements Task {
protected Store getStore() {
File directory = new File(storeDirectory);
LOG.info("Opening store in directory '" + directory.getAbsolutePath() + "'");
- directory.getParentFile().mkdirs();
+ if (!directory.exists()) {
+ directory.getParentFile().mkdirs();
+ }
return new EmbeddedGraphStore(directory.getAbsolutePath());
}
|
#<I> split up scanning of model and artifacts
|
diff --git a/lib/utils.js b/lib/utils.js
index <HASH>..<HASH> 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -9,19 +9,20 @@ var child_process = require('child_process')
exports.execSync = (function (command) {
'use strict';
+ var execCommand = '';
switch(os.platform()) {
case 'win32':
case 'win64':
- command = command + ' 2>&1 1>output & echo done! > done';
+ execCommand = command + ' 2>&1 1>output & echo done! > done';
break;
case 'linux':
case 'darwin':
default:
- command = command + ' 2>&1 1>output ; echo done! > done';
+ execCommand = command + ' 2>&1 1>output ; echo done! > done';
break;
}
- child_process.exec(command);
+ child_process.exec(execCommand);
while (!fs.existsSync('done')) {
}
|
ahh, what the hell is wrong with me today.
|
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
index <HASH>..<HASH> 100644
--- a/src/Controller/Controller.php
+++ b/src/Controller/Controller.php
@@ -442,10 +442,6 @@ class Controller extends Object implements EventListener {
* @return void
*/
protected function _mergeControllerVars() {
- $pluginDot = null;
- if (!empty($this->plugin)) {
- $pluginDot = $this->plugin . '.';
- }
$this->_mergeVars(
['components', 'helpers'],
['associative' => ['components', 'helpers']]
|
Removed 4 lines of useless code.
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -21,7 +21,7 @@ module.exports = function (fileName, globalOptions) {
// new copy of globalOptions for each file
options = extend({}, globalOptions || {});
- options.includePaths = extend([], globalOptions.includePaths || []);
+ options.includePaths = extend([], (globalOptions ? globalOptions.includePaths : {}) || []);
options.data = inputString;
options.includePaths.unshift(path.dirname(fileName));
|
Let globalOptions be undefined
If globalOptions is undefined, referencing something on it throws
an error. This lets the globalOptions be undefined, as it will only
reference the includePaths if it is defined.
|
diff --git a/src/engine/currencyEngine.js b/src/engine/currencyEngine.js
index <HASH>..<HASH> 100644
--- a/src/engine/currencyEngine.js
+++ b/src/engine/currencyEngine.js
@@ -465,12 +465,20 @@ export class CurrencyEngine {
}
addGapLimitAddresses (addresses: Array<string>, options: any): void {
- const scriptHashes = addresses.map(
- displayAddress => this.engineState.scriptHashes[displayAddress]
+ const scriptHashesPromises = addresses.map(
+ (displayAddress: string): Promise<string> => {
+ const scriptHash = this.engineState.scriptHashes[displayAddress]
+ if (typeof scriptHash === 'string') return Promise.resolve(scriptHash)
+ return this.keyManager.addressToScriptHash(displayAddress)
+ }
)
- this.engineState.markAddressesUsed(scriptHashes)
- if (this.keyManager) this.keyManager.setLookAhead()
+ Promise.all(scriptHashesPromises)
+ .then(scriptHashes => {
+ this.engineState.markAddressesUsed(scriptHashes)
+ if (this.keyManager) this.keyManager.setLookAhead()
+ })
+ .catch(this.log)
}
isAddressUsed (address: string, options: any): boolean {
|
try and get the "scriptHash" from the engineState cache but in case it's not there, manually calculate it.
|
diff --git a/database/certificate.go b/database/certificate.go
index <HASH>..<HASH> 100644
--- a/database/certificate.go
+++ b/database/certificate.go
@@ -217,7 +217,7 @@ func (db *DB) UpdateCACertTruststore(id int64, tsName string) error {
// In that case it returns -1 with no error.
func (db *DB) GetCertIDBySHA1Fingerprint(sha1 string) (int64, error) {
- query := fmt.Sprintf(`SELECT id FROM certificates WHERE sha1_fingerprint='%s'`, sha1)
+ query := fmt.Sprintf(`SELECT id FROM certificates WHERE sha1_fingerprint='%s' ORDER BY id ASC LIMIT 1`, sha1)
row := db.QueryRow(query)
@@ -242,7 +242,7 @@ func (db *DB) GetCertIDBySHA1Fingerprint(sha1 string) (int64, error) {
// In that case it returns -1 with no error.
func (db *DB) GetCertIDBySHA256Fingerprint(sha256 string) (int64, error) {
- query := fmt.Sprintf(`SELECT id FROM certificates WHERE sha256_fingerprint='%s'`, sha256)
+ query := fmt.Sprintf(`SELECT id FROM certificates WHERE sha256_fingerprint='%s' ORDER BY id ASC LIMIT 1`, sha256)
row := db.QueryRow(query)
|
Limit GetCert queries to the first result sorted by ID
|
diff --git a/src/config/newsletter.php b/src/config/newsletter.php
index <HASH>..<HASH> 100644
--- a/src/config/newsletter.php
+++ b/src/config/newsletter.php
@@ -56,8 +56,8 @@ return [
* */
'link' => [
- 'arret' => url('jurisprudence'),
- 'analyse' => url('jurisprudence')
+ 'arret' => PHP_SAPI === 'cli' ? false : url('jurisprudence'),
+ 'analyse' => PHP_SAPI === 'cli' ? false : url('jurisprudence')
]
];
\ No newline at end of file
|
fix url problem with artisan in config file
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
+"""setup.py."""
+
import setuptools
if __name__ == '__main__':
|
Add docstring to satisfy linter
|
diff --git a/apiserver/facades/client/modelmanager/modelmanager.go b/apiserver/facades/client/modelmanager/modelmanager.go
index <HASH>..<HASH> 100644
--- a/apiserver/facades/client/modelmanager/modelmanager.go
+++ b/apiserver/facades/client/modelmanager/modelmanager.go
@@ -781,9 +781,12 @@ func (m *ModelManagerAPI) ListModels(user params.Entity) (params.UserModelList,
}
for _, mi := range modelInfos {
- ownerTag, err := names.ParseUserTag(mi.Owner)
- if err != nil {
- return params.UserModelList{}, err
+ var ownerTag names.UserTag
+ if names.IsValidUser(mi.Owner) {
+ ownerTag = names.NewUserTag(mi.Owner)
+ } else {
+ // no reason to fail the request here, as it wasn't the users fault
+ logger.Warningf("for model %v, got an invalid owner: %q", mi.UUID, mi.Owner)
}
result.UserModels = append(result.UserModels, params.UserModel{
Model: params.Model{
|
Owner is just a user string, not a tag.
|
diff --git a/src/store/indexeddb.js b/src/store/indexeddb.js
index <HASH>..<HASH> 100644
--- a/src/store/indexeddb.js
+++ b/src/store/indexeddb.js
@@ -20,6 +20,7 @@ limitations under the License.
import Promise from 'bluebird';
import {MemoryStore} from "./memory";
import utils from "../utils";
+import {EventEmitter} from 'events';
import LocalIndexedDBStoreBackend from "./indexeddb-local-backend.js";
import RemoteIndexedDBStoreBackend from "./indexeddb-remote-backend.js";
import User from "../models/user";
@@ -112,6 +113,7 @@ const IndexedDBStore = function IndexedDBStore(opts) {
};
};
utils.inherits(IndexedDBStore, MemoryStore);
+utils.extend(IndexedDBStore.prototype, EventEmitter.prototype);
IndexedDBStore.exists = function(indexedDB, dbName) {
return LocalIndexedDBStoreBackend.exists(indexedDB, dbName);
@@ -286,6 +288,7 @@ function degradable(func, fallback) {
return await func.call(this, ...args);
} catch (e) {
console.error("IndexedDBStore failure, degrading to MemoryStore", e);
+ this.emit("degraded", e);
try {
// We try to delete IndexedDB after degrading since this store is only a
// cache (the app will still function correctly without the data).
|
Emit event when `IndexedDBStore` degrades
This allows for optional tracking of when the store degrades to see how often it
happens in the field.
|
diff --git a/datetime_tz/__init__.py b/datetime_tz/__init__.py
index <HASH>..<HASH> 100644
--- a/datetime_tz/__init__.py
+++ b/datetime_tz/__init__.py
@@ -226,6 +226,8 @@ def _detect_timezone_windows():
olson_name = win32tz_map.win32timezones.get(win32tz_key_name, None)
if not olson_name:
return None
+ if not isinstance(olson_name, str):
+ olson_name = olson_name.encode('ascii')
return pytz.timezone(olson_name)
def detect_timezone():
|
Hopefully fix a weird error which only happens with pytz <I>b without breaking Python 3 support
|
diff --git a/autoflake.py b/autoflake.py
index <HASH>..<HASH> 100644
--- a/autoflake.py
+++ b/autoflake.py
@@ -38,7 +38,7 @@ import pyflakes.messages
import pyflakes.reporter
-__version__ = '0.6'
+__version__ = '0.6.1'
ATOMS = frozenset([tokenize.NAME, tokenize.NUMBER, tokenize.STRING])
|
Increment patch version to <I>
|
diff --git a/lib/gastropod/active_record/validations.rb b/lib/gastropod/active_record/validations.rb
index <HASH>..<HASH> 100644
--- a/lib/gastropod/active_record/validations.rb
+++ b/lib/gastropod/active_record/validations.rb
@@ -3,7 +3,7 @@ module Gastropod
module Validations
def self.included(base)
base.validates :slug, :uniqueness => true
- base.validates :slug, :format => { :with => /^[a-z0-9-]+$/, :allow_blank => true }
+ base.validates :slug, :format => { :with => /\A[a-z0-9-]+\z/, :allow_blank => true }
base.validates :slug, :presence => true
base.before_validation :assign_generated_slug, :if => :generate_slug?
|
Updates regex to fix Rails 4 security whine.
|
diff --git a/Sniffs/Arrays/ArrayDeclarationSniff.php b/Sniffs/Arrays/ArrayDeclarationSniff.php
index <HASH>..<HASH> 100644
--- a/Sniffs/Arrays/ArrayDeclarationSniff.php
+++ b/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -411,7 +411,7 @@ class WordPress_Sniffs_Arrays_ArrayDeclarationSniff implements PHP_CodeSniffer_S
// Check each line ends in a comma.
if ($tokens[$index['value']]['code'] !== T_ARRAY) {
- $nextComma = $phpcsFile->findNext(array(T_COMMA), ($index['value'] + 1));
+ $nextComma = $phpcsFile->findNext(array(T_COMMA, T_OPEN_PARENTHESIS), ($index['value'] + 1));
if (($nextComma === false) || ($tokens[$nextComma]['line'] !== $tokens[$index['value']]['line'])) {
$error = 'Each line in an array declaration must end in a comma';
$phpcsFile->addError($error, $index['value']);
|
Fix trailing comma issue in array definition where it choked on closures and multiline functions
|
diff --git a/library/CM/Process.php b/library/CM/Process.php
index <HASH>..<HASH> 100644
--- a/library/CM/Process.php
+++ b/library/CM/Process.php
@@ -69,7 +69,7 @@ class CM_Process {
* @param int $signal
*/
public function killChildren($signal) {
- foreach ($this->_forkHandlerList as $processId => $workload) {
+ foreach ($this->_forkHandlerList as $processId => $forkHandler) {
posix_kill($processId, $signal);
}
}
|
Rename $workload to $forkHandler in loop
|
diff --git a/tests/TestCase/Database/Driver/SqlserverTest.php b/tests/TestCase/Database/Driver/SqlserverTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Database/Driver/SqlserverTest.php
+++ b/tests/TestCase/Database/Driver/SqlserverTest.php
@@ -126,7 +126,7 @@ class SqlserverTest extends TestCase
'settings' => ['config1' => 'value1', 'config2' => 'value2'],
];
$driver = $this->getMockBuilder('Cake\Database\Driver\Sqlserver')
- ->setMethods(['_connect', 'getConnection'])
+ ->setMethods(['_connect', 'setConnection', 'getConnection'])
->setConstructorArgs([$config])
->getMock();
$dsn = 'sqlsrv:Server=foo;Database=bar;MultipleActiveResultSets=false';
|
add setConnection to mocked Method list
|
diff --git a/lib/fog/openstack/models/storage/directory.rb b/lib/fog/openstack/models/storage/directory.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/openstack/models/storage/directory.rb
+++ b/lib/fog/openstack/models/storage/directory.rb
@@ -10,7 +10,7 @@ module Fog
attribute :bytes, :aliases => 'X-Container-Bytes-Used'
attribute :count, :aliases => 'X-Container-Object-Count'
- attr_reader :public
+ attr_writer :public
def destroy
requires :key
|
fix mistyping in openstack storage directory model
|
diff --git a/lib/preview.js b/lib/preview.js
index <HASH>..<HASH> 100644
--- a/lib/preview.js
+++ b/lib/preview.js
@@ -15,7 +15,7 @@ const {
module.exports = run;
-function run(input, size, vivliostyleTimeout) {
+function run(input, sandbox = true) {
const stat = fs.statSync(input);
const root = stat.isDirectory()? input : path.dirname(input);
const index = stat.isDirectory()? 'index.html' : path.basename(input);
@@ -41,6 +41,7 @@ function run(input, size, vivliostyleTimeout) {
chromeLauncher.launch({
startingUrl: url,
+ chromeFlags: sandbox ? [] : ['--no-sandbox']
}).then(chrome => {
['SIGNIT', 'SIGTERM'].forEach(sig => {
process.on(sig, () => {
|
make previewer enable to launch without sandbox
|
diff --git a/searx/static/default/js/searx.js b/searx/static/default/js/searx.js
index <HASH>..<HASH> 100644
--- a/searx/static/default/js/searx.js
+++ b/searx/static/default/js/searx.js
@@ -9,7 +9,7 @@ if(searx.autocompleter) {
timeout: 5 // Correct option?
},
'minLength': 4,
- // 'selectMode': 'type-ahead',
+ 'selectMode': false,
cache: true,
delay: 300
});
|
[mod] select autocomplete results with mouse click
|
diff --git a/spinoff/actor/actor.py b/spinoff/actor/actor.py
index <HASH>..<HASH> 100644
--- a/spinoff/actor/actor.py
+++ b/spinoff/actor/actor.py
@@ -261,8 +261,6 @@ class Actor(BaseActor):
self.exit(('error', self, (result.value, result.tb or result.getTraceback()), False))
super(Actor, self).stop()
- return d
-
def stop(self, silent=False):
self._on_stop()
super(Actor, self).stop()
|
Removed the unused returning of a Deferred in Actor.start
|
diff --git a/dist/Button.js b/dist/Button.js
index <HASH>..<HASH> 100644
--- a/dist/Button.js
+++ b/dist/Button.js
@@ -41,7 +41,8 @@ var AriaMenuButtonButton = function (_React$Component) {
case 'ArrowDown':
event.preventDefault();
if (!ambManager.isOpen) {
- ambManager.openMenu({ focusMenu: true });
+ ambManager.openMenu();
+ ambManager.focusItem(0);
} else {
ambManager.focusItem(0);
}
diff --git a/dist/createManager.js b/dist/createManager.js
index <HASH>..<HASH> 100644
--- a/dist/createManager.js
+++ b/dist/createManager.js
@@ -66,7 +66,7 @@ var protoManager = {
},
openMenu: function openMenu(openOptions) {
if (this.isOpen) return;
- openOptions = openOptions || {};
+ openOptions = openOptions || { focusMenu: true };
this.isOpen = true;
this.update();
this.focusGroup.activate();
|
adds remaining changes to let menu focus first item
|
diff --git a/glue/ligolw/ligolw.py b/glue/ligolw/ligolw.py
index <HASH>..<HASH> 100644
--- a/glue/ligolw/ligolw.py
+++ b/glue/ligolw/ligolw.py
@@ -106,7 +106,7 @@ class Element(object):
Remove a child from this element. The child element is
returned, and it's parentNode element is reset.
"""
- del self.childNodes[self.childNodes.index(child)]
+ self.childNodes.remove(child)
child.parentNode = None
return child
|
This might be a bit faster...
|
diff --git a/spec/lib/roots/engine_route_collection_spec.rb b/spec/lib/roots/engine_route_collection_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/roots/engine_route_collection_spec.rb
+++ b/spec/lib/roots/engine_route_collection_spec.rb
@@ -18,6 +18,25 @@ module Roots
it 'adds the engine name to each route' do
expect(subject.routes.all? { |route| route[:engine] == engine_name }).to eq(true)
end
+
+ context 'all an engine\'s routes are internal' do
+ it 'does not add it to the ivar' do
+ allow(fake_route).to receive(:internal?) { true }
+ expect(subject.routes).to be_empty
+ end
+ end
+
+ context 'only some of an engine\'s routes are internal' do
+ let(:another_fake_route) { instance_double(EngineRoute, internal?: false) }
+ let(:routes) { [fake_route, another_fake_route]}
+ subject { described_class.new([{engine: engine_name, routes: routes }]) }
+
+ it 'adds the engine to the ivar' do
+ expect(subject.routes).to_not be_empty
+ expect(subject.routes.all? { |r| r[:engine] == engine_name }).to eq(true)
+ expect(subject.routes.first[:routes]).to eq(routes)
+ end
+ end
end
end
end
|
More specs about how engine route collection works
|
diff --git a/server/src/main/java/io/atomix/copycat/server/state/ServerSession.java b/server/src/main/java/io/atomix/copycat/server/state/ServerSession.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/io/atomix/copycat/server/state/ServerSession.java
+++ b/server/src/main/java/io/atomix/copycat/server/state/ServerSession.java
@@ -430,11 +430,13 @@ class ServerSession implements Session {
* @return The index of the highest event acked for the session.
*/
long getLastCompleted() {
+ // If there are any queued events, return the index prior to the first event in the queue.
EventHolder event = events.poll();
if (event != null && event.eventVersion > eventAckVersion) {
return event.eventVersion - 1;
}
- return eventAckVersion;
+ // If no events are queued, return the highest index applied to the session.
+ return version;
}
/**
|
Ensure last applied index for each session is used as the last event index if no events are queued.
|
diff --git a/lib/stream/leo-stream.js b/lib/stream/leo-stream.js
index <HASH>..<HASH> 100644
--- a/lib/stream/leo-stream.js
+++ b/lib/stream/leo-stream.js
@@ -430,7 +430,7 @@ module.exports = function(configure) {
eid: rOpts.eid || obj.eid,
correlation_id: {
source: obj.event,
- start: rOpts.eid || obj.eid,
+ [rOpts.partial === true ? 'partial_start' : 'start']: rOpts.eid || obj.eid,
units: rOpts.units || obj.units || 1
}
});
|
EN-<I> - allows for setting partial_start attribute
If we pass in partial === true, then we set the partial_start attribute instead of start. This enables us to do one to many events in the enrich that we need for new lambda load listeners.
|
diff --git a/src/facebook.py b/src/facebook.py
index <HASH>..<HASH> 100644
--- a/src/facebook.py
+++ b/src/facebook.py
@@ -87,6 +87,15 @@ class GraphAPI(object):
"""Fetchs the given object from the graph."""
return self.request(id, args)
+ def get_objects(self, ids, **args):
+ """Fetchs all of the given object from the graph.
+
+ We return a map from ID to object. If any of the IDs are invalid,
+ we raise an exception.
+ """
+ args["ids"] = ",".join(ids)
+ return self.request("", args)
+
def get_connections(self, id, connection_name, **args):
"""Fetchs the connections for given object."""
return self.request(id + "/" + connection_name, args)
|
Add multi-get support to Python SDK
|
diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/jpa2lc/DummyEntity.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/jpa2lc/DummyEntity.java
index <HASH>..<HASH> 100644
--- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/jpa2lc/DummyEntity.java
+++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/jpa2lc/DummyEntity.java
@@ -27,8 +27,12 @@ import javax.persistence.Cacheable;
import javax.persistence.Entity;
import javax.persistence.Id;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
@Entity
@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
public class DummyEntity implements Serializable {
@Id
|
WFLY-<I> ClusteredJPA2LCTestCase fails intermittently
|
diff --git a/test/unit/vagrant/action/builtin/handle_forwarded_port_collisions_test.rb b/test/unit/vagrant/action/builtin/handle_forwarded_port_collisions_test.rb
index <HASH>..<HASH> 100644
--- a/test/unit/vagrant/action/builtin/handle_forwarded_port_collisions_test.rb
+++ b/test/unit/vagrant/action/builtin/handle_forwarded_port_collisions_test.rb
@@ -207,7 +207,6 @@ describe Vagrant::Action::Builtin::HandleForwardedPortCollisions do
context "with loopback address" do
let (:host_ip) { "127.1.2.40" }
- let (:addrinfo) { double("addrinfo", ipv4_loopback?: true) }
it "should check if the port is open" do
expect(instance).to receive(:is_port_open?).with(host_ip, host_port).and_return(true)
|
Remove test double
We don't actually need a test double here because `#ipv4_loopback?`
will return true for any address in the `<I>/8` space.
|
diff --git a/src/com/google/javascript/jscomp/DefaultPassConfig.java b/src/com/google/javascript/jscomp/DefaultPassConfig.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/DefaultPassConfig.java
+++ b/src/com/google/javascript/jscomp/DefaultPassConfig.java
@@ -2717,6 +2717,11 @@ public final class DefaultPassConfig extends PassConfig {
protected CompilerPass create(AbstractCompiler compiler) {
return new FlowSensitiveInlineVariables(compiler);
}
+
+ @Override
+ public FeatureSet featureSet() {
+ return ES8_MODULES;
+ }
};
/** Uses register-allocation algorithms to use fewer variables. */
|
Run flowSensitiveInlineVariables pass when language_out is ES6+.
-------------
Created by MOE: <URL>
|
diff --git a/test/nested-model.js b/test/nested-model.js
index <HASH>..<HASH> 100644
--- a/test/nested-model.js
+++ b/test/nested-model.js
@@ -493,6 +493,23 @@ $(document).ready(function() {
ok(callbackFired, "callback wasn't fired");
});
+ test("#add() on nested array should trigger 'add' event after model is updated", function() {
+ var callbackFired = false;
+ var initialLength = doc.get('addresses').length;
+ var newLength;
+
+ doc.bind('add:addresses', function(model, newAddr){
+ newLength = doc.get('addresses').length;
+ callbackFired = true;
+ });
+ doc.add('addresses', {
+ city: 'Lincoln',
+ state: 'NE'
+ });
+
+ ok(callbackFired, "callback wasn't fired");
+ equal(newLength, initialLength + 1, "array length should be incremented prior to 'add' event firing");
+ });
// ----- REMOVE --------
|
Added failing test for #<I>
|
diff --git a/src/replace.js b/src/replace.js
index <HASH>..<HASH> 100644
--- a/src/replace.js
+++ b/src/replace.js
@@ -79,13 +79,13 @@ export class Slice {
return new Slice(Fragment.fromJSON(schema, json.content), json.openStart || 0, json.openEnd || 0)
}
- // :: (Fragment) → Slice
+ // :: (Fragment, ?bool) → Slice
// Create a slice from a fragment by taking the maximum possible
// open value on both side of the fragment.
- static maxOpen(fragment) {
+ static maxOpen(fragment, openIsolating=true) {
let openStart = 0, openEnd = 0
- for (let n = fragment.firstChild; n && !n.isLeaf; n = n.firstChild) openStart++
- for (let n = fragment.lastChild; n && !n.isLeaf; n = n.lastChild) openEnd++
+ for (let n = fragment.firstChild; n && !n.isLeaf && (openIsolating || !n.type.spec.isolating); n = n.firstChild) openStart++
+ for (let n = fragment.lastChild; n && !n.isLeaf && (openIsolating || !n.type.spec.isolating); n = n.lastChild) openEnd++
return new Slice(fragment, openStart, openEnd)
}
}
|
Add an `openIsolating` argument to Slice.maxOpen
FEATURE: [`Slice.maxOpen`](##model.Slice^maxOpen) now has a second
argument that can be used to prevent it from opening isolating nodes.
|
diff --git a/modules/cmsadmin/apis/NavController.php b/modules/cmsadmin/apis/NavController.php
index <HASH>..<HASH> 100644
--- a/modules/cmsadmin/apis/NavController.php
+++ b/modules/cmsadmin/apis/NavController.php
@@ -51,7 +51,7 @@ class NavController extends \admin\base\RestController
$model = \cmsadmin\models\Property::find()->where(['admin_prop_id' => $atrs['admin_prop_id'], 'nav_id' => $navId])->one();
if ($model) {
- if (empty($atrs['value'])) {
+ if (empty($atrs['value']) && $atrs['value'] != 0) {
$model->delete();
} else {
// update
|
fixed bug where admin properties with 0 values have been deleted.
|
diff --git a/src/TextField/TextField.js b/src/TextField/TextField.js
index <HASH>..<HASH> 100644
--- a/src/TextField/TextField.js
+++ b/src/TextField/TextField.js
@@ -11,7 +11,7 @@ import TextFieldLabel from './TextFieldLabel';
import TextFieldUnderline from './TextFieldUnderline';
import warning from 'warning';
-const getStyles = (props, state) => {
+const getStyles = (props, context, state) => {
const {
baseTheme,
textField: {
@@ -23,7 +23,7 @@ const getStyles = (props, state) => {
hintColor,
errorColor,
},
- } = state.muiTheme;
+ } = context.muiTheme;
const styles = {
root: {
@@ -438,7 +438,7 @@ class TextField extends React.Component {
} = this.props;
const {prepareStyles} = this.context.muiTheme;
- const styles = getStyles(this.props, this.context);
+ const styles = getStyles(this.props, this.context, this.state);
const inputId = id || this.uniqueId;
const errorTextElement = this.state.errorText && (
|
[TextField] Fix incorrect state in getStyles()
getStyles() was reading state, from context, so dynamic styling was not being applied correctly.
|
diff --git a/config/hoe.rb b/config/hoe.rb
index <HASH>..<HASH> 100644
--- a/config/hoe.rb
+++ b/config/hoe.rb
@@ -52,6 +52,7 @@ $hoe = Hoe.spec(GEM_NAME) do |p|
p.summary = SUMMARY
p.url = HOMEPATH
p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
+ p.readme_file = "README.markdown"
p.test_globs = ["test/**/test_*.rb"]
p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store', 'classes'] #An array of file patterns to delete on clean.
|
let hoe know about the renamed readme
|
diff --git a/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
@@ -275,7 +275,7 @@ public class DynamicChannelBuffer extends AbstractChannelBuffer {
}
ChannelBuffer newBuffer = factory().getBuffer(order(), newCapacity);
- newBuffer.writeBytes(buffer, readerIndex(), readableBytes());
+ newBuffer.writeBytes(buffer, 0, writerIndex());
buffer = newBuffer;
}
}
|
Fixed a bug where a dynamic buffer's readerIndex goes out of sync on expansion
|
diff --git a/src/Chord.js b/src/Chord.js
index <HASH>..<HASH> 100644
--- a/src/Chord.js
+++ b/src/Chord.js
@@ -73,9 +73,14 @@ class ConductorChord {
this.conductor = Conductor.create(this.config.conductorConfig);
u.log(this, "Channel and conductor created? "+this.conductor!=null);
- //Set onconnection event.
+ //Set onconnection event to handle connections made to us.
this.conductor.onconnection = conn => {
- result.on("message", (a)=>{console.log(a); conn.send(a)});
+ conn.ondatachannel = dChan => {
+ dChan.on("message", (a)=>{
+ console.log(a);
+ dChan.send(a);
+ });
+ }
};
//Create a module registry, register the RPC default module.
|
Testing new ondatachannel event of conductor.
|
diff --git a/system/core/models/Language.php b/system/core/models/Language.php
index <HASH>..<HASH> 100644
--- a/system/core/models/Language.php
+++ b/system/core/models/Language.php
@@ -335,7 +335,7 @@ class Language extends Model
public function text($string, array $arguments = array(), $class = '')
{
if (empty($this->langcode)) {
- return $string;
+ return $this->formatString($string, $arguments);
}
if (empty($class)) {
|
Bug fix \core\models\Language::text()
|
diff --git a/war/resources/scripts/hudson-behavior.js b/war/resources/scripts/hudson-behavior.js
index <HASH>..<HASH> 100644
--- a/war/resources/scripts/hudson-behavior.js
+++ b/war/resources/scripts/hudson-behavior.js
@@ -284,7 +284,7 @@ function expandTextArea(button,id) {
function refreshPart(id,url) {
window.setTimeout(function() {
new Ajax.Request(url, {
- method: "get",
+ method: "post",
onComplete: function(rsp, _) {
var hist = $(id);
var p = hist.parentNode;
|
don't know if this causes a problem, but in other places GET->POST change seemed to make things work, so I'm just changing it here as a precaution.
git-svn-id: <URL>
|
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -169,15 +169,6 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
/* This abstraction maintains the token/endpoint metadata information */
private TokenMetadata tokenMetadata_ = new TokenMetadata();
- /* This thread pool does consistency checks when the client doesn't care about consistency */
- private ExecutorService consistencyManager_ = new JMXEnabledThreadPoolExecutor(DatabaseDescriptor.getConsistencyThreads(),
- DatabaseDescriptor.getConsistencyThreads(),
- StageManager.KEEPALIVE,
- TimeUnit.SECONDS,
- new LinkedBlockingQueue<Runnable>(),
- new NamedThreadFactory("ReadRepair"),
- "request");
-
private Set<InetAddress> replicatingNodes;
private InetAddress removingNode;
|
r/m unused consistencyManager executor (obsoleted by #<I>)
git-svn-id: <URL>
|
diff --git a/lib/tjbot.js b/lib/tjbot.js
index <HASH>..<HASH> 100644
--- a/lib/tjbot.js
+++ b/lib/tjbot.js
@@ -156,8 +156,8 @@ TJBot.prototype.defaultConfiguration = {
},
speak: {
language: 'en-US', // see TJBot.prototype.languages.speak
- voice: undefined // use a specific voice; if undefined, a voice is chosen based on robot.gender and speak.language
- speakerDeviceId: "plughw:0,0", // plugged-in USB card 1, device 0; see aplay -l for a list of playback devices
+ voice: undefined, // use a specific voice; if undefined, a voice is chosen based on robot.gender and speak.language
+ speakerDeviceId: "plughw:0,0" // plugged-in USB card 1, device 0; see aplay -l for a list of playback devices
},
see: {
confidenceThreshold: {
|
add support specifying speaker device id
|
diff --git a/peewee.py b/peewee.py
index <HASH>..<HASH> 100644
--- a/peewee.py
+++ b/peewee.py
@@ -560,11 +560,16 @@ class ReverseForeignRelatedObject(object):
class ForeignKeyField(IntegerField):
- field_template = '%(db_field)s NOT NULL REFERENCES "%(to_table)s" ("id")'
+ field_template = '%(db_field)s %(nullable)s REFERENCES "%(to_table)s" ("id")'
- def __init__(self, to, *args, **kwargs):
+ def __init__(self, to, null=False, *args, **kwargs):
self.to = to
+ self.null = null
kwargs['to_table'] = to._meta.db_table
+ if null:
+ kwargs['nullable'] = ''
+ else:
+ kwargs['nullable'] = 'NOT NULL'
super(ForeignKeyField, self).__init__(*args, **kwargs)
def add_to_class(self, klass, name):
|
Adding nullable fks
|
diff --git a/js/gateio.js b/js/gateio.js
index <HASH>..<HASH> 100755
--- a/js/gateio.js
+++ b/js/gateio.js
@@ -692,8 +692,7 @@ module.exports = class gateio extends Exchange {
for (let i = 0; i < response.length; i++) {
const market = response[i];
const id = this.safeString2 (market, 'id', 'name');
- const baseId = id.split ('_')[0];
- const quoteId = id.split ('_')[1];
+ const [baseId, quoteId] = id.split ('_');
const base = this.safeCurrencyCode (baseId);
const quote = this.safeCurrencyCode (quoteId);
const taker = this.safeNumber2 (market, 'fee', 'taker_fee_rate') / 100;
|
one split for gateio loadMarkets
|
diff --git a/src/rinoh/font/google.py b/src/rinoh/font/google.py
index <HASH>..<HASH> 100644
--- a/src/rinoh/font/google.py
+++ b/src/rinoh/font/google.py
@@ -106,7 +106,7 @@ def download_file(name, url):
break
f.write(buffer)
except HTTPError as e:
- if e.code == 404:
+ if e.code in (404, 403):
return None # not found
raise
return download_path
|
Google Fonts: handle <I> error
Sometimes the server returns error <I> (forbidden) instead of <I> for
an unknown reason. This happens when looking for 'Comic Sans MS', for
example.
|
diff --git a/bin/get-webpack-config.js b/bin/get-webpack-config.js
index <HASH>..<HASH> 100644
--- a/bin/get-webpack-config.js
+++ b/bin/get-webpack-config.js
@@ -1,8 +1,5 @@
const webpack = require('webpack');
const path = require('path');
-const requireFromString = require('require-from-string');
-const MemoryFS = require('memory-fs');
-const deasync = require('deasync');
// Plugins
const ExtractTextPlugin = require('extract-text-webpack-plugin');
@@ -215,6 +212,14 @@ const getWebpackConfig = (options = ({}), privateOptions = ({})) => {
* @return {String} String which contains the server rendered app
*/
getServerString = options => {
+ // Requiring dependencies here because there is no need or use while running eslint (which also imports webpack config).
+ // Some packages like `deasync` fail while running from some IDE's
+ /* eslint-disable global-require */
+ const requireFromString = require('require-from-string');
+ const MemoryFS = require('memory-fs');
+ const deasync = require('deasync');
+ /* eslint-enable global-require */
+
const { isProd } = options;
const bundlePath = path.join(rootPath, 'www', `app${isProd ? '.min' : ''}.js`);
|
Fix lints on electron based IDEs, closes #<I>
|
diff --git a/signer/api/ecdsa_hardware_crypto_service.go b/signer/api/ecdsa_hardware_crypto_service.go
index <HASH>..<HASH> 100644
--- a/signer/api/ecdsa_hardware_crypto_service.go
+++ b/signer/api/ecdsa_hardware_crypto_service.go
@@ -243,6 +243,7 @@ func sign(ctx *pkcs11.Ctx, session pkcs11.SessionHandle, pkcs11KeyID []byte, pas
// Get the SHA256 of the payload
digest := sha256.Sum256(payload)
+ fmt.Println("Please touch the attached Yubikey to perform signing.")
sig, err = ctx.Sign(session, digest[:])
if err != nil {
logrus.Debugf("Error while signing: %s", err)
|
add message when user is required to touch yubikey to sign. N.B. touch is required during Sign, not SignInit
|
diff --git a/Controller/StepController.php b/Controller/StepController.php
index <HASH>..<HASH> 100644
--- a/Controller/StepController.php
+++ b/Controller/StepController.php
@@ -110,7 +110,11 @@ class StepController extends Controller
/**
*
- * @Route("/plop/", name="innova_user_resources", options = {"expose"=true})
+ * @Route(
+ * "/step/resources",
+ * name="innova_user_resources",
+ * options = {"expose"=true}
+ * )
* @Method("GET")
*/
public function getUserResourcesAction()
@@ -123,7 +127,7 @@ class StepController extends Controller
$resources = array();
foreach ($resourceNodes as $resourceNode) {
- if(in_array( $resourceNode->getResourceType()->getId(), $resourceTypeToShow)){
+ if (in_array( $resourceNode->getResourceType()->getId(), $resourceTypeToShow)) {
$resource = new \stdClass();
$resource->id = $resourceNode->getId();
$resource->workspace = $resourceNode->getWorkspace()->getName();
|
[PathBundle] change route used to load claro resources
|
diff --git a/core/ClientController.js b/core/ClientController.js
index <HASH>..<HASH> 100644
--- a/core/ClientController.js
+++ b/core/ClientController.js
@@ -156,6 +156,8 @@ class ClientController extends EventEmitter {
this._previouslyRendered = true;
debug('React Rendered');
this.emit('render');
+ }).catch((err) => {
+ debug("Error while rendering.", err);
});
}
diff --git a/core/renderMiddleware.js b/core/renderMiddleware.js
index <HASH>..<HASH> 100644
--- a/core/renderMiddleware.js
+++ b/core/renderMiddleware.js
@@ -220,6 +220,8 @@ function writeBody(req, res, context, start, page) {
// reduce is called length - 1 times. we need to call one final time here to make sure we
// chain the final promise.
renderElement(res, element, context, elementPromises.length - 1);
+ }).catch((err) => {
+ debug("Error while rendering", err);
});
}
|
Triton API Refactor: Added some tests for promises of ReactElement
|
diff --git a/OpenPNM/__init__.py b/OpenPNM/__init__.py
index <HASH>..<HASH> 100644
--- a/OpenPNM/__init__.py
+++ b/OpenPNM/__init__.py
@@ -54,7 +54,7 @@ import scipy as _sp
if _sys.version_info < (3, 4):
raise Exception('OpenPNM requires Python 3.4 or greater to run')
-__version__ = '1.6.2'
+__version__ = '1.7.0'
from . import Base
from . import Network
|
Bumping version number to <I>
|
diff --git a/src/com/mebigfatguy/fbcontrib/detect/PossibleConstantAllocationInLoop.java b/src/com/mebigfatguy/fbcontrib/detect/PossibleConstantAllocationInLoop.java
index <HASH>..<HASH> 100755
--- a/src/com/mebigfatguy/fbcontrib/detect/PossibleConstantAllocationInLoop.java
+++ b/src/com/mebigfatguy/fbcontrib/detect/PossibleConstantAllocationInLoop.java
@@ -277,7 +277,7 @@ public class PossibleConstantAllocationInLoop extends BytecodeScanningDetector {
if (offsets.length > 0) {
int top = getPC();
int bottom = top + offsets[offsets.length - 1];
- SwitchInfo switchInfo = new SwitchInfo(top, bottom);
+ SwitchInfo switchInfo = new SwitchInfo(bottom);
switchInfos.add(switchInfo);
}
break;
@@ -344,11 +344,9 @@ public class PossibleConstantAllocationInLoop extends BytecodeScanningDetector {
}
static class SwitchInfo {
- int switchTop;
int switchBottom;
- public SwitchInfo(int top, int bottom) {
- switchTop = top;
+ public SwitchInfo(int bottom) {
switchBottom = bottom;
}
}
|
Github #<I> drop unread field
|
diff --git a/treetime/clock_tree.py b/treetime/clock_tree.py
index <HASH>..<HASH> 100644
--- a/treetime/clock_tree.py
+++ b/treetime/clock_tree.py
@@ -476,7 +476,7 @@ class ClockTree(TreeAnc):
LH -= node.branch_length_interpolator(node.branch_length)
# add the root sequence LH and return
- if self.aln:
+ if self.aln and self.sequence_reconstruction:
LH += self.gtr.sequence_logLH(self.tree.root.cseq, pattern_multiplicity=self.data.multiplicity)
return LH
|
only add sequence LH to total if reconstruction has been performed
|
diff --git a/library/Phrozn/Site/View/Base.php b/library/Phrozn/Site/View/Base.php
index <HASH>..<HASH> 100644
--- a/library/Phrozn/Site/View/Base.php
+++ b/library/Phrozn/Site/View/Base.php
@@ -90,6 +90,12 @@ abstract class Base
private $siteConfig;
/**
+ * Loaded content of configs/phrozn.yml
+ * @var array
+ */
+ private $appConfig;
+
+ /**
* Initialize page
*
* @param string $inputFile Path to page source file
@@ -302,6 +308,7 @@ abstract class Base
{
$params['page'] = $this->getFrontMatter();
$params['site'] = $this->getSiteConfig();
+ $params['phr'] = $this->getAppConfig();
// also create merged configuration
if (isset($params['page'], $params['site'])) {
$params['this'] = array_merge($params['page'], $params['site']);
@@ -509,4 +516,14 @@ abstract class Base
}
return $this->source;
}
+
+ private function getAppConfig()
+ {
+ if (null === $this->appConfig) {
+ $path = dirname(__FILE__) . '/../../../../configs/phrozn.yml';
+ $this->appConfig = Yaml::load(file_get_contents($path));
+ }
+
+ return $this->appConfig;
+ }
}
|
Added phr section to exposed global vars
|
diff --git a/lib/infograph.js b/lib/infograph.js
index <HASH>..<HASH> 100644
--- a/lib/infograph.js
+++ b/lib/infograph.js
@@ -95,6 +95,9 @@ class InfoGraph {
addEdge(fromId, toId) {
+ if (!fromId || !toId)
+ throw new Error(`Cannot add edge from ${fromId} to ${toId}`)
+
const edges = this.adjacencyList[fromId] || new Set()
edges.add(toId)
this.adjacencyList[fromId] = edges
|
InfoGraph#addEdge: throws errors when information is missing
|
diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
@@ -373,7 +373,7 @@ define([
{
nls: 'javascript/nls/messages', //$NON-NLS-0$
name: 'jsHover',
- contentType: ["application/javascript", "text/html"] //$NON-NLS-0$ //$NON-NLS-1$
+ contentType: ["application/javascript"] //$NON-NLS-0$ //$NON-NLS-1$
});
provider.registerService("orion.edit.contentassist", new ContentAssist.JSContentAssist(astManager), //$NON-NLS-0$
|
[nobug] remove accidental addition to hook JS hover to HTML files
|
diff --git a/src/Valkyrja/View/Templates/Template.php b/src/Valkyrja/View/Templates/Template.php
index <HASH>..<HASH> 100644
--- a/src/Valkyrja/View/Templates/Template.php
+++ b/src/Valkyrja/View/Templates/Template.php
@@ -18,7 +18,6 @@ use Valkyrja\View\Template as Contract;
use Valkyrja\View\View;
use function array_merge;
-use function count;
use function htmlentities;
use const ENT_QUOTES;
@@ -247,15 +246,11 @@ class Template implements Contract
*/
public function endBlock(): void
{
- $lastCount = count($this->blockStatus) - 1;
- $block = $this->blockStatus[$lastCount];
-
- unset($this->blockStatus[$lastCount]);
-
- if ($lastCount === 0) {
- $this->blockStatus = [];
- }
-
+ // Get the last item in the array (newest block to close)
+ $block = end($this->blockStatus);
+ // Remove the last item in the array (as we are now closing it out)
+ array_pop($this->blockStatus);
+ // Render the block and set the value in the blocks array
$this->blocks[$block] = $this->engine->endRender();
}
|
View: Fix bug with blocks' endBlock functionality.
|
diff --git a/cfpiva.js b/cfpiva.js
index <HASH>..<HASH> 100644
--- a/cfpiva.js
+++ b/cfpiva.js
@@ -44,7 +44,8 @@ cfpiva.controllaPIVA = function (piva, callback) {
if (piva == '') return '';
if (piva.length != 11)
return formatReturn(false, 'La lunghezza della partita IVA non è corretta: la partita IVA dovrebbe essere lunga esattamente 11 caratteri.', callback);
- var validi = '0123456789';
+ var validi, i, s, c;
+ validi = '0123456789';
for (i = 0; i < 11; i++) {
if (validi.indexOf(piva.charAt(i)) == -1)
return formatReturn(false, 'La partita IVA contiene un carattere non valido \'' + piva.charAt(i) + '\'. I caratteri validi sono solo cifre.', callback);
|
declaring undeclared vars
fix #3
|
diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index <HASH>..<HASH> 100755
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -205,6 +205,8 @@ END
return node, index
end
+ node.line = @line
+
if node.is_a? Tree::CommentNode
while has_children
line, index = raw_next_line(index)
@@ -253,11 +255,9 @@ END
if c.is_a?(Tree::DirectiveNode)
raise SyntaxError.new("Import directives may only be used at the root of a document.", @line)
end
- c.line = @line
parent << c
end
when Tree::Node
- child.line = @line
parent << child
end
end
|
Fix a line-numbering error error in Sass.
Reported by Mike Judge. Thanks, Mike!
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.