diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/Migrator.php b/src/Migrator.php
index <HASH>..<HASH> 100644
--- a/src/Migrator.php
+++ b/src/Migrator.php
@@ -42,6 +42,20 @@ class Migrator
}
/**
+ * Load migrations from the specified directory.
+ *
+ * @param string $directory
+ */
+ public function loadMigrations($directory)
+ {
+ foreach (scandir($directory) as $file) {
+ if ($file !== '.' && $file !== '..') {
+ require "{$directory}/{$file}";
+ }
+ }
+ }
+
+ /**
* Handles the execution of migrations.
*
* @param string $direction
|
Add method to load migrations from a directory.
|
diff --git a/lxd/db/certificates.go b/lxd/db/certificates.go
index <HASH>..<HASH> 100644
--- a/lxd/db/certificates.go
+++ b/lxd/db/certificates.go
@@ -162,7 +162,7 @@ func (c *Cluster) CreateCertificate(cert Certificate) (int64, error) {
// DeleteCertificate deletes a certificate from the db.
func (c *Cluster) DeleteCertificate(fingerprint string) error {
err := c.Transaction(func(tx *ClusterTx) error {
- return tx.DeleteCertificate(fingerprint)
+ return tx.DeleteCertificate(CertificateFilter{Fingerprint: fingerprint})
})
return err
}
|
lxd/db/certificates: use Filter as parameter for delete
|
diff --git a/message.go b/message.go
index <HASH>..<HASH> 100644
--- a/message.go
+++ b/message.go
@@ -288,13 +288,14 @@ type MessageAllowedMentions struct {
// A MessageAttachment stores data for message attachments.
type MessageAttachment struct {
- ID string `json:"id"`
- URL string `json:"url"`
- ProxyURL string `json:"proxy_url"`
- Filename string `json:"filename"`
- Width int `json:"width"`
- Height int `json:"height"`
- Size int `json:"size"`
+ ID string `json:"id"`
+ URL string `json:"url"`
+ ProxyURL string `json:"proxy_url"`
+ Filename string `json:"filename"`
+ Width int `json:"width"`
+ Height int `json:"height"`
+ Size int `json:"size"`
+ Ephemeral bool `json:"ephemeral"`
}
// MessageEmbedFooter is a part of a MessageEmbed struct.
|
feat: ephemeral attachments (#<I>)
|
diff --git a/src/main/resources/META-INF/resources/primefaces/core/core.js b/src/main/resources/META-INF/resources/primefaces/core/core.js
index <HASH>..<HASH> 100644
--- a/src/main/resources/META-INF/resources/primefaces/core/core.js
+++ b/src/main/resources/META-INF/resources/primefaces/core/core.js
@@ -307,9 +307,9 @@
//aria
if(input.is(':not([type="password"])')) {
input.attr('role', 'textbox')
- .attr('aria-disabled', input.is(':disabled'))
.attr('aria-readonly', input.prop('readonly'));
}
+ input.attr('aria-disabled', input.is(':disabled'));
if(input.is('textarea')) {
input.attr('aria-multiline', true);
|
Fix #<I>: Remove ARIA from password
|
diff --git a/generator/lib/builder/om/PHP5ObjectBuilder.php b/generator/lib/builder/om/PHP5ObjectBuilder.php
index <HASH>..<HASH> 100644
--- a/generator/lib/builder/om/PHP5ObjectBuilder.php
+++ b/generator/lib/builder/om/PHP5ObjectBuilder.php
@@ -3254,7 +3254,7 @@ abstract class ".$this->getClassname()." extends ".$parentClass." ";
* @return $className The associated $className object.
* @throws PropelException
*/
- public function get".$this->getFKPhpNameAffix($fk, $plural = false)."(PropelPDO \$con = null, \$doQuery)
+ public function get".$this->getFKPhpNameAffix($fk, $plural = false)."(PropelPDO \$con = null, \$doQuery = true)
{";
$script .= "
if (\$this->$varName === null && ($conditional) && \$doQuery) {";
|
Added the missing default from patching
|
diff --git a/lib/buffer.js b/lib/buffer.js
index <HASH>..<HASH> 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -6,11 +6,12 @@
module.exports = {
/**
- * [indexOf description]
+ * Returns the index of the first occurrence of the specified byte sequence,
+ * returns -1 if the value is not found.
*
- * @param {[type]} needle [description]
- * @param {[type]} haystack [description]
- * @return {[type]} [description]
+ * @param {[type]} needle
+ * @param {[type]} haystack
+ * @return {[type]}
*/
indexOf: function( needle, haystack ) {
@@ -39,11 +40,12 @@ module.exports = {
},
/**
- * [split description]
+ * Splits a Buffer object into an array of buffers
+ * by separating the Buffer into subbuffers.
*
- * @param {[type]} needle [description]
- * @param {[type]} haystack [description]
- * @return {[type]} [description]
+ * @param {[type]} needle
+ * @param {[type]} haystack
+ * @return {[type]}
*/
split: function( needle, haystack ) {
|
Updated doc blocks in lib/buffer.js
|
diff --git a/salt/states/file.py b/salt/states/file.py
index <HASH>..<HASH> 100644
--- a/salt/states/file.py
+++ b/salt/states/file.py
@@ -3672,10 +3672,11 @@ def blockreplace(
if changes:
ret['pchanges'] = {'diff': changes}
if __opts__['test']:
+ ret['changes']['diff'] = ret['pchanges']['diff']
ret['result'] = None
ret['comment'] = 'Changes would be made'
else:
- ret['changes'] = {'diff': changes}
+ ret['changes']['diff'] = ret['pchanges']['diff']
ret['result'] = True
ret['comment'] = 'Changes were made'
else:
|
show chanages in file.blockreplace function in testing mode.
also used same programming style as in file.managed function:
(ret['changes']['diff'] = ret['pchanges']['diff'])
|
diff --git a/plexapi/gdm.py b/plexapi/gdm.py
index <HASH>..<HASH> 100644
--- a/plexapi/gdm.py
+++ b/plexapi/gdm.py
@@ -59,7 +59,7 @@ class GDM:
'Resource-Identifier': '646ab0aa8a01c543e94ba975f6fd6efadc36b7',
'Updated-At': '1585769946',
'Version': '1.18.8.2527-740d4c206',
- },
+ },
'from': ('10.10.10.100', 32414)}]
Clients:
@@ -74,7 +74,7 @@ class GDM:
'Protocol-Version': '1',
'Resource-Identifier': 'b6e57a3f-e0f8-494f-8884-f4b58501467e',
'Version': '1.1.0',
- },
+ },
'from': ('10.10.10.101', 32412)}]
"""
|
Update gdm.py
|
diff --git a/fabfile.py b/fabfile.py
index <HASH>..<HASH> 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -52,6 +52,7 @@ def check():
@task
def test_backend(backend, domain, config_path=''):
username1 = 'example'
+ jid1 = '%s@%s' % (username1, domain)
password1 = 'foobar'
password2 = 'barfoo'
@@ -79,8 +80,9 @@ def test_backend(backend, domain, config_path=''):
try:
ret = backend.get_last_activity(username1, domain)
error('get_last_activity did not raise UserNotFound: %s' % ret)
- except UserNotFound:
- pass
+ except UserNotFound as e:
+ if str(e) != jid1:
+ error('UserNotFound from get_last_activity did not match "%s": "%s"' % (jid1, str(e)))
try:
backend.set_password(username1, domain, password1)
error('set_password() did not raise UserNotFound.')
|
test str representation from UserNotFound
|
diff --git a/app/bootstrap.php b/app/bootstrap.php
index <HASH>..<HASH> 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -1,9 +1,9 @@
<?php
if (!defined( 'BOLT_PROJECT_ROOT_DIR')) {
- if (substr(__DIR__, -28) == '/vendor/bolt/bolt/app') { // installed bolt with composer
+ if (substr(__DIR__, -21) == '/vendor/bolt/bolt/app') { // installed bolt with composer
define('BOLT_COMPOSER_INSTALLED', true);
- define('BOLT_PROJECT_ROOT_DIR', substr(__DIR__, 0, -28));
+ define('BOLT_PROJECT_ROOT_DIR', substr(__DIR__, 0, -21));
define('BOLT_WEB_DIR', BOLT_PROJECT_ROOT_DIR.'/web');
define('BOLT_CONFIG_DIR', BOLT_PROJECT_ROOT_DIR.'/config');
} else {
|
Fix substr with shorter name now
|
diff --git a/benchmark/virtual_machine.rb b/benchmark/virtual_machine.rb
index <HASH>..<HASH> 100644
--- a/benchmark/virtual_machine.rb
+++ b/benchmark/virtual_machine.rb
@@ -1,4 +1,4 @@
-# This benchmarks 500 runs of the VM and outputs them to the console making it
+# This benchmarks N runs of the VM and outputs them to the console making it
# easy to pass the data to tools such as `ministat`
# (http://www.freebsd.org/cgi/man.cgi?ministat).
|
Corrected the docs of the VM benchmark.
|
diff --git a/packages/gestalt-datepicker/rollup.config.js b/packages/gestalt-datepicker/rollup.config.js
index <HASH>..<HASH> 100644
--- a/packages/gestalt-datepicker/rollup.config.js
+++ b/packages/gestalt-datepicker/rollup.config.js
@@ -33,7 +33,7 @@ const rollupConfig = {
sourcemap: 'inline',
},
],
- external: ['react', 'classnames/bind', 'classnames', 'react-dom', 'react-datepicker'],
+ external: ['react', 'classnames/bind', 'classnames', 'react-dom', 'react-datepicker', 'gestalt'],
plugins: plugins('gestalt-datepicker'),
};
|
Internal: add "gestalt" as external dependency for "gestalt-datepicker" (#<I>)
|
diff --git a/lattice_mc/atom.py b/lattice_mc/atom.py
index <HASH>..<HASH> 100644
--- a/lattice_mc/atom.py
+++ b/lattice_mc/atom.py
@@ -57,6 +57,9 @@ class Atom:
@property
def site( self ):
+ """
+ Get or set `self.site` for this `Atom`.
+ """
return self._site
@site.setter
|
Added docstring to Atom.site
|
diff --git a/salt/states/eselect.py b/salt/states/eselect.py
index <HASH>..<HASH> 100644
--- a/salt/states/eselect.py
+++ b/salt/states/eselect.py
@@ -45,6 +45,7 @@ def set_(name, target, parameter=None, module_parameter=None, action_parameter=N
parameter
additional params passed to the defined action
+
.. deprecated:: Lithium
'''
diff --git a/salt/states/rabbitmq_vhost.py b/salt/states/rabbitmq_vhost.py
index <HASH>..<HASH> 100644
--- a/salt/states/rabbitmq_vhost.py
+++ b/salt/states/rabbitmq_vhost.py
@@ -45,6 +45,7 @@ def present(name,
VHost name
user
Initial user permission to set on the VHost, if present
+
.. deprecated:: Beryllium
owner
Initial owner permission to set on the VHost, if present
@@ -58,6 +59,7 @@ def present(name,
Defaults to .*
runas
Name of the user to run the command
+
.. deprecated:: Beryllium
'''
ret = {'name': name, 'result': True, 'comment': '', 'changes': {}}
@@ -154,6 +156,7 @@ def absent(name,
Name of the Virtual Host to remove
runas
User to run the command
+
.. deprecated:: Beryllium
'''
if runas:
|
Blank line before '.. deprecated::' required.
|
diff --git a/apiserver/server_test.go b/apiserver/server_test.go
index <HASH>..<HASH> 100644
--- a/apiserver/server_test.go
+++ b/apiserver/server_test.go
@@ -283,14 +283,7 @@ func dialWebsocket(c *gc.C, addr, path string, tlsVersion uint16) (*websocket.Co
func (s *serverSuite) TestMinTLSVersion(c *gc.C) {
loggo.GetLogger("juju.apiserver").SetLogLevel(loggo.TRACE)
- listener, err := net.Listen("tcp", ":0")
- c.Assert(err, jc.ErrorIsNil)
- srv, err := apiserver.NewServer(s.State, listener, apiserver.ServerConfig{
- Cert: []byte(coretesting.ServerCert),
- Key: []byte(coretesting.ServerKey),
- Tag: names.NewMachineTag("0"),
- })
- c.Assert(err, jc.ErrorIsNil)
+ srv := newServer(c, s.State)
defer srv.Stop()
// We have to use 'localhost' because that is what the TLS cert says.
|
apiserver: fix test to stop writing to source dir
One of the tests was failing to override the log
directory, and so was writing to the source dir.
|
diff --git a/inspire_dojson/hep/rules/bd5xx.py b/inspire_dojson/hep/rules/bd5xx.py
index <HASH>..<HASH> 100644
--- a/inspire_dojson/hep/rules/bd5xx.py
+++ b/inspire_dojson/hep/rules/bd5xx.py
@@ -232,10 +232,10 @@ def license(self, key, value):
return MATERIAL_MAP.get(value.get('3'))
return {
- 'license': _get_license(value),
'imposing': value.get('b'),
- 'url': value.get('u'),
+ 'license': _get_license(value),
'material': _get_material(value),
+ 'url': value.get('u'),
}
|
hep: refactor license
|
diff --git a/src/parsers/RuleSet.php b/src/parsers/RuleSet.php
index <HASH>..<HASH> 100644
--- a/src/parsers/RuleSet.php
+++ b/src/parsers/RuleSet.php
@@ -49,12 +49,12 @@ class RuleSet extends PropertySet {
* @return \csslib\Selector
*/
public static function parseSelector($text){
- $text = preg_replace('/(\>)\s+/is', '>', $text);
+ $text = preg_replace('/(\>|\+|~)\s+/is', '$1', $text);
$selector = null;
foreach(preg_split('/\s+/', $text, -1, PREG_SPLIT_NO_EMPTY) as $part){
- if(!preg_match('/^([\>\+~]?)([^ >]+)$/is', $part, $matches)) throw new \Exception("Invalid selector part '$part'");
+ if(!preg_match('/^([\>\+~]?)([^ >\+~]+)$/is', $part, $matches)) throw new \Exception("Invalid selector part '$part'");
$selector = $selector ? $selector->add($matches[1] ? $matches[1] : false) : Selector::create();
|
Fix for parsing ~ and + sibling selectors
|
diff --git a/java/com/facebook/soloader/UnpackingSoSource.java b/java/com/facebook/soloader/UnpackingSoSource.java
index <HASH>..<HASH> 100644
--- a/java/com/facebook/soloader/UnpackingSoSource.java
+++ b/java/com/facebook/soloader/UnpackingSoSource.java
@@ -42,6 +42,11 @@ public abstract class UnpackingSoSource extends DirectorySoSource {
mContext = context;
}
+ protected UnpackingSoSource(Context context, File storePath) {
+ super(storePath, RESOLVE_DEPENDENCIES);
+ mContext = context;
+ }
+
public static File getSoStorePath(Context context, String name) {
return new File(context.getApplicationInfo().dataDir + "/" + name);
}
|
allow specifying a directory when unpacking so files
Summary: we want to ensure the native libraries are co-located with other module code for separability and easy cleanup
Reviewed By: JamieEi
Differential Revision: D<I>
fbshipit-source-id: <I>bee<I>f9d<I>b3c<I>c2e<I>a0a4f0b5
|
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
index <HASH>..<HASH> 100644
--- a/pandas/core/frame.py
+++ b/pandas/core/frame.py
@@ -4546,7 +4546,7 @@ class DataFrame(NDFrame):
def all(self, axis=0, bool_only=None, skipna=True, level=None):
"""
- Return whether any element is True over requested axis.
+ Return whether all elements are True over requested axis.
%(na_action)s
Parameters
|
Fixed DataFrame.any() docstring
Used to be the same as DataFrame.all
|
diff --git a/app/js/controllers.js b/app/js/controllers.js
index <HASH>..<HASH> 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -7,4 +7,4 @@ MyCtrl1.$inject = [];
function MyCtrl2() {
}
-MyCtrl1.$inject = [];
+MyCtrl2.$inject = [];
|
fix typo in controllers.js placeholder code
|
diff --git a/annis-gui/src/main/java/annis/gui/controlpanel/CorpusListPanel.java b/annis-gui/src/main/java/annis/gui/controlpanel/CorpusListPanel.java
index <HASH>..<HASH> 100644
--- a/annis-gui/src/main/java/annis/gui/controlpanel/CorpusListPanel.java
+++ b/annis-gui/src/main/java/annis/gui/controlpanel/CorpusListPanel.java
@@ -75,7 +75,7 @@ import org.slf4j.LoggerFactory;
*
* @author thomas
*/
-public class CorpusListPanel extends CssLayout implements
+public class CorpusListPanel extends VerticalLayout implements
AbstractSelect.NewItemHandler, Action.Handler
{
@@ -282,6 +282,9 @@ public class CorpusListPanel extends CssLayout implements
selectionLayout.setComponentAlignment(btReload, Alignment.MIDDLE_RIGHT);
tblCorpora.setSortContainerPropertyId("name");
+
+ setExpandRatio(tblCorpora, 1.0f);
+
updateCorpusSetList(true);
}
|
CssLayout was causing problems, revert to VerticalLayout
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ setup(
packages=['sanic'],
platforms='any',
install_requires=[
- #'uvloop>=0.5.3',
+ 'uvloop>=0.5.3',
'httptools>=0.0.9',
'ujson>=1.35',
],
|
Fuck it, uvloop is required
httptools already requires compilation, so why not include uvloop
|
diff --git a/webapps/ui/cockpit/plugins/base/app/views/processesDashboard/process-definitions.js b/webapps/ui/cockpit/plugins/base/app/views/processesDashboard/process-definitions.js
index <HASH>..<HASH> 100644
--- a/webapps/ui/cockpit/plugins/base/app/views/processesDashboard/process-definitions.js
+++ b/webapps/ui/cockpit/plugins/base/app/views/processesDashboard/process-definitions.js
@@ -56,7 +56,7 @@ module.exports = [ 'ViewsProvider', function(ViewsProvider) {
latest: true
}, function(err, data) {
$scope.processDefinitionData = data.items;
- $scope.processDefinitionsCount = data.items.length;
+ $scope.processDefinitionsCount = data.count;
if (err) {
$scope.loadingState = 'ERROR';
}
|
chore(cockpit): change data source of count for process definitions.
|
diff --git a/fiesta.py b/fiesta.py
index <HASH>..<HASH> 100644
--- a/fiesta.py
+++ b/fiesta.py
@@ -1,7 +1,7 @@
import base64, json, urllib2
-api_client_id = "To3-IKknn36qAAAA"
-api_client_secret = "46d028xWl8zXGa3GCOYJMeXlr5pUebCNZcz3SCJj"
+api_client_id = "Send an email to Fiesta.cc to get an API ID/Secret"
+api_client_secret = ""
basic_auth = base64.b64encode("%s:%s" % (api_client_id, api_client_secret))
def _create_and_send_request(uri, api_inputs):
|
remove the dead client credentials from the fiesta file
|
diff --git a/salt/version.py b/salt/version.py
index <HASH>..<HASH> 100644
--- a/salt/version.py
+++ b/salt/version.py
@@ -559,7 +559,7 @@ def dependency_information(include_salt_cloud=False):
('cffi', 'cffi', '__version__'),
('pycparser', 'pycparser', '__version__'),
('gitdb', 'gitdb', '__version__'),
- ('gitpython', 'gitpython', '__version__'),
+ ('gitpython', 'git', '__version__'),
('python-gnupg', 'gnupg', '__version__'),
('mysql-python', 'MySQLdb', '__version__'),
('cherrypy', 'cherrypy', '__version__'),
|
Fix version reporting of gitpython
The module is called `git`, not `gitpython`.
Without this, the version for `gitpython` will not show up with
`salt-call --versions-report`.
|
diff --git a/roaring/roaring.go b/roaring/roaring.go
index <HASH>..<HASH> 100644
--- a/roaring/roaring.go
+++ b/roaring/roaring.go
@@ -1328,10 +1328,15 @@ func (c *container) Optimize() {
}
} else if c.isBitmap() {
runs := c.bitmapCountRuns()
- if runs < 2048 {
+ if runs < RunMaxSize {
c.bitmapToRun()
}
+ } else if c.isRun() {
+ if len(c.runs) > RunMaxSize {
+ c.runToBitmap()
+ }
}
+
}
func (c *container) arrayContains(v uint32) bool {
|
extended bitmap.optimize() to look at run containers
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -258,12 +258,14 @@ module.exports = (api, options) => {
removeArg('--dashboard', 1, rawArgs)
removeArg('--debug', 1, rawArgs)
removeArg('--headless', 1, rawArgs)
+ removeArg('--https', 1, rawArgs)
// Run the serve command
const server = await api.service.run('serve', {
_: [],
// Use dashboard if called from ui
- dashboard: args.dashboard
+ dashboard: args.dashboard,
+ https: args.https
})
const outputDir = pluginOptions.outputDir || 'dist_electron'
|
feat(serve): support https cli arg, fixes #<I>
|
diff --git a/chef/lib/chef/index_queue/indexable.rb b/chef/lib/chef/index_queue/indexable.rb
index <HASH>..<HASH> 100644
--- a/chef/lib/chef/index_queue/indexable.rb
+++ b/chef/lib/chef/index_queue/indexable.rb
@@ -51,10 +51,10 @@ class Chef
end
with_metadata["type"] ||= self.index_object_type
- with_metadata["id"] ||= self.index_id
+ with_metadata["id"] ||= (self.index_id || UUIDTools::UUID.random_create.to_s)
with_metadata["item"] ||= self
- raise ArgumentError, "Must supply type and id to index object" if (with_metadata["id"].nil? or with_metadata["type"].nil?)
+ Chef::Log.warn("Type or Id missing in index operation") if (with_metadata["id"].nil? or with_metadata["type"].nil?)
with_metadata
end
|
adding auto-create of item id back to indexer and added log warning
|
diff --git a/libnetwork/endpoint_info.go b/libnetwork/endpoint_info.go
index <HASH>..<HASH> 100644
--- a/libnetwork/endpoint_info.go
+++ b/libnetwork/endpoint_info.go
@@ -181,6 +181,9 @@ type tableEntry struct {
}
func (ep *endpoint) Info() EndpointInfo {
+ if ep.sandboxID != "" {
+ return ep
+ }
n, err := ep.getNetworkFromStore()
if err != nil {
return nil
|
Trust the endpoint state if we have a valid sandbox-id
|
diff --git a/tools/dependencyValidator.js b/tools/dependencyValidator.js
index <HASH>..<HASH> 100644
--- a/tools/dependencyValidator.js
+++ b/tools/dependencyValidator.js
@@ -48,6 +48,9 @@ requests.forEach(/** @param {string} request */ request => {
const scripts = funcs.findScripts(`src/request/${request}/index.html`);
// console.log("scripts:", scripts);
+ const webJsIndex = scripts.indexOf('../../../node_modules/@nimiq/core-web/web.js');
+ if (webJsIndex > -1) scripts[webJsIndex] = '../../../node_modules/@nimiq/core-web/web-offline.js';
+
// Find missing and unneeded scripts
const unneededScripts = scripts.slice();
const missingScripts = relativeDepsPaths.filter(depPath => {
|
Fix dependency check for full core-web/web.js script
|
diff --git a/src/phonetics/alpha-sis.js b/src/phonetics/alpha-sis.js
index <HASH>..<HASH> 100644
--- a/src/phonetics/alpha-sis.js
+++ b/src/phonetics/alpha-sis.js
@@ -130,7 +130,6 @@ export default function alphaSis(name) {
throw Error('talisman/phonetics/alpha-sis: the given name is not a string.');
name = deburr(name)
- .replace(/ß/g, 'SS')
.toUpperCase()
.replace(/[^A-Z]/g, '');
diff --git a/src/phonetics/fuzzy-soundex.js b/src/phonetics/fuzzy-soundex.js
index <HASH>..<HASH> 100644
--- a/src/phonetics/fuzzy-soundex.js
+++ b/src/phonetics/fuzzy-soundex.js
@@ -71,7 +71,6 @@ export default function fuzzySoundex(name) {
// Deburring the string & dropping any non-alphabetical character
name = deburr(name)
.toUpperCase()
- .replace(/ß/g, 'SS')
.replace(/[^A-Z]/g, '');
// Applying some substitutions for beginnings
|
Dropping ß replacement when already using the deburr function
|
diff --git a/abilian/web/assets/__init__.py b/abilian/web/assets/__init__.py
index <HASH>..<HASH> 100644
--- a/abilian/web/assets/__init__.py
+++ b/abilian/web/assets/__init__.py
@@ -44,7 +44,8 @@ def requirejs_config():
RESOURCES_DIR = pkg_resources.resource_filename('abilian.web', 'resources')
-JQUERY = Bundle('jquery/js/jquery-1.12.4.js')
+JQUERY = Bundle('jquery/js/jquery-1.11.3.js',
+ 'jquery/js/jquery-migrate-1.2.1.js')
BOOTBOX_JS = Bundle('bootbox/bootbox.js')
|
Rollback jquery upgrade for now.
|
diff --git a/nnet/sync/tests.py b/nnet/sync/tests.py
index <HASH>..<HASH> 100644
--- a/nnet/sync/tests.py
+++ b/nnet/sync/tests.py
@@ -173,7 +173,7 @@ class Test(unittest.TestCase):
self.templateDynamicSimulationClusterParameter(20, 4);
def testDynamicSimulationClusterParameter6(self):
- self.templateDynamicSimulationClusterParameters(20, 6);
+ self.templateDynamicSimulationClusterParameter(20, 6);
if __name__ == "__main__":
|
[nnet.sync] Fix of test
|
diff --git a/sqlg-core/src/main/java/org/umlg/sqlg/sql/parse/WhereClause.java b/sqlg-core/src/main/java/org/umlg/sqlg/sql/parse/WhereClause.java
index <HASH>..<HASH> 100644
--- a/sqlg-core/src/main/java/org/umlg/sqlg/sql/parse/WhereClause.java
+++ b/sqlg-core/src/main/java/org/umlg/sqlg/sql/parse/WhereClause.java
@@ -135,6 +135,7 @@ public class WhereClause {
} else if (p.getBiPredicate() instanceof Existence) {
result += prefix + "." + sqlgGraph.getSqlDialect().maybeWrapInQoutes(hasContainer.getKey());
result += " " + p.getBiPredicate().toString();
+ return result;
} else if (p.getBiPredicate() instanceof ArrayContains) {
prefix += "." + sqlgGraph.getSqlDialect().maybeWrapInQoutes(hasContainer.getKey());
result += sqlgGraph.getSqlDialect().getArrayContainsQueryText(prefix);
|
fix minor bug where return statement was deleted.
|
diff --git a/dic/container.py b/dic/container.py
index <HASH>..<HASH> 100644
--- a/dic/container.py
+++ b/dic/container.py
@@ -44,9 +44,9 @@ class _ConstructorRegistration(_ComponentRegistration):
# map of argument name -> argument type
self.argument_types = {}
- self.__inspect_constructor()
+ self._inspect_constructor()
- def __find_constructor(self):
+ def _find_constructor(self):
"""
Finds the constructor from the class_type.
:return: The constructor function.
@@ -65,8 +65,8 @@ class _ConstructorRegistration(_ComponentRegistration):
# No explicit __init__
return None
- def __inspect_constructor(self):
- constructor = self.__find_constructor()
+ def _inspect_constructor(self):
+ constructor = self._find_constructor()
if constructor is not None:
self.argument_types = constructor.__annotations__
|
Removes double underscore prefix for some 'private' methods
|
diff --git a/test/ios-plist-install.js b/test/ios-plist-install.js
index <HASH>..<HASH> 100644
--- a/test/ios-plist-install.js
+++ b/test/ios-plist-install.js
@@ -74,12 +74,12 @@ exports['should install webless plugin'] = function (test) {
exports['should move the js file'] = function (test) {
var pluginsPath = path.join(test_dir, 'plugins');
var wwwPath = path.join(test_dir, 'projects', 'ios-plist', 'www');
+ var jsPath = path.join(test_dir, 'projects', 'ios-plist', 'www', 'plugins', 'com.phonegap.plugins.childbrowser', 'www', 'childbrowser.js');
// run the platform-specific function
ios.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et, { APP_ID: 12345 });
plugin_loader.handlePrepare(test_project_dir, pluginsPath, wwwPath, 'ios');
-
- var jsPath = path.join(test_dir, 'projects', 'ios-plist', 'www', 'childbrowser.js');
+
test.ok(fs.existsSync(jsPath));
test.ok(fs.statSync(jsPath).isFile());
test.done();
|
Fixed ios plist install with moving js file
|
diff --git a/jre_emul/Classes/com/google/j2objc/net/IosHttpURLConnection.java b/jre_emul/Classes/com/google/j2objc/net/IosHttpURLConnection.java
index <HASH>..<HASH> 100644
--- a/jre_emul/Classes/com/google/j2objc/net/IosHttpURLConnection.java
+++ b/jre_emul/Classes/com/google/j2objc/net/IosHttpURLConnection.java
@@ -346,7 +346,6 @@ public class IosHttpURLConnection extends HttpURLConnection {
self->responseException_ = [[JavaNetProtocolException alloc] initWithNSString:errMsg];
@throw self->responseException_;
}
- [request setValue:[self getContentType] forHTTPHeaderField:@"Content-Type"];
if (self->nativeRequestData_) {
request.HTTPBody = [(NSDataOutputStream *) self->nativeRequestData_ data];
}
|
Issue <I>: merged patch that fixes infinite loop when updating content type of an HTTP response.
|
diff --git a/classes/Boom/Exception/Handler/Priv.php b/classes/Boom/Exception/Handler/Priv.php
index <HASH>..<HASH> 100644
--- a/classes/Boom/Exception/Handler/Priv.php
+++ b/classes/Boom/Exception/Handler/Priv.php
@@ -7,6 +7,7 @@ use Response;
use Kohana_Exception;
use View;
use Boom\Page;
+use Kohana;
/**
* Exception handler which doesn't output any debugging information
|
Fixed missing use statement for Kohana in Exception\Handler\Priv
|
diff --git a/svg_model/svgload/path_parser.py b/svg_model/svgload/path_parser.py
index <HASH>..<HASH> 100644
--- a/svg_model/svgload/path_parser.py
+++ b/svg_model/svgload/path_parser.py
@@ -41,7 +41,7 @@ class PathDataParser(object):
def get_number(self):
'''
- .. versionchanged:: X.X.X
+ .. versionchanged:: 0.9.2
Add support for float exponent strings (e.g., ``3.435e-7``).
Fixes `issue #4 <https://github.com/wheeler-microfluidics/svg-model/issues/4>`.
|
docs(version): add version notifications
|
diff --git a/lib/graphql/execution/interpreter/runtime.rb b/lib/graphql/execution/interpreter/runtime.rb
index <HASH>..<HASH> 100644
--- a/lib/graphql/execution/interpreter/runtime.rb
+++ b/lib/graphql/execution/interpreter/runtime.rb
@@ -223,7 +223,7 @@ module GraphQL
continue_value = continue_value(next_path, inner_result, field_defn, return_type.non_null?, ast_node)
if RawValue === continue_value
# Write raw value directly to the response without resolving nested objects
- write_in_response(next_path, continue_value.resolve)
+ write_in_response(next_path, continue_value.object)
continue_value.object
elsif HALT != continue_value
continue_field(next_path, continue_value, field_defn, return_type, ast_node, next_selections, false, object, kwarg_arguments)
|
Update lib/graphql/execution/interpreter/runtime.rb
|
diff --git a/salt/modules/acme.py b/salt/modules/acme.py
index <HASH>..<HASH> 100644
--- a/salt/modules/acme.py
+++ b/salt/modules/acme.py
@@ -125,8 +125,7 @@ def cert(name,
salt 'gitlab.example.com' acme.cert dev.example.com "[gitlab.example.com]" test_cert=True renew=14 webroot=/opt/gitlab/embedded/service/gitlab-rails/public
'''
- # cmd = [LEA, 'certonly', '--quiet']
- cmd = [LEA, 'certonly']
+ cmd = [LEA, 'certonly', '--non-interactive']
cert_file = _cert_file(name, 'cert')
if not __salt__['file.file_exists'](cert_file):
|
Fix acme.cert to run certbot non-interactively
Certbot should never be running interactively when executed via Salt, so
this patch adds an argument to certbot which informs it to not run
interactively.
This fixes #<I>.
|
diff --git a/gargoyle/builtins.py b/gargoyle/builtins.py
index <HASH>..<HASH> 100644
--- a/gargoyle/builtins.py
+++ b/gargoyle/builtins.py
@@ -20,6 +20,7 @@ class UserConditionSet(ModelConditionSet):
username = String()
email = String()
is_anonymous = Boolean(label='Anonymous')
+ is_active = Boolean(label='Active')
is_staff = Boolean(label='Staff')
is_superuser = Boolean(label='Superuser')
date_joined = OnOrAfterDate(label='Joined on or after')
|
Add is_active as a default condition of UserConditionSet
|
diff --git a/co.js b/co.js
index <HASH>..<HASH> 100644
--- a/co.js
+++ b/co.js
@@ -5,16 +5,19 @@ var excludes = [
'operation'
];
-module.exports = function() {
- var db = seraph.apply(null, [].slice.call(arguments));
+module.exports = function(opts) {
+ var db = seraph(opts);
return function wrapObject(obj) {
+ var copy = {};
Object.keys(obj).forEach(function(key) {
if (typeof obj[key] == 'function' && excludes.indexOf(key) == -1 && key[0] != '_') {
- obj[key] = thunkify(obj[key]);
+ copy[key] = thunkify(obj[key]);
} else if (typeof obj[key] == 'object') {
- obj[key] = wrapObject(obj[key]);
+ copy[key] = wrapObject(obj[key]);
+ } else {
+ copy[key] = obj[key];
}
});
- return obj;
+ return copy;
}(db);
};
|
create methods on a copy of seraph
|
diff --git a/tests/lib/context/format_test.js b/tests/lib/context/format_test.js
index <HASH>..<HASH> 100644
--- a/tests/lib/context/format_test.js
+++ b/tests/lib/context/format_test.js
@@ -1,5 +1,4 @@
/* global assert:true, it, describe, beforeEach */
-/* global navigator, __dirname */
'use strict';
import assert from 'assert';
|
remove global navigator from tests/lib/context
|
diff --git a/src/utils/write-images.js b/src/utils/write-images.js
index <HASH>..<HASH> 100644
--- a/src/utils/write-images.js
+++ b/src/utils/write-images.js
@@ -38,8 +38,6 @@ module.exports = function (opts) {
rasterizeTasks.push(rasterizeTask);
});
- RSVP.all(rasterizeTasks).then(() => {
- resolve(opts.platformSizes)
- });
+ RSVP.all(rasterizeTasks).then(() => resolve(opts.platformSizes));
});
};
|
refactor(write-images): Update util to single line then callback
|
diff --git a/reef-common/src/main/java/com/microsoft/reef/runtime/common/driver/DriverStatusManager.java b/reef-common/src/main/java/com/microsoft/reef/runtime/common/driver/DriverStatusManager.java
index <HASH>..<HASH> 100644
--- a/reef-common/src/main/java/com/microsoft/reef/runtime/common/driver/DriverStatusManager.java
+++ b/reef-common/src/main/java/com/microsoft/reef/runtime/common/driver/DriverStatusManager.java
@@ -52,10 +52,10 @@ public final class DriverStatusManager {
* @param exceptionCodec
*/
@Inject
- public DriverStatusManager(final Clock clock,
- final ClientConnection clientConnection,
- final @Parameter(AbstractDriverRuntimeConfiguration.JobIdentifier.class) String jobIdentifier,
- final ExceptionCodec exceptionCodec) {
+ DriverStatusManager(final Clock clock,
+ final ClientConnection clientConnection,
+ final @Parameter(AbstractDriverRuntimeConfiguration.JobIdentifier.class) String jobIdentifier,
+ final ExceptionCodec exceptionCodec) {
this.clock = clock;
this.clientConnection = clientConnection;
this.jobIdentifier = jobIdentifier;
|
State checks for `DriverStatusManager`
|
diff --git a/Classes/RobertLemke/Plugin/Blog/Service/ContentService.php b/Classes/RobertLemke/Plugin/Blog/Service/ContentService.php
index <HASH>..<HASH> 100755
--- a/Classes/RobertLemke/Plugin/Blog/Service/ContentService.php
+++ b/Classes/RobertLemke/Plugin/Blog/Service/ContentService.php
@@ -74,10 +74,10 @@ class ContentService {
}
/**
- * @param PersistentNodeInterface $node
+ * @param NodeInterface $node
* @return mixed
*/
- public function renderContent(PersistentNodeInterface $node) {
+ public function renderContent(NodeInterface $node) {
$content = '';
/** @var \TYPO3\TYPO3CR\Domain\Model\Node $contentNode */
|
[BUGFIX] ContentService still uses PersistentNodeInterface
|
diff --git a/doapi/__init__.py b/doapi/__init__.py
index <HASH>..<HASH> 100644
--- a/doapi/__init__.py
+++ b/doapi/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.1.1'
+__version__ = '0.2.0.dev1'
from .base import (DOEncoder, Region, Size, Account, Kernel,
DropletUpgrade, Networks, NetworkInterface,
|
Perform further development on a dev branch
|
diff --git a/demo/src/components/ConstituencyParserComponent.js b/demo/src/components/ConstituencyParserComponent.js
index <HASH>..<HASH> 100644
--- a/demo/src/components/ConstituencyParserComponent.js
+++ b/demo/src/components/ConstituencyParserComponent.js
@@ -26,7 +26,7 @@ const description = (
</span>
<a href="https://www.semanticscholar.org/paper/A-Minimal-Span-Based-Neural-Constituency-Parser-Stern-Andreas/593e4e749bd2dbcaf8dc25298d830b41d435e435" target="_blank" rel="noopener noreferrer">{' '} a Minimal Span Based Constituency Parser (Stern et al, 2017)</a>
<span>
- . This model uses <a href="https://arxiv.org/abs/1802.05365">ELMo embeddings</a>, which are completely character based and improve single model performance from 91.77 F1 to 94.11 F1 on the Penn Treebank, a 28% relative error reduction.
+ . This model uses <a href="https://arxiv.org/abs/1802.05365">ELMo embeddings</a>, which are completely character based and improves single model performance from 92.6 F1 to 94.11 F1 on the Penn Treebank, a 20% relative error reduction.
</span>
</span>
);
|
use correct PTB results on demo page (#<I>)
|
diff --git a/src/Table.php b/src/Table.php
index <HASH>..<HASH> 100644
--- a/src/Table.php
+++ b/src/Table.php
@@ -204,6 +204,15 @@ class Table extends Lister
$this->columns[$name][] = $decorator;
}
+ public function getColumnDecorators($name)
+ {
+ $dec = $this->columns[$name];
+ if (!is_array($dec)) {
+ $dec = [$dec];
+ }
+ return $dec;
+ }
+
/**
* Will come up with a column object based on the field object supplied.
* By default will use default column.
|
add ability to get column decorators of a table
|
diff --git a/tests/frontend/org/voltdb/regressionsuites/TestFunctionsSuite.java b/tests/frontend/org/voltdb/regressionsuites/TestFunctionsSuite.java
index <HASH>..<HASH> 100644
--- a/tests/frontend/org/voltdb/regressionsuites/TestFunctionsSuite.java
+++ b/tests/frontend/org/voltdb/regressionsuites/TestFunctionsSuite.java
@@ -441,7 +441,7 @@ public class TestFunctionsSuite extends RegressionSuite {
cr = client.callProcedure("P1.insert", 1, "foo", 1, 1.0);
assertEquals(ClientResponse.SUCCESS, cr.getStatus());
- // next one disabled until ENG-3485
+ // next one disabled until ENG-3486
/*cr = client.callProcedure("PARAM_SUBSTRING", "eeoo");
assertEquals(ClientResponse.SUCCESS, cr.getStatus());
result = cr.getResults()[0];
@@ -511,7 +511,7 @@ public class TestFunctionsSuite extends RegressionSuite {
project.addStmtProcedure("AGG_OF_SUBSTRING", "select MIN(SUBSTRING (DESC FROM 2)) from P1 where ID < -7");
// Test parameterizing functions
- // next one disabled until ENG-3485
+ // next one disabled until ENG-3486
//project.addStmtProcedure("PARAM_SUBSTRING", "select SUBSTRING(? FROM 2) from P1");
project.addStmtProcedure("PARAM_ABS", "select ABS(? + NUM) from P1");
|
ENG-<I> / ENG-<I>: Fix typo from previous commit
|
diff --git a/lib/route.js b/lib/route.js
index <HASH>..<HASH> 100644
--- a/lib/route.js
+++ b/lib/route.js
@@ -54,7 +54,7 @@ function Route (methods, name, pattern, handlers) {
throw new Error('Cannot generate path. Missing param ' + match.substr(1));
i++;
- return params[key];
+ return encodeURIComponent(params[key]);
});
};
}
diff --git a/lib/trail-router.js b/lib/trail-router.js
index <HASH>..<HASH> 100644
--- a/lib/trail-router.js
+++ b/lib/trail-router.js
@@ -74,6 +74,14 @@ function TrailRouter (app) {
_routes[name] = route;
_routesOrder.push(route);
};
+
+ _this.url = function (name, params) {
+ var r = _routes[name];
+ if (!r)
+ throw new Error('Cannot generate path. No route named ' + name);
+
+ return r.buildPath.apply(null, Array.prototype.slice.call(arguments, 1));
+ };
/* -------------------------------------------------------------------
* Private Methods << Keep in alphabetical order >>
@@ -128,5 +136,6 @@ function TrailRouter (app) {
if (app) {
app.all = f;
app.register = _this.register;
+ app.url = _this.url;
}
}
|
Made path building for named routes public.
|
diff --git a/lib/collection.js b/lib/collection.js
index <HASH>..<HASH> 100644
--- a/lib/collection.js
+++ b/lib/collection.js
@@ -1453,7 +1453,7 @@ Collection.prototype.stats = function(options, callback) {
/**
* @typedef {Object} Collection~findAndModifyWriteOpResult
- * @property {object} value Document returned from findAndModify command.
+ * @property {object} value Document returned from the `findAndModify` command. If no documents were found, `value` will be `null` by default (`returnOriginal: true`), even if a document was upserted; if `returnOriginal` was false, the upserted document will be returned in that case.
* @property {object} lastErrorObject The raw lastErrorObject returned from the command.
* @property {Number} ok Is 1 if the command executed correctly.
*/
|
docs(Collection): clarify findAndModify's result.value
* Clarify that findAndModify's result.value doesn't echo upserted docs
* Clarify the value returned when upserting a document
|
diff --git a/pyaxo.py b/pyaxo.py
index <HASH>..<HASH> 100644
--- a/pyaxo.py
+++ b/pyaxo.py
@@ -571,8 +571,7 @@ class SqlitePersistence(object):
self.db = self._open_db()
def _open_db(self):
- db = sqlite3.connect(':memory:', check_same_thread=self.nonthreaded,
- factory=sqlite3.Connection)
+ db = sqlite3.connect(':memory:', check_same_thread=self.nonthreaded)
db.row_factory = sqlite3.Row
with db:
|
Do not pass the same factory class used by default
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -35,7 +35,6 @@ function buildBuildList() {
return obj;
}
var buildList = buildBuildList();
-console.dir(buildList);
module.exports = function(grunt) {
|
Remove diagnostic code from Gruntfile.js
|
diff --git a/lib/metrics/Meter.js b/lib/metrics/Meter.js
index <HASH>..<HASH> 100644
--- a/lib/metrics/Meter.js
+++ b/lib/metrics/Meter.js
@@ -100,5 +100,5 @@ Meter.prototype._getTime = function() {
if (!process.hrtime) return Date.now();
var hrtime = process.hrtime();
- return hrtime[0] / 1000 + hrtime[1] / (1000 * 1000);
+ return hrtime[0] * 1000 + hrtime[1] / (1000 * 1000);
};
diff --git a/lib/util/Stopwatch.js b/lib/util/Stopwatch.js
index <HASH>..<HASH> 100644
--- a/lib/util/Stopwatch.js
+++ b/lib/util/Stopwatch.js
@@ -26,5 +26,5 @@ Stopwatch.prototype._getTime = function() {
if (!process.hrtime) return Date.now();
var hrtime = process.hrtime();
- return hrtime[0] / 1000 + hrtime[1] / (1000 * 1000);
+ return hrtime[0] * 1000 + hrtime[1] / (1000 * 1000);
};
\ No newline at end of file
|
Fix High Resolution Timer bug when the time is greater than one second
|
diff --git a/seed_message_sender/__init__.py b/seed_message_sender/__init__.py
index <HASH>..<HASH> 100644
--- a/seed_message_sender/__init__.py
+++ b/seed_message_sender/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.9.9'
+__version__ = '0.9.10'
VERSION = __version__
|
bumped version to <I>
|
diff --git a/src/Cmgmyr/Messenger/Models/Thread.php b/src/Cmgmyr/Messenger/Models/Thread.php
index <HASH>..<HASH> 100644
--- a/src/Cmgmyr/Messenger/Models/Thread.php
+++ b/src/Cmgmyr/Messenger/Models/Thread.php
@@ -374,25 +374,6 @@ class Thread extends Eloquent
*/
public function userUnreadMessagesCount($userId)
{
- $messages = $this->messages()->get();
- $participant = $this->getParticipantFromUser($userId);
- if (!$participant) {
- return 0;
- }
- if (!$participant->last_read) {
- return count($messages);
- }
- $count = 0;
- $i = count($messages) - 1;
- while ($i) {
- if ($messages[$i]->updated_at->gt($participant->last_read)) {
- ++$count;
- } else {
- break;
- }
- --$i;
- }
-
- return $count;
+ return $this->userUnreadMessages($userId)->count();
}
}
|
refactor to remove duplicated code
|
diff --git a/lib/tracer.go b/lib/tracer.go
index <HASH>..<HASH> 100644
--- a/lib/tracer.go
+++ b/lib/tracer.go
@@ -102,11 +102,15 @@ func (t *Tracer) GotFirstResponseByte() {
// DNSStart hook.
func (t *Tracer) DNSStart(info httptrace.DNSStartInfo) {
t.dnsStart = time.Now()
+ t.dnsDone = t.dnsStart
}
// DNSDone hook.
func (t *Tracer) DNSDone(info httptrace.DNSDoneInfo) {
t.dnsDone = time.Now()
+ if t.dnsStart.IsZero() {
+ t.dnsStart = t.dnsDone
+ }
}
// ConnectStart hook.
|
[fix] Fixed negative/enormous lookup times
|
diff --git a/tests/TestCase/Collection/CollectionTest.php b/tests/TestCase/Collection/CollectionTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Collection/CollectionTest.php
+++ b/tests/TestCase/Collection/CollectionTest.php
@@ -1112,6 +1112,11 @@ class CollectionTest extends TestCase
$collection = new Collection(['a' => 1, 'b' => 2]);
$combined = $collection->append(['c' => 3, 'a' => 4]);
$this->assertEquals(['a' => 4, 'b' => 2, 'c' => 3], $combined->toArray());
+
+ $collection = new Collection([1, 2]);
+ $collection = $collection->append([3, 4]);
+ $combined = $collection->append([5, 6]);
+ $this->assertEquals([1, 2, 3, 4, 5, 6], $combined->toList());
}
/**
|
Add test for append()
Attempt to reproduce #<I>
|
diff --git a/course/mod.php b/course/mod.php
index <HASH>..<HASH> 100644
--- a/course/mod.php
+++ b/course/mod.php
@@ -343,7 +343,7 @@
}
exit;
- } else if (!empty($groupmode) and confirm_sesskey()) {
+ } else if (isset($groupmode) and confirm_sesskey()) {
$id = required_param( 'id', PARAM_INT );
|
Fixed group switch icon cannot set a module to use no groups
|
diff --git a/test/functional/ft_37_default_history.rb b/test/functional/ft_37_default_history.rb
index <HASH>..<HASH> 100644
--- a/test/functional/ft_37_default_history.rb
+++ b/test/functional/ft_37_default_history.rb
@@ -95,8 +95,16 @@ class FtDefaultHistoryTest < Test::Unit::TestCase
launch_processes(false)
- assert_equal 18, @engine.history.reject { |m| m['action'] == 'noop' }.size
- assert_equal 11, @engine.history.by_date(Time.now.utc).size
+ assert_equal(
+ 18,
+ @engine.history.reject { |m|
+ m['action'] == 'noop'
+ }.size)
+ assert_equal(
+ 9,
+ @engine.history.by_date(Time.now.utc).reject { |m|
+ m['action'] == 'noop'
+ }.size)
end
def test_wfids
|
ft_<I>: more noop rejection
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -65,7 +65,7 @@ copyright = u'2013-2016, Pablo Acosta-Serafini'
# The short X.Y version.
version = '1.0.3'
# The full version, including alpha/beta/rc tags.
-release = '1.0.3rc1'
+release = '1.0.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/peng/version.py b/peng/version.py
index <HASH>..<HASH> 100644
--- a/peng/version.py
+++ b/peng/version.py
@@ -10,7 +10,7 @@ from __future__ import print_function
###
# Global variables
###
-VERSION_INFO = (1, 0, 3, 'candidate', 1)
+VERSION_INFO = (1, 0, 3, 'final', 0)
###
|
Bumped version to <I>
|
diff --git a/datasources/GeoJson.js b/datasources/GeoJson.js
index <HASH>..<HASH> 100644
--- a/datasources/GeoJson.js
+++ b/datasources/GeoJson.js
@@ -86,6 +86,10 @@ GeoJsonSource.prototype = {
}.bind(this));
}
},
+
+ project: function(destinationProjection) {
+ this._project(destinationProjection);
+ },
_project: function(mapProjection) {
var doBounds = !this._projectedData[mapProjection];
diff --git a/lib/Map.js b/lib/Map.js
index <HASH>..<HASH> 100644
--- a/lib/Map.js
+++ b/lib/Map.js
@@ -141,6 +141,22 @@ Map.prototype = {
}
},
+ /**
+ * Triggers all the map's datasources to prepare themselves. Usually this
+ * connecting to a database, loading and processing a file, etc.
+ * Calling this method is completely optional, but allows you to speed up
+ * rendering of the first tile.
+ */
+ prepare: function() {
+ var projection = this.projection;
+
+ this.datasources.forEach(function(datasource) {
+ datasource.load && datasource.load(function(error) {
+ datasource.project && datasource.project(projection);
+ });
+ });
+ },
+
_processStyles: function() {
this.processedStyles = this._renderer.processStyles(this.styles);
}
|
Add ability to pre-emptively load and project data
|
diff --git a/packages/dna-skin-ce-v0/index.js b/packages/dna-skin-ce-v0/index.js
index <HASH>..<HASH> 100644
--- a/packages/dna-skin-ce-v0/index.js
+++ b/packages/dna-skin-ce-v0/index.js
@@ -6,14 +6,14 @@
* Just another components pattern.
* Use with Skin template and Custom Elements v0 spec.
*/
-import { SkinTemplateMixin } from 'dna-skin/src/mixins/skin.js';
-import { mix, MIXINS, BaseComponent as OriginalComponent } from 'dna-custom-elements-v0';
+import { SkinTemplateMixin } from '@dnajs/skin/src/mixins/skin.js';
+import { mix, MIXINS, BaseComponent as OriginalComponent } from '@dnajs/custom-elements-v0';
MIXINS.SkinTemplateMixin = SkinTemplateMixin;
export { mix, MIXINS };
-export { Template, IDOM } from 'dna-skin';
-export { registry, render, define, prop, shim, HELPERS } from 'dna-custom-elements-v0';
+export { Template, IDOM } from '@dnajs/skin';
+export { registry, render, define, prop, shim, HELPERS } from '@dnajs/custom-elements-v0';
export class BaseComponent extends mix(OriginalComponent).with(
SkinTemplateMixin
) {}
|
fix: skin-ce-v0 imports
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -33,6 +33,7 @@ function sassGenerateContents(destFilePath, creds, options){
for(var i = 0; i < len; i++){
spaceArr.push(spacer);
}
+
return spaceArr.join('');
}
@@ -135,10 +136,6 @@ function sassGenerateContents(destFilePath, creds, options){
return newFile;
}
- function getBase(filePath){
- return filePath.substring(0, replacePath(filePath).lastIndexOf(':'));
- }
-
function throwWarning(fileName){
gutil.log(PLUGIN_NAME + ' Comments missing or malformed in file: ' + fileName + ' - File not included\n');
}
|
refactor: Strip getBase function as it is unused
|
diff --git a/master/buildbot/worker/local.py b/master/buildbot/worker/local.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/worker/local.py
+++ b/master/buildbot/worker/local.py
@@ -43,6 +43,7 @@ class LocalWorker(Worker, WorkerAPICompatMixin):
Worker.reconfigService(self, name, None, **kwargs)
if workdir is None:
workdir = name
+ # TODO: How to move working directory to the new place?
workdir = os.path.abspath(os.path.join(self.master.basedir, "slaves", workdir))
if not os.path.isdir(workdir):
os.makedirs(workdir)
|
add TODO note about moving working directory of worker
|
diff --git a/twistedchecker/checkers/docstring.py b/twistedchecker/checkers/docstring.py
index <HASH>..<HASH> 100644
--- a/twistedchecker/checkers/docstring.py
+++ b/twistedchecker/checkers/docstring.py
@@ -47,11 +47,8 @@ def _getDecoratorsName(node):
# Sometimes astng fails by raising this kind of error.
pass
else:
- for name in names:
- if name is YES:
- # Whereas sometimes it fails by returning this magic token.
- break
- else:
+ # Whereas sometimes it fails by returning this magic token.
+ if YES not in names:
return names
# If pylint's attempt to discover the decorator's names has failed, fall
# back to our own logic.
|
address lukasa's drive-by comment
|
diff --git a/src/Uri/WordPressUri.php b/src/Uri/WordPressUri.php
index <HASH>..<HASH> 100644
--- a/src/Uri/WordPressUri.php
+++ b/src/Uri/WordPressUri.php
@@ -60,8 +60,8 @@ final class WordPressUri implements UriInterface
* `example.com/subfolder` we need to strip down `/subfolder` from path and build a path
* for route matching that is relative to home url.
*/
- $homePath = trim(rawurlencode(parse_url(home_url(), PHP_URL_PATH)), '/');
- $path = trim(rawurlencode($this->uri->getPath()), '/');
+ $homePath = trim(parse_url(home_url(), PHP_URL_PATH), '/');
+ $path = trim($this->uri->getPath(), '/');
if ($homePath && strpos($path, $homePath) === 0) {
$path = trim(substr($path, strlen($homePath)), '/');
}
|
Remove rawurlencode for url path from WordPressUri
|
diff --git a/kafka_scanner/__init__.py b/kafka_scanner/__init__.py
index <HASH>..<HASH> 100644
--- a/kafka_scanner/__init__.py
+++ b/kafka_scanner/__init__.py
@@ -603,10 +603,6 @@ class KafkaScannerDirect(KafkaScannerSimple):
self._lower_offsets = {partition: 0 for partition in self.init_consumer.offsets}
else:
self._lower_offsets = self.init_consumer.offsets.copy()
- for p, o in self._lower_offsets.items():
- if self._upper_offsets[p] < o:
- self._lower_offsets[p] = 0
- log.warning('Set lower offset for partition %d to 0', p)
self.init_consumer.offsets.update(self._lower_offsets)
self.init_consumer.count_since_commit += 1
self.init_consumer.commit()
|
this code is not needed anymore with KafkaConsumer
|
diff --git a/metrics/cgroups/oom.go b/metrics/cgroups/oom.go
index <HASH>..<HASH> 100644
--- a/metrics/cgroups/oom.go
+++ b/metrics/cgroups/oom.go
@@ -44,11 +44,14 @@ type oomCollector struct {
}
type oom struct {
+ // count needs to stay the first member of this struct to ensure 64bits
+ // alignment on a 32bits machine (e.g. arm32). This is necessary as we use
+ // the sync/atomic operations on this field.
+ count int64
id string
namespace string
c cgroups.Cgroup
triggers []Trigger
- count int64
}
func (o *oomCollector) Add(id, namespace string, cg cgroups.Cgroup, triggers ...Trigger) error {
|
linux: Ensure count is <I>bits aligned for proper atomic use on <I>bits machines
|
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index <HASH>..<HASH> 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -52,6 +52,7 @@ class Dispatcher {
* @param $method
* @param $action
* @param $data
+ * @return mixed
* @throws \Exception
*/
public static function send ($method, $action, $data) {
@@ -101,7 +102,7 @@ class Dispatcher {
// Retrieve and decode contents
$jsonContents = $request->getBody()->getContents();
$contents = json_decode($jsonContents);
-
+
// Throw customised exception in case decoding fails
if (json_last_error() !== 0) throw new \Exception('Eroare la parsarea raspunsului: ' . $jsonContents);
|
Fixed phpdoc
modified: src/Dispatcher.php
|
diff --git a/lib/rubocop/cop/style/when_then.rb b/lib/rubocop/cop/style/when_then.rb
index <HASH>..<HASH> 100644
--- a/lib/rubocop/cop/style/when_then.rb
+++ b/lib/rubocop/cop/style/when_then.rb
@@ -8,7 +8,7 @@ module RuboCop
MSG = 'Do not use `when x;`. Use `when x then` instead.'.freeze
def on_when(node)
- return if node.multiline? || node.then?
+ return if node.multiline? || node.then? || !node.body
add_offense(node, :begin)
end
diff --git a/spec/rubocop/cop/style/when_then_spec.rb b/spec/rubocop/cop/style/when_then_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/rubocop/cop/style/when_then_spec.rb
+++ b/spec/rubocop/cop/style/when_then_spec.rb
@@ -39,4 +39,15 @@ describe RuboCop::Cop::Style::WhenThen do
'when b then c',
'end'].join("\n"))
end
+
+ # Regression: https://github.com/bbatsov/rubocop/issues/3868
+ context 'when inspecting a case statement with an empty branch' do
+ it 'does not register an offense' do
+ inspect_source(cop, ['case value',
+ 'when cond1',
+ 'end'])
+
+ expect(cop.offenses).to be_empty
+ end
+ end
end
|
[Fix #<I>] Prevent `Style/WhenThen` from breaking on an empty branch
This cop would blow up when inspecting a `case` statement with an empty
`when` branch. This was missing a test case, and a regression caused by
the introduction of node extensions.
This change fixes it.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -10,6 +10,9 @@ setup(
maintainer='Alex Tomkins',
maintainer_email='alex@blanc.ltd.uk',
platforms=['any'],
+ install_requires=[
+ 'blanc-basic-assets>=0.3',
+ ],
packages=find_packages(),
classifiers=[
'Environment :: Web Environment',
|
Add blanc-basic-assets to install_requires
|
diff --git a/lib/arjdbc/postgresql/base/pgconn.rb b/lib/arjdbc/postgresql/base/pgconn.rb
index <HASH>..<HASH> 100644
--- a/lib/arjdbc/postgresql/base/pgconn.rb
+++ b/lib/arjdbc/postgresql/base/pgconn.rb
@@ -1,8 +1,8 @@
-module ActiveRecord::ConnectionAdapters::PostgreSQL::OID
- class PGconn # emulate PGconn#unescape_bytea due #652
+module PG
+ class Connection # emulate PGconn#unescape_bytea due #652
# NOTE: on pg gem ... PGconn = (class) PG::Connection
def self.unescape_bytea(escaped)
ArJdbc::PostgreSQL.unescape_bytea(escaped)
end
end
-end
\ No newline at end of file
+end
|
Updated patch for PGConn to patch PG::Connection since <I> updated references to it
|
diff --git a/Client/RdKafkaDriver.php b/Client/RdKafkaDriver.php
index <HASH>..<HASH> 100644
--- a/Client/RdKafkaDriver.php
+++ b/Client/RdKafkaDriver.php
@@ -79,18 +79,6 @@ class RdKafkaDriver implements DriverInterface
$clientMessage->setContentType($contentType);
}
- if ($expiration = $message->getHeader('expiration')) {
- $clientMessage->setExpire($expiration);
- }
-
- if ($delay = $message->getHeader('delay')) {
- $clientMessage->setDelay($delay);
- }
-
- if ($priority = $message->getHeader('priority')) {
- $clientMessage->setPriority($priority);
- }
-
return $clientMessage;
}
|
Remove expiration, delay and priority from the RdKafka driver
|
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
index <HASH>..<HASH> 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
@@ -335,6 +335,9 @@ class ProfilesController < ApplicationController
arules2 = ActiveRule.find(:all, :order => 'rules.plugin_name, rules.plugin_rule_key', :include => [{:active_rule_parameters => :rules_parameter}, :rule],
:conditions => ['active_rules.profile_id=?', @profile2.id])
+ arules1.reject! { |arule| !arule.rule.enabled }
+ arules2.reject! { |arule| !arule.rule.enabled }
+
diffs_by_rule={}
arules1.each do |arule1|
diffs_by_rule[arule1.rule]||=RuleDiff.new(arule1.rule)
|
SONAR-<I> Filter disable rules in "Compare Profiles"
|
diff --git a/collatex-tools/src/main/java/eu/interedition/collatex/tools/CollationPipe.java b/collatex-tools/src/main/java/eu/interedition/collatex/tools/CollationPipe.java
index <HASH>..<HASH> 100644
--- a/collatex-tools/src/main/java/eu/interedition/collatex/tools/CollationPipe.java
+++ b/collatex-tools/src/main/java/eu/interedition/collatex/tools/CollationPipe.java
@@ -150,9 +150,7 @@ public class CollationPipe {
}
final VariantGraph variantGraph = new VariantGraph();
- for (SimpleWitness witness : witnesses) {
- collationAlgorithm.collate(variantGraph, witness);
- }
+ collationAlgorithm.collate(variantGraph, witnesses);
if (joined && !commandLine.hasOption("t")) {
VariantGraph.JOIN.apply(variantGraph);
|
Bug fix for the "non progressive alignment" exception in the command-line tool of CollateX when using the <I>.X version of the DekkerAlgorithm.
|
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index <HASH>..<HASH> 100644
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -337,15 +337,16 @@ class IncomingRequest extends Request
//--------------------------------------------------------------------
/**
- * Fetch an item from PUT data.
+ * A convenience method that grabs the raw input stream and decodes
+ * the String into an array.
*
- * @return array
+ * @return mixed
*/
- public function getPut()
+ public function getRawString()
{
- parse_str($this->body, $data);
+ parse_str($this->body, $output);
- return $data;
+ return $output;
}
//--------------------------------------------------------------------
|
Rename function getPut to getRawString
Fetch data from raw stream when http request send by PUT, PATCH, DELETE
|
diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php b/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php
@@ -123,7 +123,7 @@ final class LightSmsTransport extends AbstractTransport
throw new TransportException('Unable to send the SMS: '.self::ERROR_CODES[$content['error']], $response);
}
- $phone = preg_replace("/[^\d]/", '', $message->getPhone());
+ $phone = $this->escapePhoneNumber($message->getPhone());
if (32 === $content[$phone]['error']) {
throw new TransportException('Unable to send the SMS: '.self::ERROR_CODES[$content['error']], $response);
}
@@ -159,6 +159,6 @@ final class LightSmsTransport extends AbstractTransport
private function escapePhoneNumber($phoneNumber): string
{
- return str_replace('+', '', $phoneNumber);
+ return preg_replace("/[^\d]/", '', $phoneNumber);
}
}
|
* LightSmsTransport.php - changed login for validation (the same like we have all places)
|
diff --git a/doc/conf.py b/doc/conf.py
index <HASH>..<HASH> 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -56,9 +56,9 @@ copyright = u'2010-2018, Sergio Pascual, Nicolás Cardiel'
# built documents.
#
# The short X.Y version.
-version = '0.10'
+version = '0.11'
# The full version, including alpha/beta/rc tags.
-release = '0.10.dev1'
+release = '0.11.dev0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/emirdrp/__init__.py b/emirdrp/__init__.py
index <HASH>..<HASH> 100644
--- a/emirdrp/__init__.py
+++ b/emirdrp/__init__.py
@@ -21,7 +21,7 @@
import logging
-__version__ = '0.10.dev1'
+__version__ = '0.11.dev0'
# Top level NullHandler
|
Update to version <I>.dev0
|
diff --git a/src/application/action-builder.js b/src/application/action-builder.js
index <HASH>..<HASH> 100644
--- a/src/application/action-builder.js
+++ b/src/application/action-builder.js
@@ -97,7 +97,7 @@ function _errorOnCall(config, err){
* - status(:string)} The status after the action.
* @return {function} - The build action from the configuration. This action dispatch the preStatus, call the service and dispatch the result from the server.
*/
-module.exports = function actionBuilder(config = {}){
+export default function actionBuilder(config = {}){
config.type = config.type || 'update';
config.preStatus = config.preStatus || 'loading';
config.shouldDumpStoreOnActionCall = config.shouldDumpStoreOnActionCall || false;
@@ -125,3 +125,9 @@ module.exports = function actionBuilder(config = {}){
});
};
};
+
+export {
+ _errorOnCall as errorOnCall,
+ _dispatchServiceResponse as dispatchServiceResponse,
+ _preServiceCall as preServiceCall
+ };
|
Export of the different steps of the actionBuilder (#<I>)
* Export of the different steps of the actionBuilder
* Update action-builder.js
|
diff --git a/buildbot/changes/hgbuildbot.py b/buildbot/changes/hgbuildbot.py
index <HASH>..<HASH> 100644
--- a/buildbot/changes/hgbuildbot.py
+++ b/buildbot/changes/hgbuildbot.py
@@ -92,7 +92,7 @@ def hook(ui, repo, hooktype, node=None, source=None, **kwargs):
if branch is None:
if branchtype is not None:
if branchtype == 'dirname':
- branch = os.path.basename(os.getcwd())
+ branch = os.path.basename(repo.root)
if branchtype == 'inrepo':
branch = workingctx(repo).branch()
|
allow hgbuildbot to work properly with branchtype=dirname but where cwd is not the repo
|
diff --git a/irc3/plugins/command.py b/irc3/plugins/command.py
index <HASH>..<HASH> 100644
--- a/irc3/plugins/command.py
+++ b/irc3/plugins/command.py
@@ -289,8 +289,12 @@ class Commands(dict):
if data:
if not isinstance(data, str): # pragma: no cover
data = data.encode(encoding)
- data = self.split_command(
- data, use_shlex=predicates.get('use_shlex', True))
+ try:
+ data = self.split_command(
+ data, use_shlex=predicates.get('use_shlex', True))
+ except ValueError as e:
+ self.context.privmsg(to, 'Invalid arguments: {}.'.format(e))
+ return
docopt_args = dict(help=False)
if "options_first" in predicates:
docopt_args.update(options_first=predicates["options_first"])
|
Add verbosity when parsing command args with shlex
|
diff --git a/python/phonenumbers/phonenumberutil.py b/python/phonenumbers/phonenumberutil.py
index <HASH>..<HASH> 100644
--- a/python/phonenumbers/phonenumberutil.py
+++ b/python/phonenumbers/phonenumberutil.py
@@ -2857,7 +2857,10 @@ def parse(number, region=None, keep_raw_input=False,
# prefix and carrier code be long enough to be a possible length for
# the region. Otherwise, we don't do the stripping, since the original
# number could be a valid short number.
- if _test_number_length(potential_national_number, metadata) != ValidationResult.TOO_SHORT:
+ validation_result = _test_number_length(potential_national_number, metadata)
+ if (validation_result != ValidationResult.TOO_SHORT and
+ validation_result != ValidationResult.IS_POSSIBLE_LOCAL_ONLY and
+ validation_result != ValidationResult.INVALID_LENGTH):
normalized_national_number = potential_national_number
if keep_raw_input and carrier_code is not None and len(carrier_code) > 0:
numobj.preferred_domestic_carrier_code = carrier_code
|
Better national-prefix detection & stripping (#<I>)
First part of porting code change <URL>
|
diff --git a/src/lang/ja.js b/src/lang/ja.js
index <HASH>..<HASH> 100644
--- a/src/lang/ja.js
+++ b/src/lang/ja.js
@@ -31,6 +31,6 @@ module.exports = {
string : ":attributeは:size文字で入力してください。"
},
url : ":attributeは正しいURIを入力してください。",
- regex : ":attributeの値 \":value\" はパターンにマッチする必要があります。",
+ regex : ":attributeの値はパターンにマッチする必要があります。",
attributes : {}
};
|
Removed `:value` placeholder
|
diff --git a/server.go b/server.go
index <HASH>..<HASH> 100644
--- a/server.go
+++ b/server.go
@@ -44,7 +44,7 @@ func newServer(address, username, password string, config *Config, newMcConn con
func (s *server) perform(m *msg) error {
var err error
for i := 0; ; {
- timeout := time.Tick(s.config.ConnectionTimeout)
+ timeout := time.After(s.config.ConnectionTimeout)
select {
case c := <-s.pool:
// NOTE: this serverConn is no longer available in the pool (equivalent to locking)
@@ -89,7 +89,7 @@ func (s *server) perform(m *msg) error {
}
func (s *server) performStats(m *msg) (mcStats, error) {
- timeout := time.Tick(s.config.ConnectionTimeout)
+ timeout := time.After(s.config.ConnectionTimeout)
select {
case c := <-s.pool:
// NOTE: this serverConn is no longer available in the pool (equivalent to locking)
|
Replace leaking ticker with simple timeout, fixes #4
|
diff --git a/lib/ronin/scanner.rb b/lib/ronin/scanner.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/scanner.rb
+++ b/lib/ronin/scanner.rb
@@ -37,6 +37,24 @@ module Ronin
end
#
+ # Returns all scanner tests in the specified _category_.
+ #
+ def scanners_for(name)
+ name = name.to_sym
+ tests = []
+
+ ancestors.each do |ancestor|
+ if ancestor.include?(Ronin::Scanner)
+ if ancestor.scanners.has_key?(name)
+ tests += ancestor.scanners[name]
+ end
+ end
+ end
+
+ return tests
+ end
+
+ #
# Returns the category names of all defined scanners.
#
def scans_for
diff --git a/spec/scanner_spec.rb b/spec/scanner_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/scanner_spec.rb
+++ b/spec/scanner_spec.rb
@@ -31,6 +31,13 @@ describe Scanner do
AnotherScanner.scans_for?(:test2).should == true
end
+ it "should return all scanner tests within a category" do
+ tests = ExampleScanner.scanners_for(:test2)
+
+ tests.length.should == 2
+ tests.all? { |test| test.kind_of?(Proc) }.should == true
+ end
+
it "should specify the category names of all tests" do
ExampleScanner.scans_for.should == Set[:test1, :test2]
AnotherScanner.scans_for.should == Set[:test1, :test2, :test3]
|
Added Scanners.scanners_for.
|
diff --git a/spec/integration/integration_helper.rb b/spec/integration/integration_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/integration/integration_helper.rb
+++ b/spec/integration/integration_helper.rb
@@ -131,7 +131,7 @@ module IntegrationHelper
end
def count_all(table)
- query = "select count(*) from #{ table }"
+ query = "select count(*) from `#{ table }`"
select_value(query).to_i
end
|
Quotes table name in count_all method in integration_helper
|
diff --git a/src/tree/assess/scoreAggregators/ReadabilityScoreAggregator.js b/src/tree/assess/scoreAggregators/ReadabilityScoreAggregator.js
index <HASH>..<HASH> 100644
--- a/src/tree/assess/scoreAggregators/ReadabilityScoreAggregator.js
+++ b/src/tree/assess/scoreAggregators/ReadabilityScoreAggregator.js
@@ -6,6 +6,8 @@ import { ScoreAggregator } from "../index";
/**
* Total number of available readability assessments.
*
+ * To do: Compute this, rather than set this and keep this updated (see https://github.com/Yoast/YoastSEO.js/pull/2176#discussion_r261547836)
+ *
* @type {number}
* @const
*/
|
Added todo comment to make sure we compute the total number of readability assessments, instead of setting it as a constant.
|
diff --git a/packages/blueprint-handlebars/app/services/handlebars.js b/packages/blueprint-handlebars/app/services/handlebars.js
index <HASH>..<HASH> 100644
--- a/packages/blueprint-handlebars/app/services/handlebars.js
+++ b/packages/blueprint-handlebars/app/services/handlebars.js
@@ -44,6 +44,16 @@ module.exports = Service.extend ({
}),
/**
+ * Compile a template.
+ *
+ * @param path
+ * @returns {*}
+ */
+ compile (path) {
+ return this._templateCompiler.compile (path);
+ },
+
+ /**
* Initialize the handlebars environment instance.
*
* @private
diff --git a/packages/blueprint-handlebars/lib/template-compiler.js b/packages/blueprint-handlebars/lib/template-compiler.js
index <HASH>..<HASH> 100644
--- a/packages/blueprint-handlebars/lib/template-compiler.js
+++ b/packages/blueprint-handlebars/lib/template-compiler.js
@@ -14,9 +14,9 @@ module.exports = class TemplateCompiler {
}
/**
- * Compile the template
- * @param name
- * @returns {Promise<null|*>}
+ * Compile the template.
+ *
+ * @param path Path to template file.
*/
async compile (path) {
const exists = await fse.pathExists (path);
|
feat: added compile() method to the service
|
diff --git a/lib/js-yaml/type/pairs.js b/lib/js-yaml/type/pairs.js
index <HASH>..<HASH> 100644
--- a/lib/js-yaml/type/pairs.js
+++ b/lib/js-yaml/type/pairs.js
@@ -9,12 +9,14 @@ var _toString = Object.prototype.toString;
function resolveYamlPairs(object, explicit) {
- var index, length, pair;
+ var index, length, pair, keys, result;
if ('[object Array]' !== _toString.call(object)) {
return NIL;
}
+ result = new Array(object.length);
+
for (index = 0, length = object.length; index < length; index += 1) {
pair = object[index];
@@ -22,12 +24,16 @@ function resolveYamlPairs(object, explicit) {
return NIL;
}
- if (1 !== Object.keys(pair).length) {
+ keys = Object.keys(pair);
+
+ if (1 !== keys.length) {
return NIL;
}
+
+ result[index] = [ keys[0], pair[keys[0]] ];
}
- return object;
+ return result;
}
|
Correct !!pairs resolver.
|
diff --git a/src/Listener/ViewSearchListener.php b/src/Listener/ViewSearchListener.php
index <HASH>..<HASH> 100644
--- a/src/Listener/ViewSearchListener.php
+++ b/src/Listener/ViewSearchListener.php
@@ -43,6 +43,7 @@ class ViewSearchListener extends BaseListener
*/
public function afterPaginate(Event $event)
{
+ $event;
if (!$this->_table()->behaviors()->has('Search')) {
return;
}
|
fix: reference event to quiet scrutinizer
|
diff --git a/test/tc_aggs.rb b/test/tc_aggs.rb
index <HASH>..<HASH> 100644
--- a/test/tc_aggs.rb
+++ b/test/tc_aggs.rb
@@ -91,6 +91,7 @@ class PriorityQ
end
end
+# XXX: not used by any tests
class DupAggs
include Bud
|
Mark unused code in test case.
|
diff --git a/git/git.go b/git/git.go
index <HASH>..<HASH> 100644
--- a/git/git.go
+++ b/git/git.go
@@ -186,7 +186,7 @@ func Show(sha string) (string, error) {
func Log(sha1, sha2 string) (string, error) {
execCmd := cmd.New("git")
- execCmd.WithArg("log").WithArg("--no-color")
+ execCmd.WithArg("-c").WithArg("log.showSignature=false").WithArg("log").WithArg("--no-color")
execCmd.WithArg("--format=%h (%aN, %ar)%n%w(78,3,3)%s%n%+b")
execCmd.WithArg("--cherry")
shaRange := fmt.Sprintf("%s...%s", sha1, sha2)
|
Negate `log.showSignature` in commits preview for `pull-request`
Fixes #<I>
|
diff --git a/pyIOSXR/iosxr.py b/pyIOSXR/iosxr.py
index <HASH>..<HASH> 100644
--- a/pyIOSXR/iosxr.py
+++ b/pyIOSXR/iosxr.py
@@ -589,7 +589,7 @@ class IOSXR(object):
if len(comment) <= 60:
rpc_command += ' Comment="%s"' % comment
else:
- raise InvalidInputError('comment needs to be shorter than 60 characters', self)
+ raise InvalidInputError('comment should be no more than 60 characters', self)
if confirmed:
if 30 <= int(confirmed) <= 300:
rpc_command += ' Confirmed="%d"' % int(confirmed)
|
Update error message for commit comment length error
Rephrase the commit comment error to better reflect the limits.
|
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index <HASH>..<HASH> 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -424,10 +424,14 @@ class API extends \Piwik\Plugin\API
$orderByDir = "ASC";
}
+ $visitLastActionDate = Date::factory($visitLastActionTime);
+ $dateOneDayAgo = $visitLastActionDate->subDay(1);
+ $dateOneDayInFuture = $visitLastActionDate->addDay(1);
+
$select = "log_visit.idvisitor, MAX(log_visit.visit_last_action_time) as visit_last_action_time";
$from = "log_visit";
- $where = "log_visit.idsite = ? AND log_visit.idvisitor <> ?";
- $whereBind = array($idSite, @Common::hex2bin($visitorId));
+ $where = "log_visit.idsite = ? AND log_visit.idvisitor <> ? AND visit_last_action_time >= ? and visit_last_action_time <= ?";
+ $whereBind = array($idSite, @Common::hex2bin($visitorId), $dateOneDayAgo->toString('Y-m-d H:i:s'), $dateOneDayInFuture->toString('Y-m-d H:i:s'));
$orderBy = "MAX(log_visit.visit_last_action_time) $orderByDir";
$groupBy = "log_visit.idvisitor";
|
refs #<I> only search for prev/next visitor one day in the past and future
|
diff --git a/airflow/utils/log/gcs_task_handler.py b/airflow/utils/log/gcs_task_handler.py
index <HASH>..<HASH> 100644
--- a/airflow/utils/log/gcs_task_handler.py
+++ b/airflow/utils/log/gcs_task_handler.py
@@ -138,10 +138,10 @@ class GCSTaskHandler(FileTaskHandler, LoggingMixin):
if append:
try:
old_log = self.gcs_read(remote_log_location)
+ log = '\n'.join([old_log, log]) if old_log else log
except Exception as e:
if not hasattr(e, 'resp') or e.resp.get('status') != '404':
- old_log = '*** Previous log discarded: {}\n\n'.format(str(e))
- log = '\n'.join([old_log, log]) if old_log else log
+ log = '*** Previous log discarded: {}\n\n'.format(str(e)) + log
try:
bkt, blob = self.parse_gcs_url(remote_log_location)
|
[AIRFLOW-<I>] Do not reference unassigned variable
Closes #<I> from wrp/old_log
|
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/associations/preloader.rb
+++ b/activerecord/lib/active_record/associations/preloader.rb
@@ -16,7 +16,7 @@ module ActiveRecord
# When you load an author with all associated books Active Record will make
# multiple queries like this:
#
- # Author.includes(:books).where(:name => ['bell hooks', 'Homer').to_a
+ # Author.includes(:books).where(name: ['bell hooks', 'Homer']).to_a
#
# => SELECT `authors`.* FROM `authors` WHERE `name` IN ('bell hooks', 'Homer')
# => SELECT `books`.* FROM `books` WHERE `author_id` IN (2, 5)
|
docs, add missing closing bracket. [ci skip]
|
diff --git a/generate.py b/generate.py
index <HASH>..<HASH> 100644
--- a/generate.py
+++ b/generate.py
@@ -15,7 +15,7 @@ def functions():
cont = False
for ln in f:
- if cont is True:
+ if cont is ',':
lines.append(ln)
cont = False
if cont is '{':
@@ -32,7 +32,7 @@ def functions():
lines.append(ln)
if ln.strip()[-1] != ';':
- cont = True
+ cont = ','
if ln.strip()[-1] == '{':
cont = '{'
if ln.strip()[-1] == '(':
|
Pick useful value for normal line continuations
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.