diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/addon/components/docs-keyboard-shortcuts/index.js b/addon/components/docs-keyboard-shortcuts/index.js
index <HASH>..<HASH> 100644
--- a/addon/components/docs-keyboard-shortcuts/index.js
+++ b/addon/components/docs-keyboard-shortcuts/index.js
@@ -22,9 +22,9 @@ export default class DocsKeyboardShortcutsComponent extends Component {
@onKey('KeyG', { event: 'keyup' })
goto() {
if (!formElementHasFocus()) {
- this.set('isGoingTo', true);
+ this.isGoingTo = true;
later(() => {
- this.set('isGoingTo', false);
+ this.isGoingTo = false;
}, 500);
}
}
|
avoid using `this.set` (fixes #<I>) (#<I>)
Right now, the DocsKeyboardShortcutsComponent attempts to use `this.set`
to set a property. DocsKeyboardShortcutsComponent is a Glimmer
Component, so this API is not available. To avoid the problem, let's
use a regular assignment statement.
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -101,8 +101,8 @@ async function prerender (parentCompilation, request, options, inject, loader) {
};
// Only copy over allowed plugins (excluding them breaks extraction entirely).
- const allowedPlugins = ['MiniCssExtractPlugin', 'ExtractTextPlugin'];
- const plugins = (parentCompiler.options.plugins || []).filter(c => allowedPlugins.includes(c.constructor.name));
+ const allowedPlugins = /(MiniCssExtractPlugin|ExtractTextPlugin)/i;
+ const plugins = (parentCompiler.options.plugins || []).filter(c => allowedPlugins.test(c.constructor.name));
// Compile to an in-memory filesystem since we just want the resulting bundled code as a string
const compiler = parentCompilation.createChildCompiler('prerender', outputOptions, plugins);
|
Switch to regex in case the casing was wrong
|
diff --git a/lib/active_remote/version.rb b/lib/active_remote/version.rb
index <HASH>..<HASH> 100644
--- a/lib/active_remote/version.rb
+++ b/lib/active_remote/version.rb
@@ -1,3 +1,3 @@
module ActiveRemote
- VERSION = "0.2.0"
+ VERSION = "0.2.1"
end
|
Bumped version to <I>
|
diff --git a/zen-search/src/main/java/com/nominanuda/solr/SolrHelper.java b/zen-search/src/main/java/com/nominanuda/solr/SolrHelper.java
index <HASH>..<HASH> 100644
--- a/zen-search/src/main/java/com/nominanuda/solr/SolrHelper.java
+++ b/zen-search/src/main/java/com/nominanuda/solr/SolrHelper.java
@@ -112,7 +112,11 @@ public class SolrHelper {
if(val1 == null) {
continue;
} else if(struct.isPrimitiveOrNull(val1)) {
- addField(sid, k+"."+makeDynamicFieldName(k1, val1), val1, solrFields);
+ if(solrFields.contains(k+"."+k1)) {
+ addField(sid, k+"."+k1, val1, solrFields);
+ } else {
+ addField(sid, k+"."+makeDynamicFieldName(k1, val1), val1, solrFields);
+ }
}
}
} else if(struct.isDataArray(val)) {
|
configured dot aware paths correctly handled over dyn fields
|
diff --git a/acceptance/setup/packages/pre-suite/015_PackageHostsPresets.rb b/acceptance/setup/packages/pre-suite/015_PackageHostsPresets.rb
index <HASH>..<HASH> 100644
--- a/acceptance/setup/packages/pre-suite/015_PackageHostsPresets.rb
+++ b/acceptance/setup/packages/pre-suite/015_PackageHostsPresets.rb
@@ -1,5 +1,5 @@
if master['platform'] =~ /debian|ubuntu/
master.uses_passenger!
-elsif master['platform'] =~ /redhat|el|centos|scientific/
+elsif master['platform'] =~ /redhat|el|centos|scientific|fedora/
master['use-service'] = true
end
|
(maint) Include fedora as a platform to test with service packages.
Fedora had been left out, through no fault of its own, and was being
tested without starting and stopping via service scripts.
|
diff --git a/pydot.py b/pydot.py
index <HASH>..<HASH> 100644
--- a/pydot.py
+++ b/pydot.py
@@ -416,7 +416,7 @@ def find_graphviz():
It will look for 'dot', 'twopi' and 'neato' in all the directories
specified in the PATH environment variable.
- Thirdly: Default install location (Windows only)
+ Thirdly: Default install location
It will look for 'dot', 'twopi' and 'neato' in the default install
location under the "Program Files" directory.
|
DOC: last method tried to find graphviz is for linux and osx too
|
diff --git a/resources/views/partials/components.blade.php b/resources/views/partials/components.blade.php
index <HASH>..<HASH> 100644
--- a/resources/views/partials/components.blade.php
+++ b/resources/views/partials/components.blade.php
@@ -1,14 +1,14 @@
<ul class="list-group components">
@if($component_groups->count() > 0)
@foreach($component_groups as $componentGroup)
- @if($componentGroup->components->enabled()->count() > 0)
+ @if($componentGroup->components()->enabled()->count() > 0)
<li class="list-group-item group-name">
<i class="ion-ios-minus-outline group-toggle"></i>
<strong>{{ $componentGroup->name }}</strong>
</li>
<div class="group-items">
- @foreach($componentGroup->components->enabled()->sortBy('order') as $component)
+ @foreach($componentGroup->components()->enabled()->orderBy('order')->get() as $component)
@include('partials.component', compact($component))
@endforeach
</div>
|
Call enabled scope on the builder, not the collection
|
diff --git a/lib/ember-qunit/test.js b/lib/ember-qunit/test.js
index <HASH>..<HASH> 100644
--- a/lib/ember-qunit/test.js
+++ b/lib/ember-qunit/test.js
@@ -12,6 +12,11 @@ export default function test(testName, callback) {
var message;
if (reason instanceof Error) {
message = reason.stack;
+ if (reason.message && message.indexOf(reason.message) < 0) {
+ // PhantomJS has a `stack` that does not contain the actual
+ // exception message.
+ message = Ember.inspect(reason) + "\n" + message;
+ }
} else {
message = Ember.inspect(reason);
}
|
Better exception messages on phantomjs
Exceptions on phantomjs have a `stack` property that does not contain
the exception message itself. Which causes us to print only the stack
without the actual error message.
This change ensures that the error message must appear withinn our
output.
I'm not sure how to test this -- mocking out `ok` while also using `ok`
seems very headsplody.
|
diff --git a/parse.go b/parse.go
index <HASH>..<HASH> 100644
--- a/parse.go
+++ b/parse.go
@@ -585,6 +585,11 @@ func (p *parser) readParts(ns *[]Node) {
func (p *parser) wordPart() Node {
switch {
+ case p.got(LIT):
+ return Lit{
+ ValuePos: p.lpos,
+ Value: p.lval,
+ }
case p.peek(DOLLBR):
return p.paramExp()
case p.peek(DOLLDP):
@@ -620,11 +625,6 @@ func (p *parser) wordPart() Node {
}
p.gotLit(&pe.Param)
return pe
- case p.got(LIT):
- return Lit{
- ValuePos: p.lpos,
- Value: p.lval,
- }
case p.peek(CMDIN):
ci := CmdInput{Lss: p.pos}
ci.Stmts = p.stmtsNested(RPAREN)
|
parse: check for LIT first in wordPart()
It's the most basic and very probably most common occurence.
|
diff --git a/tests/plugins/keyword_test.py b/tests/plugins/keyword_test.py
index <HASH>..<HASH> 100644
--- a/tests/plugins/keyword_test.py
+++ b/tests/plugins/keyword_test.py
@@ -81,6 +81,9 @@ class TestKeywordDetector(object):
[
# FOLLOWED_BY_COLON_RE
(
+ 'private_key "";' # Nothing in the quotes
+ ),
+ (
'private_key \'"no spaces\';' # Has whitespace in-between
),
(
@@ -93,6 +96,13 @@ class TestKeywordDetector(object):
(
'theapikeyforfoo:hopenobodyfindsthisone' # Characters between apikey and :
),
+ (
+ 'theapikey:' # Nothing after :
+ ),
+ # FOLLOWED_BY_EQUAL_SIGNS_RE
+ (
+ 'my_password_for_stuff =' # Nothing after =
+ ),
],
)
def test_analyze_negatives(self, file_content):
|
Add a few more Keyword negative test-cases
|
diff --git a/test/helper.rb b/test/helper.rb
index <HASH>..<HASH> 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -30,7 +30,7 @@ if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=) && Rails.v
ActiveRecord::Base.raise_in_transactional_callbacks = true
end
-ActiveRecord::Base.configurations = { "test" => { adapter: 'sqlite3', database: ':memory:' } }
+ActiveRecord::Base.configurations = { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
ActiveRecord::Base.establish_connection(:test)
ActiveRecord::Schema.verbose = false
|
Make DB configuration RoR <I> compatible.
The configuration does not accept symbols as a keys anymore, since
<URL>
|
diff --git a/tests/cases/action/RequestTest.php b/tests/cases/action/RequestTest.php
index <HASH>..<HASH> 100644
--- a/tests/cases/action/RequestTest.php
+++ b/tests/cases/action/RequestTest.php
@@ -1015,7 +1015,10 @@ class RequestTest extends \lithium\test\Unit {
$request = new Request(array(
'url' => 'foo/bar',
'base' => null,
- 'env' => array('HTTP_HOST' => 'example.com'),
+ 'env' => array(
+ 'HTTP_HOST' => 'example.com',
+ 'PHP_SELF' => '/index.php'
+ ),
));
$expected = 'http://example.com/foo/bar';
|
Minor fix for a failing Request test when ran from cli
|
diff --git a/src-setup/org/opencms/setup/comptest/CmsSetupTestServletContainer.java b/src-setup/org/opencms/setup/comptest/CmsSetupTestServletContainer.java
index <HASH>..<HASH> 100644
--- a/src-setup/org/opencms/setup/comptest/CmsSetupTestServletContainer.java
+++ b/src-setup/org/opencms/setup/comptest/CmsSetupTestServletContainer.java
@@ -52,6 +52,7 @@ public class CmsSetupTestServletContainer implements I_CmsSetupTest {
{"Apache Tomcat/6", null},
{"Apache Tomcat/7", null},
{"Apache Tomcat/8", null},
+ {"Apache Tomcat/9", null},
{"WebLogic Server 9", null},
{
"Resin/3",
|
Added Tomcat 9 as valid servlet container version in setup wizard.
|
diff --git a/lib/binary_parser.js b/lib/binary_parser.js
index <HASH>..<HASH> 100644
--- a/lib/binary_parser.js
+++ b/lib/binary_parser.js
@@ -324,7 +324,7 @@ Object.keys(PRIMITIVE_TYPES).forEach(function(type) {
Parser.prototype.generateBit = function(ctx) {
ctx.bitFields.push(this);
- if (this.next && !this.next.type.match('Bit')) {
+ if (!this.next || (this.next && !this.next.type.match('Bit'))) {
var sum = 0;
ctx.bitFields.forEach(function(parser) {
sum += parser.options.length;
|
Fixed bug that parser ends with bit parser doesnt work correctly
|
diff --git a/tests/units/Client.php b/tests/units/Client.php
index <HASH>..<HASH> 100644
--- a/tests/units/Client.php
+++ b/tests/units/Client.php
@@ -136,13 +136,16 @@ class Client extends \ElasticSearch\tests\Base
$secondaryIndex = 'test-index2';
$doc = array('title' => $tag);
$options = array('refresh' => true);
- $client->setIndex($secondaryIndex)->index($doc, false, $options);
- $client->setIndex($primaryIndex)->index($doc, false, $options);
+ $client->setIndex($secondaryIndex);
+ $client->index($doc, false, $options);
+ $client->setIndex($primaryIndex);
+ $client->index($doc, false, $options);
$indexes = array($primaryIndex, $secondaryIndex);
// Use both indexes when searching
- $resp = $client->setIndex($indexes)->search("title:$tag");
+ $client->setIndex($indexes);
+ $resp = $client->search("title:$tag");
$this->assert->array($resp)->hasKey('hits')
->array($resp['hits'])->hasKey('total')
|
Fixes unit testing using an unimplemented fluent api on Client
|
diff --git a/h2network/src/test/java/org/h2gis/network/SpatialFunctionTest.java b/h2network/src/test/java/org/h2gis/network/SpatialFunctionTest.java
index <HASH>..<HASH> 100644
--- a/h2network/src/test/java/org/h2gis/network/SpatialFunctionTest.java
+++ b/h2network/src/test/java/org/h2gis/network/SpatialFunctionTest.java
@@ -27,7 +27,6 @@ package org.h2gis.network;
import org.h2.value.ValueGeometry;
import org.h2gis.h2spatial.CreateSpatialExtension;
import org.h2gis.h2spatial.ut.SpatialH2UT;
-import org.h2gis.network.graph_creator.GraphCreatorTest;
import org.h2gis.network.graph_creator.ST_Graph;
import org.h2gis.network.graph_creator.ST_ShortestPathLength;
import org.junit.*;
@@ -54,7 +53,6 @@ public class SpatialFunctionTest {
connection = SpatialH2UT.createSpatialDataBase(DB_NAME, true);
CreateSpatialExtension.registerFunction(connection.createStatement(), new ST_Graph(), "");
CreateSpatialExtension.registerFunction(connection.createStatement(), new ST_ShortestPathLength(), "");
- GraphCreatorTest.registerCormenGraph(connection);
}
@Before
|
Remove the extra call to ST_Graph (#<I>)
I was calling it an extra time when I created the cormen graph, but I
don't need the cormen graph for the st_graph tests!
|
diff --git a/master/buildbot/status/web/change_hook.py b/master/buildbot/status/web/change_hook.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/status/web/change_hook.py
+++ b/master/buildbot/status/web/change_hook.py
@@ -63,8 +63,8 @@ class ChangeHookResource(resource.Resource):
except ValueError, err:
request.setResponseCode(400, err.args[0])
return err.args[0]
- except Exception:
- log.err(None, "Exception processing web hook.")
+ except Exception, e:
+ log.err(e, "processing changes from web hook")
msg = "Error processing changes."
request.setResponseCode(500, msg)
return msg
@@ -78,7 +78,8 @@ class ChangeHookResource(resource.Resource):
def ok(_):
request.setResponseCode(202)
request.finish()
- def err(_):
+ def err(why):
+ log.err(why, "adding changes from web hook")
request.setResponseCode(500)
request.finish()
d.addCallbacks(ok, err)
|
Better logging of errors from web change hooks.
The error message was getting discarded, making debugging impossible.
|
diff --git a/assess_add_cloud.py b/assess_add_cloud.py
index <HASH>..<HASH> 100755
--- a/assess_add_cloud.py
+++ b/assess_add_cloud.py
@@ -36,11 +36,26 @@ def assess_cloud(client, example_cloud):
raise JujuAssertionError('Cloud mismatch')
+def iter_clouds(clouds):
+ for cloud_name, cloud in clouds.items():
+ yield cloud_name, cloud
+
+ for cloud_name, cloud in clouds.items():
+ if 'endpoint' not in cloud:
+ continue
+ cloud = deepcopy(cloud)
+ cloud['endpoint'] = 'A' * 4096
+ if cloud['type'] == 'vsphere':
+ for region in cloud['regions'].values():
+ region['endpoint'] = cloud['endpoint']
+ yield 'long-endpoint-{}'.format(cloud_name), cloud
+
+
def assess_all_clouds(client, clouds):
succeeded = set()
failed = set()
client.env.load_yaml()
- for cloud_name, cloud in clouds.items():
+ for cloud_name, cloud in iter_clouds(clouds):
sys.stdout.write('Testing {}.\n'.format(cloud_name))
try:
assess_cloud(client, cloud)
|
Test with <I>-char endpoints.
|
diff --git a/src/deploy/lambda/05-upload-zip.js b/src/deploy/lambda/05-upload-zip.js
index <HASH>..<HASH> 100644
--- a/src/deploy/lambda/05-upload-zip.js
+++ b/src/deploy/lambda/05-upload-zip.js
@@ -17,7 +17,8 @@ module.exports = function uploadZip(params, callback) {
},
// upload the function
function _upload(buffer, callback) {
- (new aws.Lambda).updateFunctionCode({
+ let l = new aws.Lambda({region: process.env.AWS_REGION})
+ l.updateFunctionCode({
FunctionName: lambda,
ZipFile: buffer
},
|
force env var (loaded by utils/init or we fail loudly)
|
diff --git a/medoo.php b/medoo.php
index <HASH>..<HASH> 100644
--- a/medoo.php
+++ b/medoo.php
@@ -589,7 +589,7 @@ class medoo
}
}
- $table_join[] = $join_array[ $match[2] ] . ' JOIN "' . $match[3] . '" ' . (isset($match[5]) ? ' AS "' . $match[5] . '"' : '') . $relation;
+ $table_join[] = $join_array[ $match[2] ] . ' JOIN "' . $match[3] . '" ' . (isset($match[5]) ? 'AS "' . $match[5] . '" ' : '') . $relation;
}
}
|
[fix] Table joining with alias bug
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -11,7 +11,7 @@ class EmojiFaviconPlugin {
compiler.hooks.make.tapAsync(
'EmojiFaviconPlugin',
(compilation, callback) =>
- render(this.emoji, [16, 32, 48])
+ render(this.emoji, [16, 32, 48, 64, 128, 256])
.then(toIco)
.then(ico => {
compilation.assets[filename] = {
diff --git a/webpack.config.js b/webpack.config.js
index <HASH>..<HASH> 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,5 +2,5 @@ const EmojiFaviconPlugin = require('./lib');
const HtmlPlugin = require('html-webpack-plugin');
module.exports = {
- plugins: [new HtmlPlugin(), new EmojiFaviconPlugin('🐠')]
+ plugins: [new EmojiFaviconPlugin('🐠'), new HtmlPlugin()]
};
|
Render more favicon sizes
|
diff --git a/bika/lims/content/client.py b/bika/lims/content/client.py
index <HASH>..<HASH> 100644
--- a/bika/lims/content/client.py
+++ b/bika/lims/content/client.py
@@ -105,6 +105,13 @@ class Client(Organisation):
def setTitle(self, value):
return self.setName(value)
+ def getClientID(self):
+ ### If no ID is defined (old data) invent one
+ cid = self.getField('ClientID').get(self)
+ if cid:
+ return cid.decode('utf-8').encode('utf-8')
+ return self.getId().decode('utf-8').encode('utf-8')
+
security.declarePublic('getContactsDisplayList')
def getContactsDisplayList(self):
wf = getToolByName(self, 'portal_workflow')
|
Retrieve ID as ClientID if database has no ClientID
|
diff --git a/models/user.go b/models/user.go
index <HASH>..<HASH> 100644
--- a/models/user.go
+++ b/models/user.go
@@ -629,7 +629,7 @@ func GetUserIdsByNames(names []string) []int64 {
// Get all email addresses
func GetEmailAddresses(uid int64) ([]*EmailAddress, error) {
emails := make([]*EmailAddress, 0, 5)
- err := x.Where("owner_id=?", uid).Find(&emails)
+ err := x.Where("uid=?", uid).Find(&emails)
if err != nil {
return nil, err
}
|
Fix for wrong email query
Changing EmailAdress.OwnerId to EmailAddress.Uid should have accompanied this change
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ license: GNU-GPL2
from setuptools import setup
setup(name='consoleprinter',
- version='32',
+ version='34',
description='Console printer with linenumbers, stacktraces, logging, conversions and coloring..',
url='https://github.com/erikdejonge/consoleprinter',
author='Erik de Jonge',
|
pip
Thursday <I> April <I> (week:<I> day:<I>), <I>:<I>:<I>
|
diff --git a/commands/get.go b/commands/get.go
index <HASH>..<HASH> 100644
--- a/commands/get.go
+++ b/commands/get.go
@@ -7,7 +7,7 @@ import (
)
type GetCommand struct {
- SecretIdentifier string `short:"n" long:"name" description:"Selects the secret being set"`
+ SecretIdentifier string `short:"n" long:"name" description:"Selects the secret to retrieve"`
}
func (cmd GetCommand) Execute([]string) error {
|
Updated help text for `get`
[#<I>] CLI user should be able to GET secret value
|
diff --git a/src/Behat/Mink/Exception/Exception.php b/src/Behat/Mink/Exception/Exception.php
index <HASH>..<HASH> 100644
--- a/src/Behat/Mink/Exception/Exception.php
+++ b/src/Behat/Mink/Exception/Exception.php
@@ -103,7 +103,7 @@ abstract class Exception extends \Exception
$driver = basename(str_replace('\\', '/', get_class($this->session->getDriver())));
$info = '+--[ ';
- if (!in_array($driver, array('SahiDriver', 'SeleniumDriver'))) {
+ if (!in_array($driver, array('SahiDriver', 'SeleniumDriver', 'Selenium2Driver'))) {
$info .= 'HTTP/1.1 '.$this->session->getStatusCode().' | ';
}
$info .= $this->session->getCurrentUrl().' | '.$driver." ]\n|\n";
|
Fix Exception::getResponseInfo with Selenium 2 driver
|
diff --git a/forms_builder/forms/admin.py b/forms_builder/forms/admin.py
index <HASH>..<HASH> 100644
--- a/forms_builder/forms/admin.py
+++ b/forms_builder/forms/admin.py
@@ -1,4 +1,3 @@
-
from csv import writer
from mimetypes import guess_type
from os.path import join
@@ -130,7 +129,7 @@ class FormAdmin(admin.ModelAdmin):
response["Content-Disposition"] = "attachment; filename=%s" % fname
queue = StringIO()
workbook = xlwt.Workbook(encoding='utf8')
- sheet = workbook.add_sheet(form.title)
+ sheet = workbook.add_sheet(form.title[:31])
for c, col in enumerate(entries_form.columns()):
sheet.write(0, c, col)
for r, row in enumerate(entries_form.rows(csv=True)):
|
Bugfix: Excel export fail for long form titles.
Workbook sheets created by xlwt must not contain more than <I> characters (I assume it's a limitation of Excel) - this should fix failing Excel exports for long form titles.
|
diff --git a/sphinx/docserver.py b/sphinx/docserver.py
index <HASH>..<HASH> 100644
--- a/sphinx/docserver.py
+++ b/sphinx/docserver.py
@@ -54,7 +54,7 @@ def shutdown_server():
def ui():
time.sleep(0.5)
- input("Press any key to exit...")
+ input("Press <ENTER> to exit...\n")
if __name__ == "__main__":
|
Changed docserver shutdown instruction. (#<I>)
|
diff --git a/lib/crawler.js b/lib/crawler.js
index <HASH>..<HASH> 100644
--- a/lib/crawler.js
+++ b/lib/crawler.js
@@ -306,7 +306,7 @@ var Crawler = function(initialURL) {
/**
* Collection of regular expressions and functions that are applied in the
- * default {@link Crawler#discoverRegex} method.
+ * default {@link Crawler#discoverResources} method.
* @type {Array.<RegExp|Function>}
*/
this.discoverRegex = [
@@ -348,15 +348,15 @@ var Crawler = function(initialURL) {
];
/**
- * Controls whether the default {@link Crawler#discoverRegex} should scan
- * for new resources inside of HTML comments.
+ * Controls whether the default {@link Crawler#discoverResources} should
+ * scan for new resources inside of HTML comments.
* @type {Boolean}
*/
this.parseHTMLComments = true;
/**
- * Controls whether the default {@link Crawler#discoverRegex} should scan
- * for new resources inside of `<script>` tags.
+ * Controls whether the default {@link Crawler#discoverResources} should
+ * scan for new resources inside of `<script>` tags.
* @type {Boolean}
*/
this.parseScriptTags = true;
|
Fixed errant reference to discoverResources method in inline docs
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -44,11 +44,12 @@ NotFoundError = function(options) {
RelationshipError = function(options) {
const type = options.type;
const method = options.method;
+ const target = options.target;
this.status = 400;
this.name = `RelationshipError`;
this.title = `Relationship error`;
- this.detail = `You cannot ${method} a ${type} relationship.`;
+ this.detail = `You cannot ${method} a ${type} relationship with a ${target}.`;
}
util.inherits(AdapterError, RestleError);
|
Add a target option for RelationshipError
|
diff --git a/packages/crafty-runner-webpack/src/webpack.js b/packages/crafty-runner-webpack/src/webpack.js
index <HASH>..<HASH> 100644
--- a/packages/crafty-runner-webpack/src/webpack.js
+++ b/packages/crafty-runner-webpack/src/webpack.js
@@ -75,7 +75,9 @@ module.exports = function(crafty, bundle, webpackPort) {
const PnpWebpackPlugin = require(`pnp-webpack-plugin`);
chain.resolve
.plugin("pnp-webpack-plugin")
- .init(Plugin => Plugin)
+ // Cloning the plugin exports as this would otherwise
+ // fail with `Cannot redefine property: __pluginArgs`
+ .init(Plugin => ({...Plugin}))
.use(PnpWebpackPlugin);
chain.resolveLoader
|
Fix pnp issue in webpack with multiple bundles
|
diff --git a/tests/fixture/__init__.py b/tests/fixture/__init__.py
index <HASH>..<HASH> 100644
--- a/tests/fixture/__init__.py
+++ b/tests/fixture/__init__.py
@@ -25,7 +25,7 @@ def start_tangelo():
"--host", host,
"--port", port,
"--root", "tests/web",
- "--plugin-config", "plugin.conf"],
+ "--plugin-config", "venv/share/tangelo/plugin/plugin.conf"],
stderr=subprocess.PIPE)
buf = []
|
Fixing bug in tests resulting from deploying plugins into package
|
diff --git a/slick.editors.js b/slick.editors.js
index <HASH>..<HASH> 100644
--- a/slick.editors.js
+++ b/slick.editors.js
@@ -285,12 +285,12 @@
};
this.loadValue = function(item) {
- $input.val((defaultValue = item[args.column.field]) ? "yes" : "no");
- $input.select();
+ $select.val((defaultValue = item[args.column.field]) ? "yes" : "no");
+ $select.select();
};
this.serializeValue = function() {
- return ($input.val() == "yes");
+ return ($select.val() == "yes");
};
this.applyValue = function(item,state) {
|
- FIXED: corrected variable reference in YesNoSelectCellEditor
|
diff --git a/src/js/components/InfiniteScroll/InfiniteScroll.js b/src/js/components/InfiniteScroll/InfiniteScroll.js
index <HASH>..<HASH> 100644
--- a/src/js/components/InfiniteScroll/InfiniteScroll.js
+++ b/src/js/components/InfiniteScroll/InfiniteScroll.js
@@ -177,6 +177,11 @@ const InfiniteScroll = ({
}
}, 100);
return () => clearTimeout(timer);
+ // Omitting scrollShow as a dependency due to concern that setScrollShow
+ // is being called within the timer. If left included, re-renders and other
+ // dependency values could change in an unpredictable manner during timer
+ // and potentially result in an infinite loop.
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [renderPageBounds, show, step]);
// calculate and keep track of page heights
|
Disabled missing dependency warning to InfiniteScroll useLayoutEffect (#<I>)
* add dependency to useLayoutEffect
* disabling eslint warning and adding documentation
|
diff --git a/src/engine.js b/src/engine.js
index <HASH>..<HASH> 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -12,7 +12,7 @@ class Mover {
class Health {
start() {
-
+ console.log("Initializing "+this.host.name+" health to max hps");
}
update() {
@@ -57,17 +57,35 @@ class Engine {
start() {
let deltaTime = 1000;
+
+ // call start method to let everything do initialization
+ this.scene.forEach(node => {
+ if(node.start) {
+ node.start();
+ }
+ if(node.components) {
+ node.components.forEach(component => {
+ if(component.start) {
+ component.start();
+ }
+ });
+ }
+ });
+
+ // lock frame rate and update components each frame
setInterval(f => {
console.log("Tick");
this.scene.forEach(node => {
if(node.update) {
node.update(deltaTime);
}
- node.components.forEach(component => {
- if(component.update) {
- component.update(deltaTime);
- }
- })
+ if(node.components) {
+ node.components.forEach(component => {
+ if(component.update) {
+ component.update(deltaTime);
+ }
+ })
+ }
})
}, deltaTime);
}
|
Added start method call to engine example
|
diff --git a/build/ci.go b/build/ci.go
index <HASH>..<HASH> 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -236,6 +236,14 @@ func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd {
gocmd := filepath.Join(runtime.GOROOT(), "bin", "go")
cmd := exec.Command(gocmd, subcmd)
cmd.Args = append(cmd.Args, args...)
+
+ if subcmd == "build" || subcmd == "install" || subcmd == "test" {
+ // Go CGO has a Windows linker error prior to 1.8 (https://github.com/golang/go/issues/8756).
+ // Work around issue by allowing multiple definitions for <1.8 builds.
+ if runtime.GOOS == "windows" && runtime.Version() < "go1.8" {
+ cmd.Args = append(cmd.Args, []string{"-ldflags", "-extldflags -Wl,--allow-multiple-definition"}...)
+ }
+ }
cmd.Env = []string{
"GO15VENDOREXPERIMENT=1",
"GOPATH=" + build.GOPATH(),
|
build: work around CGO linker bug on pre-<I> Go
|
diff --git a/lib/service/extract-saz.js b/lib/service/extract-saz.js
index <HASH>..<HASH> 100644
--- a/lib/service/extract-saz.js
+++ b/lib/service/extract-saz.js
@@ -34,7 +34,8 @@ function parseMetaInfo(result) {
if (!req.headers.host) {
req.headers.host = options.host;
}
- port = options.port || (/^https:/i.test(req.url) ? 443 : 80);
+ req.isHttps = /^https:/i.test(req.url);
+ port = options.port || (req.isHttps ? 443 : 80);
req.url = options.path;
} else if (typeof req.headers.host !== 'string') {
req.headers.host = '';
@@ -77,7 +78,7 @@ function parseMetaInfo(result) {
result.url = req.url;
result.isHttps = true;
} else {
- result.url = 'http://' + req.headers.host + req.url;
+ result.url = 'http' + (req.isHttps ? 's' : '') +'://' + req.headers.host + req.url;
if (/\bwebsocket\b/i.test(req.headers.upgrade)) {
result.url = result.url.replace(/^http/, 'ws');
}
|
fix: import saz file
|
diff --git a/lib/perobs/SpaceTree.rb b/lib/perobs/SpaceTree.rb
index <HASH>..<HASH> 100644
--- a/lib/perobs/SpaceTree.rb
+++ b/lib/perobs/SpaceTree.rb
@@ -111,10 +111,12 @@ module PEROBS
if size <= 0
PEROBS.log.fatal "Size (#{size}) must be larger than 0."
end
- if has_space?(address, size)
- PEROBS.log.fatal "The space with address #{address} and size #{size} " +
- "can't be added twice."
- end
+ # The following check is fairly costly and should never trigger unless
+ # there is a bug in the PEROBS code. Only use this for debugging.
+ #if has_space?(address, size)
+ # PEROBS.log.fatal "The space with address #{address} and size " +
+ # "#{size} can't be added twice."
+ #end
root.add_space(address, size)
end
|
Remove costly but unnecessary check in SpaceTree code.
|
diff --git a/spyder_profiler/widgets/profilergui.py b/spyder_profiler/widgets/profilergui.py
index <HASH>..<HASH> 100644
--- a/spyder_profiler/widgets/profilergui.py
+++ b/spyder_profiler/widgets/profilergui.py
@@ -570,12 +570,10 @@ class ProfilerDataTree(QTreeWidget):
if len(x) == 2 and self.compare_file is not None:
difference = x[0] - x[1]
- if difference < 0:
- diff_str = "".join(['', fmt[1] % self.format_measure(difference)])
- color = "green"
- elif difference > 0:
- diff_str = "".join(['+', fmt[1] % self.format_measure(difference)])
- color = "red"
+ if difference:
+ color, sign = ('green', '-') if difference < 0 else ('red', '+')
+ diff_str = "".join(
+ [sign, fmt[1] % self.format_measure(abs(difference))])
return [fmt[0] % self.format_measure(x[0]), [diff_str, color]]
def format_output(self, child_key):
|
Issue <I>: Fix negative deltas on profiler
|
diff --git a/lib/core/environment.js b/lib/core/environment.js
index <HASH>..<HASH> 100644
--- a/lib/core/environment.js
+++ b/lib/core/environment.js
@@ -57,8 +57,8 @@ exports.getConfig = function (platform, env, project_dir, argv) {
}
// option to configure custom ports
- if (argv.hasOwnProperty('custom_ports')) {
- var c_ports = argv['custom_ports'].split(',').reduce(function (memo, port) {
+ if (argv.hasOwnProperty('custom-ports')) {
+ var c_ports = argv['custom-ports'].split(',').reduce(function (memo, port) {
port = parseInt(port, 10);
if (port > 0) {
memo.push(port);
@@ -138,7 +138,7 @@ exports.getConfig = function (platform, env, project_dir, argv) {
});
}
- if (!process.env.COUCH_URL && !argv.hasOwnProperty('custom_ports')) {
+ if (!process.env.COUCH_URL && !argv.hasOwnProperty('custom-ports')) {
cfg.couch.port = ports.getPort(cfg.id + '-couch');
}
|
fix(custom-ports): unify on `custom-ports`
* * *
This commit was sponsored by The Hoodie Firm.
You can hire The Hoodie Firm:
<URL>
|
diff --git a/src/Wardrobe/Core/Controllers/AdminController.php b/src/Wardrobe/Core/Controllers/AdminController.php
index <HASH>..<HASH> 100644
--- a/src/Wardrobe/Core/Controllers/AdminController.php
+++ b/src/Wardrobe/Core/Controllers/AdminController.php
@@ -26,7 +26,7 @@ class AdminController extends BaseController {
$this->users = $users;
- $this->beforeFilter('core::wardrobe.auth');
+ $this->beforeFilter('wardrobe.auth');
}
/**
@@ -34,7 +34,7 @@ class AdminController extends BaseController {
*/
public function index()
{
- return View::make('admin.index')
+ return View::make('core::admin.index')
->with('users', $this->users->all())
->with('user', Auth::user())
->with('locale', $this->loadLanguage());
|
Try to get the filter/view right
|
diff --git a/fastTSNE/nearest_neighbors.py b/fastTSNE/nearest_neighbors.py
index <HASH>..<HASH> 100644
--- a/fastTSNE/nearest_neighbors.py
+++ b/fastTSNE/nearest_neighbors.py
@@ -64,7 +64,7 @@ class BallTree(KNNIndex):
self.index.fit(data)
def query_train(self, data, k):
- distances, neighbors = self.index.kneighbors(n_neighbors=k)
+ distances, neighbors = self.index.kneighbors(n_neighbors=k + 1)
return neighbors, distances
def query(self, query, k):
@@ -78,8 +78,7 @@ class VPTree(KNNIndex):
self.index = c_vptree(data)
def query_train(self, data, k):
- data = np.ascontiguousarray(data, dtype=np.float64)
- indices, distances = self.index.query(data, k, num_threads=self.n_jobs)
+ indices, distances = self.index.query_train(k + 1, num_threads=self.n_jobs)
return indices[:, 1:], distances[:, 1:]
def query(self, query, k):
|
Compute proper number of neighbors in query_train
|
diff --git a/src/Message/ExpressPurchaseRequest.php b/src/Message/ExpressPurchaseRequest.php
index <HASH>..<HASH> 100644
--- a/src/Message/ExpressPurchaseRequest.php
+++ b/src/Message/ExpressPurchaseRequest.php
@@ -34,14 +34,25 @@ class ExpressPurchaseRequest extends BasePurchaseRequest
"_input_charset" => $this->getInputCharset(),
"extra_common_param" => $this->getExtraCommonParam(),
"extend_param" => $this->getExtendParam(),
+ "it_b_pay" => $this->getItBPay(),
+ "qr_pay_mode" => $this->getQrPayMode(),
);
- $data = array_filter($data);
+
+ // removes all NULL, FALSE and Empty Strings but leaves 0 (zero) values
+ $data = array_filter($data,'strlen');
$data['sign'] = $this->getParamsSignature($data);
$data['sign_type'] = $this->getSignType();
return $data;
}
+ public function setQrPayMode($value){
+ $this->setParameter('qr_pay_mode', $value);
+ }
+
+ public function getQrPayMode(){
+ return $this->getParameter('qr_pay_mode');
+ }
public function getAntiPhishingKey()
{
|
Update ExpressPurchaseRequest.php
add "qr_pay_mode" to Qrcode pay & fix issue: when the value is zero(0) will be removed
|
diff --git a/twython/endpoints.py b/twython/endpoints.py
index <HASH>..<HASH> 100644
--- a/twython/endpoints.py
+++ b/twython/endpoints.py
@@ -542,8 +542,8 @@ class EndpointsMixin(object):
"""
return self.get('mutes/users/ids', params=params)
- list_mutes_ids.iter_mode = 'cursor'
- list_mutes_ids.iter_key = 'ids'
+ list_mute_ids.iter_mode = 'cursor'
+ list_mute_ids.iter_key = 'ids'
def create_mute(self, **params):
"""Mutes the specified user, preventing their tweets appearing
|
Fixed typo with list_mute_ids.
|
diff --git a/types/result_code.go b/types/result_code.go
index <HASH>..<HASH> 100644
--- a/types/result_code.go
+++ b/types/result_code.go
@@ -83,8 +83,8 @@ const (
// Client or server has timed out.
TIMEOUT ResultCode = 9
- // XDS product is not available.
- NO_XDS ResultCode = 10
+ // Operation not allowed in current configuration.
+ ALWAYS_FORBIDDEN ResultCode = 10
// Server is not accepting requests.
SERVER_NOT_AVAILABLE ResultCode = 11
@@ -340,8 +340,8 @@ func ResultCodeToString(resultCode ResultCode) string {
case TIMEOUT:
return "Timeout"
- case NO_XDS:
- return "XDS not available"
+ case ALWAYS_FORBIDDEN:
+ return "Operation not allowed in current configuration."
case SERVER_NOT_AVAILABLE:
return "Server not available"
|
Rename ResultCode NO_XDS to ALWAYS_FORBIDDEN
|
diff --git a/samples/python/setup.py b/samples/python/setup.py
index <HASH>..<HASH> 100644
--- a/samples/python/setup.py
+++ b/samples/python/setup.py
@@ -8,5 +8,5 @@ setup(
author='Vyacheslav Gudkov',
author_email='vyacheslav.gudkov@dsr-company.com',
description='This is the sample of usage python wrapper for Hyperledger Indy Crypto.',
- install_requires=['python3-indy_crypto==0.0.1-dev12']
+ install_requires=['python3-indy_crypto==0.0.1-dev14']
)
|
Updated indy version in sample
|
diff --git a/src/amo-client.js b/src/amo-client.js
index <HASH>..<HASH> 100644
--- a/src/amo-client.js
+++ b/src/amo-client.js
@@ -571,6 +571,9 @@ export class PseudoProgress {
finish() {
this.clearInterval(this.interval);
this.fillBucket();
+ // The bucket has already filled to the terminal width at this point
+ // but for copy/paste purposes, add a new line:
+ this.stdout.write("\n");
}
randomlyFillBucket() {
|
fix: Added missing new line after download progress bar
|
diff --git a/advanced_filters/__init__.py b/advanced_filters/__init__.py
index <HASH>..<HASH> 100644
--- a/advanced_filters/__init__.py
+++ b/advanced_filters/__init__.py
@@ -1 +1 @@
-__version__ = '1.0.7.1'
+__version__ = '1.1.0'
|
chore: bump to next minor release <I>
Since we're breaking backward compatiblity, by dropping Python <I>
|
diff --git a/server/const.go b/server/const.go
index <HASH>..<HASH> 100644
--- a/server/const.go
+++ b/server/const.go
@@ -41,7 +41,7 @@ var (
const (
// VERSION is the current version for the server.
- VERSION = "2.2.0-RC.7.3"
+ VERSION = "2.2.0-RC.7.4"
// PROTO is the currently supported protocol.
// 0 was the original
|
Bump to RC<I>
|
diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py
index <HASH>..<HASH> 100644
--- a/tornado/test/process_test.py
+++ b/tornado/test/process_test.py
@@ -235,7 +235,7 @@ class SubprocessTest(AsyncTestCase):
os.kill(subproc.pid, signal.SIGTERM)
try:
- ret = self.wait(timeout=1.0)
+ ret = self.wait()
except AssertionError:
# We failed to get the termination signal. This test is
# occasionally flaky on pypy, so try to get a little more
@@ -246,7 +246,7 @@ class SubprocessTest(AsyncTestCase):
fut = subproc.stdout.read_until_close()
fut.add_done_callback(lambda f: self.stop()) # type: ignore
try:
- self.wait(timeout=1.0)
+ self.wait()
except AssertionError:
raise AssertionError("subprocess failed to terminate")
else:
|
test: Use default timeouts in sigchild test
The 1s timeout used here has become flaky with the introduction of a
sleep (before the timeout even starts).
|
diff --git a/salt/modules/systemd.py b/salt/modules/systemd.py
index <HASH>..<HASH> 100644
--- a/salt/modules/systemd.py
+++ b/salt/modules/systemd.py
@@ -389,7 +389,8 @@ def unmask(name):
'''
if _untracked_custom_unit_found(name) or _unit_file_changed(name):
systemctl_reload()
- return not __salt__['cmd.retcode'](_systemctl_cmd('unmask', name))
+ return not (__salt__['cmd.retcode'](_systemctl_cmd('unmask', name))
+ or __salt__['cmd.retcode'](_systemctl_cmd('unmask --runtime', name)))
def mask(name):
|
Unmask a runtime masked services too
|
diff --git a/src/Engine/MySQL/Quote.php b/src/Engine/MySQL/Quote.php
index <HASH>..<HASH> 100644
--- a/src/Engine/MySQL/Quote.php
+++ b/src/Engine/MySQL/Quote.php
@@ -4,6 +4,7 @@ namespace G4\DataMapper\Engine\MySQL;
use G4\DataMapper\Common\RangeValue;
use G4\DataMapper\Common\SingleValue;
+use G4\DataMapper\Exception\NotAnInstanceException;
class Quote
{
@@ -18,7 +19,7 @@ class Quote
public function __construct($value)
{
if(!($value instanceof SingleValue) && !($value instanceof RangeValue)) {
- throw new \Exception('Something is not right.');
+ throw new NotAnInstanceException('Value should be an instance of SingleValue or RangeValue object.');
}
$this->value = $value;
|
<I> - Added more specific Exception class.
|
diff --git a/src/views/post/_form.php b/src/views/post/_form.php
index <HASH>..<HASH> 100755
--- a/src/views/post/_form.php
+++ b/src/views/post/_form.php
@@ -42,7 +42,6 @@ $this->registerJS($script);
'draggable' => true,
'appendixView' => '/post/appendix.php',
'cropAllowed' => true,
- 'limit' => 2,
]) ?>
<br>
|
Any pictures can be uploaded for post (change 2 to 0 for Uploader::limit).
|
diff --git a/admin/index.php b/admin/index.php
index <HASH>..<HASH> 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -285,7 +285,7 @@
echo '<input type="hidden" name="confirmupgrade" value="1" />';
echo '<input type="hidden" name="confirmrelease" value="1" />';
echo '</div>';
- echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="0" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
+ echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
echo '</form>';
}
|
MDL-<I> unattended upgrade fixed; merged from MOODLE_<I>_STABLE
|
diff --git a/lib/Algo/Methods/InstantRunoff/InstantRunoff.php b/lib/Algo/Methods/InstantRunoff/InstantRunoff.php
index <HASH>..<HASH> 100644
--- a/lib/Algo/Methods/InstantRunoff/InstantRunoff.php
+++ b/lib/Algo/Methods/InstantRunoff/InstantRunoff.php
@@ -124,7 +124,7 @@ class InstantRunoff extends Method implements MethodInterface
if (count($oneRank) !== 1) :
break;
elseif (!in_array($this->_selfElection->getCandidateKey($oneCandidate), $candidateDone, true)) :
- $score[$this->_selfElection->getCandidateKey(reset($oneRank))] += 1;
+ $score[$this->_selfElection->getCandidateKey($oneRank[array_key_first($oneRank)])] += 1;
break 2;
endif;
endforeach;
|
PHP <I> Optimization: Not use reset for InstantRunoff
|
diff --git a/src/test/java/org/minimalj/util/CsvReaderTest.java b/src/test/java/org/minimalj/util/CsvReaderTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/minimalj/util/CsvReaderTest.java
+++ b/src/test/java/org/minimalj/util/CsvReaderTest.java
@@ -82,6 +82,12 @@ public class CsvReaderTest {
reader = reader("\"ab\",");
Assert.assertEquals("ab", reader.readEscaped());
+
+ reader = reader("\"a,b\",");
+ Assert.assertEquals("a,b", reader.readEscaped());
+
+ reader = reader("\"a\"\"b\",");
+ Assert.assertEquals("a\"b", reader.readEscaped());
}
@Test
|
Test escaped separator and escaping character
|
diff --git a/code/tasks/OrderMigrationTask.php b/code/tasks/OrderMigrationTask.php
index <HASH>..<HASH> 100644
--- a/code/tasks/OrderMigrationTask.php
+++ b/code/tasks/OrderMigrationTask.php
@@ -35,7 +35,7 @@ class OrderMigrationTask extends MigrationTask {
}
}
- $this->log("Updated {$updated} items");
+ $this->log("Updated Delivery Names on {$updated} items");
}
public function log($message)
|
Add more comprehensive message on delivery firstnames migration class
|
diff --git a/src/Malenki/Math/Stats/ParametricTest/Anova.php b/src/Malenki/Math/Stats/ParametricTest/Anova.php
index <HASH>..<HASH> 100644
--- a/src/Malenki/Math/Stats/ParametricTest/Anova.php
+++ b/src/Malenki/Math/Stats/ParametricTest/Anova.php
@@ -90,9 +90,9 @@ class Anova implements \Countable
public function withinGroupDegreesOfFreedom()
{
- //TODO: I am not sure…
if(is_null($this->int_wgdof)){
$arr = array();
+
foreach($this->arr_samples as $s){
$arr[] = count($s) - 1;
}
|
I am sure now, so, I removed TODO
|
diff --git a/shared/flex.go b/shared/flex.go
index <HASH>..<HASH> 100644
--- a/shared/flex.go
+++ b/shared/flex.go
@@ -3,7 +3,7 @@
*/
package shared
-var Version = "2.0.0.rc5"
+var Version = "2.0.0.rc6"
var UserAgent = "LXD " + Version
/*
|
Release LXD <I>.rc6
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -54,6 +54,7 @@ setup(name='httpretty',
tests_require=test_packages(),
install_requires=['urllib3'],
license='MIT',
+ test_suite='nose.collector',
classifiers=["Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Topic :: Software Development :: Testing"],
|
Tell setuptools to use nose testsuite
This allows us to run the full test suite (unit and functional) by using
the python setup.py test command.
|
diff --git a/lib/puppet/provider.rb b/lib/puppet/provider.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/provider.rb
+++ b/lib/puppet/provider.rb
@@ -551,6 +551,11 @@ class Puppet::Provider
"#{@resource}(provider=#{self.class.name})"
end
+ # @return [String] Returns a human readable string with information about the resource and the provider.
+ def inspect
+ to_s
+ end
+
# Makes providers comparable.
include Comparable
# Compares this provider against another provider.
|
(maint) Implement inspect method on base type provider.
It looks like RSpec was changed to call inspect rather than to_s when
displaying error messages on expected values. This results in
uninformative error messages when a type provider is passed to expect,
such as in:
```
expect(provider).to be_insync(is)
```
This simply adds an `#inspect` method that calls the existing `#to_s`
implementation to restore the expected error messages.
|
diff --git a/lib/arjdbc/mysql/adapter.rb b/lib/arjdbc/mysql/adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/arjdbc/mysql/adapter.rb
+++ b/lib/arjdbc/mysql/adapter.rb
@@ -240,23 +240,6 @@ module ArJdbc
end
end
- # DATABASE STATEMENTS ======================================
-
- # @override
- def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
- execute sql, name, binds
- end
-
- # @override
- def exec_update(sql, name, binds)
- execute sql, name, binds
- end
-
- # @override
- def exec_delete(sql, name, binds)
- execute sql, name, binds
- end
-
# @override make it public just like native MySQL adapter does
def update_sql(sql, name = nil)
super
|
[mysql] use prepared statement support with AR's exec_xxx methods
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,6 @@ setup(
author_email='jared.dillard@gmail.com',
install_requires=['six', 'sphinx >= 1.2'],
url="https://github.com/jdillard/sphinx-sitemap",
- download_url="https://github.com/jdillard/sphinx-sitemap/archive/0.1.tar.gz",
+ download_url="https://github.com/jdillard/sphinx-sitemap/archive/0.2.tar.gz",
packages=['sphinx_sitemap'],
)
|
update download version in setup.py
|
diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index <HASH>..<HASH> 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -95,7 +95,7 @@ module Precious
@css = settings.wiki_options[:css]
@js = settings.wiki_options[:js]
@mathjax_config = settings.wiki_options[:mathjax_config]
- @allow_editing = settings.wiki_options[:allow_editing]
+ @allow_editing = settings.wiki_options.fetch(:allow_editing, true)
end
get '/' do
|
Set allow_editing in Precious::App to true by default. Closes #<I>
|
diff --git a/src/main/java/io/vlingo/actors/Directory.java b/src/main/java/io/vlingo/actors/Directory.java
index <HASH>..<HASH> 100644
--- a/src/main/java/io/vlingo/actors/Directory.java
+++ b/src/main/java/io/vlingo/actors/Directory.java
@@ -79,7 +79,7 @@ final class Directory {
void register(final Address address, final Actor actor) {
if (isRegistered(address)) {
- throw new IllegalArgumentException("The actor address is already registered: " + address);
+ throw new ActorAddressAlreadyRegistered(actor, address);
}
this.maps[mapIndex(address)].put(address, actor);
}
@@ -116,4 +116,13 @@ final class Directory {
private int mapIndex(final Address address) {
return Math.abs(address.hashCode() % maps.length);
}
+
+
+ public static final class ActorAddressAlreadyRegistered extends IllegalArgumentException {
+ public ActorAddressAlreadyRegistered(Actor actor, Address address) {
+ super(String.format("Failed to register Actor of type %s. Address is already registered: %s",
+ actor.getClass(),
+ address));
+ }
+ }
}
|
changes to more specific exception in Directory#register address already registered
|
diff --git a/acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb b/acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb
index <HASH>..<HASH> 100644
--- a/acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb
+++ b/acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb
@@ -16,7 +16,7 @@ agents.each do |agent|
step "query for all files, which should return nothing"
on(agent, puppet_resource('file'), :acceptable_exit_codes => [1]) do
- assert_match(%r{Listing all file instances is not supported. Please specify a file or directory, e.g. puppet resource file /etc}, stderr)
+ assert_match(%r{Listing all file instances is not supported. Please specify a file or directory, e.g. puppet resource file /etc}, stdout)
end
["/", "/etc"].each do |file|
|
re-fix acceptance test related to logging changes
|
diff --git a/app/models/deal_redemptions/redeem_code.rb b/app/models/deal_redemptions/redeem_code.rb
index <HASH>..<HASH> 100644
--- a/app/models/deal_redemptions/redeem_code.rb
+++ b/app/models/deal_redemptions/redeem_code.rb
@@ -12,7 +12,7 @@ module DealRedemptions
# Validate redemption code as an active voucher
def validate_code(params)
- if self.company.slug == params[:company] && self.code == params[:code] && self.active?
+ if self.company.slug == params[:company] && self.active?
true
else
false
|
Removed code params requirement from validate code model action
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,9 +54,9 @@ author = u'abidibo'
# built documents.
#
# The short X.Y version.
-version = u'1.2.0'
+version = u'1.2.1'
# The full version, including alpha/beta/rc tags.
-release = u'1.2.0'
+release = u'1.2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
setup(
name='django-baton',
- version='1.2.0',
+ version='1.2.1',
packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
include_package_data=True,
license='MIT License',
|
bumped version number to <I>
|
diff --git a/packages/ocap-util/jest.config.js b/packages/ocap-util/jest.config.js
index <HASH>..<HASH> 100644
--- a/packages/ocap-util/jest.config.js
+++ b/packages/ocap-util/jest.config.js
@@ -171,10 +171,4 @@ module.exports = {
// Indicates whether each individual test should be reported during the run
// verbose: null,
-
- // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
- // watchPathIgnorePatterns: [],
-
- // Whether to use watchman for file crawling
- // watchman: true,
};
|
fake change to test lerna publish
|
diff --git a/logrus_test.go b/logrus_test.go
index <HASH>..<HASH> 100644
--- a/logrus_test.go
+++ b/logrus_test.go
@@ -191,7 +191,7 @@ func TestUserSuppliedLevelFieldHasPrefix(t *testing.T) {
log.WithField("level", 1).Info("test")
}, func(fields Fields) {
assert.Equal(t, fields["level"], "info")
- assert.Equal(t, fields["fields.level"], 1)
+ assert.Equal(t, fields["fields.level"], 1.0) // JSON has floats only
})
}
|
assertify changed behavior and consider float<I> != int
|
diff --git a/simuvex/s_irop.py b/simuvex/s_irop.py
index <HASH>..<HASH> 100644
--- a/simuvex/s_irop.py
+++ b/simuvex/s_irop.py
@@ -57,6 +57,11 @@ def generic_DivS(args, size):
# TODO: not sure if this should be extended *before* or *after* multiplication
return args[0] / args[1]
+def generic_DivU(args, size):
+ # TODO: not sure if this should be extended *before* or *after* multiplication
+ # TODO: Make it unsigned division
+ return args[0] / args[1]
+
# Count the leading zeroes
def generic_Clz(args, size):
wtf_expr = symexec.BitVecVal(size, size)
|
Implemented Iop_DivU.
|
diff --git a/cli/version.js b/cli/version.js
index <HASH>..<HASH> 100644
--- a/cli/version.js
+++ b/cli/version.js
@@ -9,7 +9,7 @@ const logger = require('winston');
* @name version
*/
function version() {
- const packageJson = require(path.resolve(__dirname, '..', '..', 'package.json'));
+ const packageJson = require(path.resolve(process.cwd(), 'package.json'));
logger.info('@blackbaud/skyux-builder: %s', packageJson.version);
}
diff --git a/test/cli-version.spec.js b/test/cli-version.spec.js
index <HASH>..<HASH> 100644
--- a/test/cli-version.spec.js
+++ b/test/cli-version.spec.js
@@ -11,7 +11,7 @@ describe('cli version', () => {
const version = 'this.should.match';
let stubs = {};
- stubs[path.join(__dirname, '..', '..', 'package.json')] = {
+ stubs[path.join(process.cwd(), 'package.json')] = {
'@noCallThru': true,
version: version
};
|
Using SPA path instead of relying on ../../ (#<I>)
* Using SPA path instead of relying on ../../
* Fixed ../../ reference in test
|
diff --git a/ChernoffFaces.js b/ChernoffFaces.js
index <HASH>..<HASH> 100644
--- a/ChernoffFaces.js
+++ b/ChernoffFaces.js
@@ -170,12 +170,14 @@
ChernoffFaces.prototype.randomize = function() {
var fv = FaceVector.random();
this.fp.redraw(fv);
- var sc_options = {
- features: JSUS.mergeOnValue(FaceVector.defaults, fv),
- change: this.change
- };
- this.sc.init(sc_options);
- this.sc.refresh();
+ if (this.sc.root) {
+ var sc_options = {
+ features: JSUS.mergeOnValue(FaceVector.defaults, fv),
+ change: this.change
+ };
+ this.sc.init(sc_options);
+ this.sc.refresh();
+ }
return true;
};
|
Minor Changes in CF. Still not working
|
diff --git a/test/models/rememberable_test.rb b/test/models/rememberable_test.rb
index <HASH>..<HASH> 100644
--- a/test/models/rememberable_test.rb
+++ b/test/models/rememberable_test.rb
@@ -18,19 +18,19 @@ class RememberableTest < ActiveSupport::TestCase
test 'forget_me should clear remember token and save the record without validating' do
user = create_user
user.remember_me!
- assert user.remember_token?
+ assert_not user.remember_token.nil?
user.expects(:valid?).never
user.forget_me!
- assert_not user.remember_token?
+ assert user.remember_token.nil?
assert_not user.changed?
end
test 'forget_me should clear remember_created_at' do
user = create_user
user.remember_me!
- assert user.remember_created_at?
+ assert_not user.remember_created_at.nil?
user.forget_me!
- assert_not user.remember_created_at?
+ assert user.remember_created_at.nil?
end
test 'forget should do nothing if no remember token exists' do
|
Do not use ActiveRecord only methods in tests.
|
diff --git a/lib/stripe/engine.rb b/lib/stripe/engine.rb
index <HASH>..<HASH> 100644
--- a/lib/stripe/engine.rb
+++ b/lib/stripe/engine.rb
@@ -81,7 +81,9 @@ environment file directly.
end
initializer 'stripe.assets.precompile' do |app|
- app.config.assets.precompile += %w( stripe_elements.js stripe_elements.css )
+ unless ::Rails.env.test?
+ app.config.assets.precompile += %w( stripe_elements.js stripe_elements.css )
+ end
end
rake_tasks do
|
Skip asset precompilation in test env
|
diff --git a/src/Sonata/ProductBundle/Entity/BaseProduct.php b/src/Sonata/ProductBundle/Entity/BaseProduct.php
index <HASH>..<HASH> 100644
--- a/src/Sonata/ProductBundle/Entity/BaseProduct.php
+++ b/src/Sonata/ProductBundle/Entity/BaseProduct.php
@@ -485,7 +485,7 @@ abstract class BaseProduct implements ProductInterface
public function __toString()
{
- return $this->getName();
+ return (string) $this->getName();
}
public function preUpdate()
|
Added type to avoid issue if name is NULL
|
diff --git a/app/assets/javascripts/validations.js b/app/assets/javascripts/validations.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/validations.js
+++ b/app/assets/javascripts/validations.js
@@ -55,7 +55,7 @@ function validate(formContainer) {
// Do not check disabled form fields.
if (!$(this).is(':disabled')) {
var validatorTypes = $(this).attr("data-validate").split(" ");
- for (var i = 0; i < validatorTypes.length; i++) {
+ for (var i = 0; (!errors && i < validatorTypes.length); i++) {
errors = dispatchRuleValidation($(this), validatorTypes[i]);
}
}
|
Stop validating when first error is found
|
diff --git a/Model/TokenConfig.php b/Model/TokenConfig.php
index <HASH>..<HASH> 100644
--- a/Model/TokenConfig.php
+++ b/Model/TokenConfig.php
@@ -51,6 +51,10 @@ class TokenConfig
return $this->defaultKey;
}
+ if (!isset($this->tokens[$key])) {
+ throw new \LogicException(sprintf('Token with name %s could not be found', $key));
+ }
+
return $key;
}
|
Added exception if token name is not defiend
|
diff --git a/comments/request.js b/comments/request.js
index <HASH>..<HASH> 100644
--- a/comments/request.js
+++ b/comments/request.js
@@ -17,6 +17,10 @@ function Request(req) {
}
Request.prototype = {
+ login: function(user, pass, callback) {
+ this.db.users().login(user, pass, callback);
+ },
+
getCommentCountsPerTarget: function(callback) {
this.db.comments().countsPerTarget(function(err, counts) {
callback(counts);
diff --git a/comments/validator.js b/comments/validator.js
index <HASH>..<HASH> 100644
--- a/comments/validator.js
+++ b/comments/validator.js
@@ -73,8 +73,8 @@ var validator = {
return;
}
- this.req.session = req.session || {};
- this.req.session.user = user;
+ req.session = req.session || {};
+ req.session.user = user;
next();
}.bind(this));
@@ -84,7 +84,7 @@ var validator = {
* Performs the logout.
*/
doLogout: function(req, res, next) {
- this.req.session.user = null;
+ req.session.user = null;
next();
}
|
Fix login. Regression caused by previous refactor.
|
diff --git a/mathparse/mathparse.py b/mathparse/mathparse.py
index <HASH>..<HASH> 100644
--- a/mathparse/mathparse.py
+++ b/mathparse/mathparse.py
@@ -100,8 +100,13 @@ def replace_word_tokens(string, language):
operators.update(words['unary_operators'])
# Ensures unicode string processing
- if not isinstance(string, unicode):
- string = unicode(string, "utf-8")
+ import sys
+ if sys.version_info.major == 3:
+ if not isinstance(string, str):
+ string.decode("utf-8")
+ else:
+ if not isinstance(string, unicode):
+ string = unicode(string, "utf-8")
for operator in list(operators.keys()):
if operator in string:
|
Added portability between python versions
|
diff --git a/springy.js b/springy.js
index <HASH>..<HASH> 100644
--- a/springy.js
+++ b/springy.js
@@ -1,7 +1,7 @@
/**
* Springy v2.0.1
*
- * Copyright (c) 2010 Dennis Hotson
+ * Copyright (c) 2010-2013 Dennis Hotson
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
|
updated copyright year
The <I> made me think that the project was abandoned. Also, arbor.js writes that it's based on springy. Only now that I take a closer look I see that there are recent commits.
|
diff --git a/lib/util/storage.js b/lib/util/storage.js
index <HASH>..<HASH> 100644
--- a/lib/util/storage.js
+++ b/lib/util/storage.js
@@ -14,14 +14,14 @@ const proxyHandler = {
return true;
},
ownKeys(storage) {
- return Reflect.ownKeys(storage.getAll());
+ return Reflect.ownKeys(storage._store);
},
has(target, prop) {
return target.get(prop) !== undefined;
},
getOwnPropertyDescriptor(target, key) {
return {
- value: () => this.get(target, key),
+ get: () => this.get(target, key),
enumerable: true,
configurable: true
};
|
Use private property at proxy, deepClone is not required for it.
|
diff --git a/etcdserver/cluster.go b/etcdserver/cluster.go
index <HASH>..<HASH> 100644
--- a/etcdserver/cluster.go
+++ b/etcdserver/cluster.go
@@ -223,6 +223,13 @@ func (c *cluster) Recover() {
c.members, c.removed = membersFromStore(c.store)
c.version = clusterVersionFromStore(c.store)
MustDetectDowngrade(c.version)
+
+ for _, m := range c.members {
+ plog.Infof("added member %s %v to cluster %s from store", m.ID, m.PeerURLs, c.id)
+ }
+ if c.version != nil {
+ plog.Infof("set the cluster version to %v from store", version.Cluster(c.version.String()))
+ }
}
// ValidateConfigurationChange takes a proposed ConfChange and
diff --git a/etcdserver/server.go b/etcdserver/server.go
index <HASH>..<HASH> 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -292,9 +292,6 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
plog.Infof("recovered store from snapshot at index %d", snapshot.Metadata.Index)
}
cfg.Print()
- if snapshot != nil {
- plog.Infof("loaded cluster information from store: %s", cl)
- }
if !cfg.ForceNewCluster {
id, cl, n, s, w = restartNode(cfg, snapshot)
} else {
|
etcdserver: print out correct restored cluster info
Before this PR, it always prints nil because cluster info has not been
covered when print:
```
<I>-<I>-<I> <I>:<I>:<I> I | etcdserver: loaded cluster information
from store: <nil>
```
|
diff --git a/keanu-project/src/test/java/io/improbable/keanu/algorithms/mcmc/MetropolisHastingsTest.java b/keanu-project/src/test/java/io/improbable/keanu/algorithms/mcmc/MetropolisHastingsTest.java
index <HASH>..<HASH> 100644
--- a/keanu-project/src/test/java/io/improbable/keanu/algorithms/mcmc/MetropolisHastingsTest.java
+++ b/keanu-project/src/test/java/io/improbable/keanu/algorithms/mcmc/MetropolisHastingsTest.java
@@ -149,7 +149,7 @@ public class MetropolisHastingsTest {
@Category(Slow.class)
@Test
- public void samplesComplexDiscreteWithMultipleVariableSelect() {
+ public void samplesComplexDiscreteWithFullVariableSelect() {
MCMCTestCase testCase = new MultiVariateDiscreteTestCase();
|
change MH test name to say full variable select like the variable selector
|
diff --git a/lib/regexp-examples/helpers.rb b/lib/regexp-examples/helpers.rb
index <HASH>..<HASH> 100644
--- a/lib/regexp-examples/helpers.rb
+++ b/lib/regexp-examples/helpers.rb
@@ -26,10 +26,8 @@ module RegexpExamples
end
def self.generic_map_result(repeaters, method)
- repeaters
- .map { |repeater| repeater.public_send(method) }
- .instance_eval do |partial_results|
- RegexpExamples.permutations_of_strings(partial_results)
- end
+ permutations_of_strings(
+ repeaters.map { |repeater| repeater.public_send(method) }
+ )
end
end
|
Minor refactor/simplification
I was being unnecessarily clever here...
|
diff --git a/core-bundle/src/Framework/ContaoFramework.php b/core-bundle/src/Framework/ContaoFramework.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Framework/ContaoFramework.php
+++ b/core-bundle/src/Framework/ContaoFramework.php
@@ -265,7 +265,7 @@ class ContaoFramework implements ContaoFrameworkInterface, ContainerAwareInterfa
try {
$route = $this->router->generate($attributes->get('_route'), $attributes->get('_route_params'));
- } catch (\InvalidArgumentException $e) {
+ } catch (\Exception $e) {
return null;
}
|
[Core] Catch all exceptions when generating a route (see #<I>).
|
diff --git a/spec/unit/transaction.rb b/spec/unit/transaction.rb
index <HASH>..<HASH> 100755
--- a/spec/unit/transaction.rb
+++ b/spec/unit/transaction.rb
@@ -20,8 +20,8 @@ describe Puppet::Transaction do
describe "when generating resources" do
it "should finish all resources" do
- generator = stub 'generator', :depthfirst? => true
- resource = stub 'resource'
+ generator = stub 'generator', :depthfirst? => true, :tags => []
+ resource = stub 'resource', :tag => nil
@catalog = Puppet::Resource::Catalog.new
@transaction = Puppet::Transaction.new(@catalog)
@@ -36,8 +36,8 @@ describe Puppet::Transaction do
end
it "should skip generated resources that conflict with existing resources" do
- generator = mock 'generator'
- resource = stub 'resource'
+ generator = mock 'generator', :tags => []
+ resource = stub 'resource', :tag => nil
@catalog = Puppet::Resource::Catalog.new
@transaction = Puppet::Transaction.new(@catalog)
|
Fix failing tests introduced by #<I>
|
diff --git a/lib/fugit/cron.rb b/lib/fugit/cron.rb
index <HASH>..<HASH> 100644
--- a/lib/fugit/cron.rb
+++ b/lib/fugit/cron.rb
@@ -97,19 +97,14 @@ module Fugit
inc((24 - @t.hour) * 3600 - @t.min * 60 - @t.sec)
- #inc( - @t.hour * 3600) if @t.hour != 0 # compensate for entering DST
- #inc( - @t.hour * 3600) if @t.hour > 0 && @t.hour < 7
- # leads to gh-60...
-
- if @t.hour == 0
- # it's good, carry on...
- elsif @t.hour < 12
- @t =
- begin
- ::EtOrbi.make(@t.year, @t.month, @t.day, @t.zone)
- rescue ::TZInfo::PeriodNotFound
- ::EtOrbi.make(@t.year, @t.month, @t.day + 1, @t.zone)
- end
+ return if @t.hour == 0
+
+ if @t.hour < 12
+ begin
+ @t = ::EtOrbi.make(@t.year, @t.month, @t.day, @t.zone)
+ rescue ::TZInfo::PeriodNotFound
+ inc((24 - @t.hour) * 3600)
+ end
else
inc((24 - @t.hour) * 3600)
end
|
Simplify inc_day, gh-<I>
|
diff --git a/eZ/Publish/API/Repository/Tests/RoleServiceTest.php b/eZ/Publish/API/Repository/Tests/RoleServiceTest.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/Repository/Tests/RoleServiceTest.php
+++ b/eZ/Publish/API/Repository/Tests/RoleServiceTest.php
@@ -1328,9 +1328,9 @@ class RoleServiceTest extends BaseTest
array( 1, 'user', 'login' ),
array( 1, 'user', 'login' ),
array( 1, 'user', 'login' ),
- array( 6, 'notification', 'use' ),
- array( 6, 'user', 'password' ),
- array( 6, 'user', 'selfedit' ),
+ array( $role->id, 'notification', 'use' ),
+ array( $role->id, 'user', 'password' ),
+ array( $role->id, 'user', 'selfedit' ),
),
$policies
);
|
Fixed: Do not rely on hardcoded role IDs in role service tests
|
diff --git a/tasks/webdriver.js b/tasks/webdriver.js
index <HASH>..<HASH> 100644
--- a/tasks/webdriver.js
+++ b/tasks/webdriver.js
@@ -27,9 +27,9 @@ module.exports = function(grunt) {
timeout: 1000000,
updateSauceJob: false
}),
- capabilities = deepmerge(options,this.data.options),
- tunnelIdentifier = options['tunnel-identifier'] || capabilities.desiredCapabilities['tunnel-identifier'] || null,
- tunnelFlags = capabilities.desiredCapabilities['tunnel-flags'] || [],
+ capabilities = deepmerge(options,this.data.options || {}),
+ tunnelIdentifier = options['tunnel-identifier'] || (capabilities.desiredCapabilities ? capabilities.desiredCapabilities['tunnel-identifier'] : null) || null,
+ tunnelFlags = (capabilities.desiredCapabilities ? capabilities.desiredCapabilities['tunnel-flags'] : []) || [],
isLastTask = grunt.task._queue.length - 2 === 0;
/**
|
make task work with absolute minimum required options - closes #<I>
|
diff --git a/html/pfappserver/root/static/admin/users.js b/html/pfappserver/root/static/admin/users.js
index <HASH>..<HASH> 100644
--- a/html/pfappserver/root/static/admin/users.js
+++ b/html/pfappserver/root/static/admin/users.js
@@ -63,7 +63,7 @@ function init() {
return false;
});
- /* Save a node (from the modal editor) */
+ /* Save a user (from the modal editor) */
$('body').on('click', '#updateUser', function(event) {
var btn = $(this),
modal = $('#modalUser'),
@@ -71,9 +71,9 @@ function init() {
modal_body = modal.find('.modal-body'),
url = $(this).attr('href'),
valid = false;
- btn.button('loading');
valid = isFormValid(form);
if (valid) {
+ btn.button('loading');
$.ajax({
type: 'POST',
url: url,
|
Reset the save btn when user form is invalid
|
diff --git a/hug/redirect.py b/hug/redirect.py
index <HASH>..<HASH> 100644
--- a/hug/redirect.py
+++ b/hug/redirect.py
@@ -45,7 +45,7 @@ def see_other(location):
def temporary(location):
- """Redirects to the specified location using HTTP 304 status code"""
+ """Redirects to the specified location using HTTP 307 status code"""
to(location, falcon.HTTP_307)
|
Update wrong status code stated in docstring
|
diff --git a/packages/upload-core/upload.js b/packages/upload-core/upload.js
index <HASH>..<HASH> 100644
--- a/packages/upload-core/upload.js
+++ b/packages/upload-core/upload.js
@@ -49,6 +49,8 @@ class Upload {
'X-XSRF-TOKEN': this.getToken(),
'X-Availity-Customer-ID': this.options.customerId,
'X-Client-ID': this.options.clientId,
+ 'Availity-Filename': file.name,
+ 'Availity-Content-Type': file.type,
},
onError: err => {
this.error = err;
|
fix(upload-core): add additional headers
|
diff --git a/packages/ember/tests/helpers/setup-sentry.js b/packages/ember/tests/helpers/setup-sentry.js
index <HASH>..<HASH> 100644
--- a/packages/ember/tests/helpers/setup-sentry.js
+++ b/packages/ember/tests/helpers/setup-sentry.js
@@ -28,9 +28,13 @@ export function setupSentryTest(hooks) {
this.fetchStub = sinon.stub(window, 'fetch');
/**
- * Stops global test suite failures from unhandled rejections and allows assertion on them
+ * Stops global test suite failures from unhandled rejections and allows assertion on them.
+ * onUncaughtException is used in QUnit 2.17 onwards.
*/
- this.qunitOnUnhandledRejection = sinon.stub(QUnit, 'onUnhandledRejection');
+ this.qunitOnUnhandledRejection = sinon.stub(
+ QUnit,
+ QUnit.onUncaughtException ? 'onUncaughtException' : 'onUnhandledRejection',
+ );
QUnit.onError = function({ message }) {
errorMessages.push(message.split('Error: ')[1]);
|
ref(ember): Fix Qunit causing flake
A recent update to QUnit (<I>) changed onUnhandledRejection to onUncaughtException. Ember try seems to be re-installing the latest qunit. This fix should make both sides of the QUnit change work.
|
diff --git a/bindinfo/handle.go b/bindinfo/handle.go
index <HASH>..<HASH> 100644
--- a/bindinfo/handle.go
+++ b/bindinfo/handle.go
@@ -1058,7 +1058,7 @@ func runSQL(ctx context.Context, sctx sessionctx.Context, sql string, resultChan
}
// HandleEvolvePlanTask tries to evolve one plan task.
-// It only handle one tasks once because we want each task could use the latest parameters.
+// It only processes one task at a time because we want each task to use the latest parameters.
func (h *BindHandle) HandleEvolvePlanTask(sctx sessionctx.Context, adminEvolve bool) error {
originalSQL, db, binding := h.getOnePendingVerifyJob()
if originalSQL == "" {
|
bindinfo: fix the comment typo (#<I>)
|
diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php
index <HASH>..<HASH> 100755
--- a/PHPCI/Plugin/PhpMessDetector.php
+++ b/PHPCI/Plugin/PhpMessDetector.php
@@ -115,7 +115,7 @@ class PhpMessDetector implements \PHPCI\Plugin
protected function overrideSetting($options, $key)
{
- if (isset($options[$key]) && is_array($options['key'])) {
+ if (isset($options[$key]) && is_array($options[$key])) {
$this->{$key} = $options[$key];
}
}
|
Fix bug where options could not be overridden in PHPMessdetector plugin
|
diff --git a/eliot/tests/test_output.py b/eliot/tests/test_output.py
index <HASH>..<HASH> 100644
--- a/eliot/tests/test_output.py
+++ b/eliot/tests/test_output.py
@@ -249,7 +249,7 @@ class MemoryLoggerTests(TestCase):
for i in range(write_count):
logger.write(msg, serializer)
- msgs = list({} for i in range(thread_count))
+ msgs = list({u"i": i} for i in range(thread_count))
serializers = list(object() for i in range(thread_count))
write_args = zip(msgs, serializers)
threads = list(Thread(target=write, args=args) for args in write_args)
|
Make the msg dicts distinct values
Otherwise list.index always just picks the first one.
|
diff --git a/molgenis-data-migrate/src/main/java/org/molgenis/data/version/v1_5/Step1UpgradeMetaData.java b/molgenis-data-migrate/src/main/java/org/molgenis/data/version/v1_5/Step1UpgradeMetaData.java
index <HASH>..<HASH> 100644
--- a/molgenis-data-migrate/src/main/java/org/molgenis/data/version/v1_5/Step1UpgradeMetaData.java
+++ b/molgenis-data-migrate/src/main/java/org/molgenis/data/version/v1_5/Step1UpgradeMetaData.java
@@ -132,10 +132,10 @@ public class Step1UpgradeMetaData extends MetaDataUpgrade
for (Entity v15EntityMetaDataEntity : entityRepository)
{
LOG.info("Setting attribute order for entity: "
- + v15EntityMetaDataEntity.get(EntityMetaDataMetaData1_4.SIMPLE_NAME));
+ + v15EntityMetaDataEntity.get(EntityMetaDataMetaData1_4.FULL_NAME));
List<Entity> attributes = Lists.newArrayList(searchService.search(
EQ(AttributeMetaDataMetaData1_4.ENTITY,
- v15EntityMetaDataEntity.getString(EntityMetaDataMetaData.SIMPLE_NAME)),
+ v15EntityMetaDataEntity.getString(EntityMetaDataMetaData.FULL_NAME)),
new AttributeMetaDataMetaData1_4()));
for(Entity attribute : attributes)
LOG.info("Setting attribute : "
|
fix upgrading of attributes: use fullname instead of simplename for the entity
|
diff --git a/lib/libPDF.php b/lib/libPDF.php
index <HASH>..<HASH> 100644
--- a/lib/libPDF.php
+++ b/lib/libPDF.php
@@ -222,7 +222,7 @@ class libPDF extends FPDF implements libPDFInterface {
$doc->loadXML("<root/>");
- $html = preg_replace("/&(?![a-z\d]+|#\d+|#x[a-f\d]+);/i", "&", $html);
+ $html = preg_replace("/&(?!([a-z\d]+|#\d+|#x[a-f\d]+);)/i", "&", $html);
$f = $doc->createDocumentFragment();
if( !$f->appendXML($html) )
|
Fix HTMLText()'s entity detection not working all the time
|
diff --git a/salt/modules/mac_ports.py b/salt/modules/mac_ports.py
index <HASH>..<HASH> 100644
--- a/salt/modules/mac_ports.py
+++ b/salt/modules/mac_ports.py
@@ -306,13 +306,13 @@ def install(name=None, refresh=False, pkgs=None, **kwargs):
if pkgs is None:
version_num = kwargs.get('version')
variant_spec = kwargs.get('variant')
- spec = None
+ spec = {}
if version_num:
- spec = (spec or '') + '@' + version_num
+ spec['version'] = version_num
if variant_spec:
- spec = (spec or '') + variant_spec
+ spec['variant'] = variant_spec
pkg_params = {name: spec}
@@ -321,7 +321,14 @@ def install(name=None, refresh=False, pkgs=None, **kwargs):
formulas_array = []
for pname, pparams in six.iteritems(pkg_params):
- formulas_array.append(pname + (pparams or ''))
+ formulas_array.append(pname)
+
+ if pparams:
+ if 'version' in pparams:
+ formulas_array.append('@' + pparams['version'])
+
+ if 'variant' in pparams:
+ formulas_array.append(pparams['variant'])
old = list_pkgs()
cmd = ['port', 'install']
|
emit port cli version, variants as separate args
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.