diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/lib/adminlib.php b/lib/adminlib.php
index <HASH>..<HASH> 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -5853,7 +5853,6 @@ function print_plugin_tables() {
'comments',
'course_list',
'course_summary',
- 'navigation',
'glossary_random',
'html',
'loancalc',
@@ -5861,6 +5860,7 @@ function print_plugin_tables() {
'mentees',
'messages',
'mnet_hosts',
+ 'navigation',
'news_items',
'online_users',
'participants', | navigation MDL-<I> Fixed alphabetical order of blocks |
diff --git a/tests/Webfactory/Constraint/IsEventSubscriberTest.php b/tests/Webfactory/Constraint/IsEventSubscriberTest.php
index <HASH>..<HASH> 100644
--- a/tests/Webfactory/Constraint/IsEventSubscriberTest.php
+++ b/tests/Webfactory/Constraint/IsEventSubscriberTest.php
@@ -62,9 +62,19 @@ class IsEventSubscriberTest extends \PHPUnit_Framework_TestCase
}
/**
+ * Ensures that the check fails if the given method reference is not valid.
+ */
+ public function testFailsIfInvalidMethodReferenceIsProvided()
+ {
+ $subscriber = new TestSubscriber(array('event' => array(new \stdClass(), 0)));
+
+ $this->assertRejected($subscriber);
+ }
+
+ /**
* Ensures that the validation detects a not existing event method.
*/
- public function testFailsIfReferenceMethodDoesNotExist()
+ public function testFailsIfReferencedMethodDoesNotExist()
{
$subscriber = new TestSubscriber(array('event' => 'doesNotExist')); | added test (#<I>) |
diff --git a/xurls.go b/xurls.go
index <HASH>..<HASH> 100644
--- a/xurls.go
+++ b/xurls.go
@@ -34,8 +34,8 @@ const (
webURL = hostName + port + path
email = `[a-zA-Z0-9._%\-+]+@` + hostName
- strict = `\b` + scheme + pathCont
- relaxed = strict + `|` + webURL + `|` + email
+ strict = `(\b` + scheme + pathCont + `)`
+ relaxed = `(` + strict + `|` + webURL + `|` + email + `)`
)
var (
@@ -53,7 +53,7 @@ func init() {
// StrictMatchingScheme produces a regexp that matches urls like Strict but
// whose scheme matches the given regular expression.
func StrictMatchingScheme(exp string) (*regexp.Regexp, error) {
- strictMatching := `\b(?i)(` + exp + `)(?-i)` + pathCont
+ strictMatching := `(\b(?i)(` + exp + `)(?-i)` + pathCont + `)`
re, err := regexp.Compile(strictMatching)
if err != nil {
return nil, err | Wrap exposed expressions in parenthesis
This means that they can be reused via Regexp.String() and added to other
regex expressions without breaking. If they are like `a|b|c`, then adding `d`
at the end wouldn't - `a|b|cd` - while `(a|b|c)d` does. |
diff --git a/ampersand-dom.js b/ampersand-dom.js
index <HASH>..<HASH> 100644
--- a/ampersand-dom.js
+++ b/ampersand-dom.js
@@ -4,8 +4,10 @@ var dom = module.exports = {
},
// optimize if we have classList
addClass: function (el, cls) {
+ cls = getString(cls);
+ if (!cls) return;
if (el.classList) {
- el.classList.add(getString(cls));
+ el.classList.add(cls);
} else {
if (!hasClass(el, cls)) {
if (el.classList) { | only add classes if there's a class to add |
diff --git a/examples/with-graphql-hooks/lib/with-graphql-client.js b/examples/with-graphql-hooks/lib/with-graphql-client.js
index <HASH>..<HASH> 100644
--- a/examples/with-graphql-hooks/lib/with-graphql-client.js
+++ b/examples/with-graphql-hooks/lib/with-graphql-client.js
@@ -7,7 +7,7 @@ export default App => {
return class GraphQLHooks extends React.Component {
static displayName = 'GraphQLHooks(App)'
static async getInitialProps(ctx) {
- const { Component, router } = ctx
+ const { AppTree } = ctx
let appProps = {}
if (App.getInitialProps) {
@@ -22,14 +22,7 @@ export default App => {
try {
// Run all GraphQL queries
graphQLState = await getInitialState({
- App: (
- <App
- {...appProps}
- Component={Component}
- router={router}
- graphQLClient={graphQLClient}
- />
- ),
+ App: <AppTree {...appProps} graphQLClient={graphQLClient} />,
client: graphQLClient,
})
} catch (error) { | Fix TypeError in with-graphql-hooks example (#<I>)
Reported at <URL> |
diff --git a/Model/ImportExport/Processor/Export/Node/Tree.php b/Model/ImportExport/Processor/Export/Node/Tree.php
index <HASH>..<HASH> 100644
--- a/Model/ImportExport/Processor/Export/Node/Tree.php
+++ b/Model/ImportExport/Processor/Export/Node/Tree.php
@@ -62,16 +62,16 @@ class Tree
private function reindexTreeNodes(array $nodes): array
{
- $data = [];
+ $tree = [];
foreach ($nodes as $node) {
if (isset($node[ExtendedFields::NODES])) {
$node[ExtendedFields::NODES] = $this->reindexTreeNodes($node[ExtendedFields::NODES]);
}
- $data[] = $node;
+ $tree[] = $node;
}
- return $data;
+ return $tree;
}
} | [<I>] Rename a variable in node export tree processor reindex method |
diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MorfologikGermanyGermanSpellerRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MorfologikGermanyGermanSpellerRuleTest.java
index <HASH>..<HASH> 100644
--- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MorfologikGermanyGermanSpellerRuleTest.java
+++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MorfologikGermanyGermanSpellerRuleTest.java
@@ -54,7 +54,7 @@ public class MorfologikGermanyGermanSpellerRuleTest {
RuleMatch[] matches = rule.match(lt.getAnalyzedSentence("daß"));
assertEquals(1, matches.length);
- assertEquals("dass", matches[0].getSuggestedReplacements().get(0));
+ assertEquals("das", matches[0].getSuggestedReplacements().get(0)); // "dass" would actually be better...
}
@Test | [de] fix test broken by recent de_DE.info changes |
diff --git a/eZ/Publish/Core/REST/Server/Output/ValueObjectVisitor/UserSession.php b/eZ/Publish/Core/REST/Server/Output/ValueObjectVisitor/UserSession.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/REST/Server/Output/ValueObjectVisitor/UserSession.php
+++ b/eZ/Publish/Core/REST/Server/Output/ValueObjectVisitor/UserSession.php
@@ -28,6 +28,7 @@ class UserSession extends ValueObjectVisitor
public function visit( Visitor $visitor, Generator $generator, $data )
{
$visitor->setHeader( 'Content-Type', $generator->getMediaType( 'Session' ) );
+ // @deprecated Since 5.0, this cookie is used for legacy until Static cache support is removed along with this cookie
$visitor->setHeader( 'Set-Cookie', 'is_logged_in=true; path=/' );
//@todo Needs refactoring, disabling certain headers should not be done this way | Added: deprecated comment |
diff --git a/djpaypal/models/webhooks.py b/djpaypal/models/webhooks.py
index <HASH>..<HASH> 100644
--- a/djpaypal/models/webhooks.py
+++ b/djpaypal/models/webhooks.py
@@ -92,7 +92,8 @@ class WebhookEventTrigger(models.Model):
try:
obj.valid = obj.verify(PAYPAL_WEBHOOK_ID)
if obj.valid:
- obj.process()
+ # Process the item (do not save it, it'll get saved below)
+ obj.process(save=False)
except Exception as e:
obj.exception = str(e)
obj.traceback = format_exc()
@@ -139,7 +140,10 @@ class WebhookEventTrigger(models.Model):
auth_algo=self.auth_algo,
)
- def process(self):
+ def process(self, save=True):
obj = WebhookEvent.process(self.data)
self.webhook_event = obj
+ self.processed = True
+ if save:
+ self.save()
return obj | Save WebhookEventTrigger on process() by default |
diff --git a/constance/__init__.py b/constance/__init__.py
index <HASH>..<HASH> 100644
--- a/constance/__init__.py
+++ b/constance/__init__.py
@@ -1,10 +1,12 @@
from .base import Config
+from django.utils.functional import SimpleLazyObject
__version__ = '1.0a1'
+
try:
from django.apps import AppConfig # noqa
except ImportError:
- config = Config()
+ config = SimpleLazyObject(Config)
else:
default_app_config = 'constance.apps.ConstanceConfig' | Make the config object lazy for old Djangos.
This should prevent import time side effects from instantiating the config object directly there. |
diff --git a/config/deploy.rb b/config/deploy.rb
index <HASH>..<HASH> 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -7,7 +7,11 @@ set :ssh_options, { :forward_agent => true }
set :user, "deployer" # The server's user for deploys
set :scm_passphrase, "p@ssw0rd" # The deploy user's password
set :deploy_via, :remote_cache
+set :deploy_to, "/home/deploy"
+set :default_environment, {
+ 'PATH' => "/opt/rbenv/shims/:$PATH"
+}
set :stages, %w(production development)
set :default_stage, "development"
require 'capistrano/ext/multistage' | Add some more config options to make sure we pick up rbenv inside capistrano runs on the remote machine' |
diff --git a/config/debugbar.php b/config/debugbar.php
index <HASH>..<HASH> 100644
--- a/config/debugbar.php
+++ b/config/debugbar.php
@@ -67,6 +67,9 @@ return [
| you can use this option to disable sending the data through the headers.
|
| Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools.
+ |
+ | Note for your request to be identified as ajax requests they must either send the header
+ | X-Requested-With with the value XMLHttpRequest (most JS libraries send this), or have application/json as a Accept header.
*/
'capture_ajax' => true, | Add expanation of how AJAX requests are identified. (#<I>) |
diff --git a/lib/services/fs.js b/lib/services/fs.js
index <HASH>..<HASH> 100644
--- a/lib/services/fs.js
+++ b/lib/services/fs.js
@@ -161,7 +161,8 @@ var remove = function(args) {
// Rename
var rename = function(args) {
- if (!args.from || !args.to) throw "Need 'from' and 'to'";
+ if (!args.from || (!args.to && !args.name)) throw "Need 'from' and 'to'";
+ if (args.name) args.to = path.join(path.dirname(args.from), args.name);
return Q.all([
workspace.path(args.from),
diff --git a/test/rpc_fs.js b/test/rpc_fs.js
index <HASH>..<HASH> 100644
--- a/test/rpc_fs.js
+++ b/test/rpc_fs.js
@@ -83,10 +83,19 @@ describe('RPC fs', function() {
, done);
});
+ it("can rename a file", function(done) {
+ qdone(
+ rpc.get("fs").rename({
+ from: "test_new2.txt",
+ name: "test_new3.txt"
+ })
+ , done);
+ });
+
it("can remove a file", function(done) {
qdone(
rpc.get("fs").remove({
- path: "test_new2.txt"
+ path: "test_new3.txt"
})
, done);
}); | Add option "name" for fs.rename
Add test for it |
diff --git a/test/fork-listen2-problem.tap.js b/test/fork-listen2-problem.tap.js
index <HASH>..<HASH> 100644
--- a/test/fork-listen2-problem.tap.js
+++ b/test/fork-listen2-problem.tap.js
@@ -3,12 +3,10 @@
var fork = require('child_process').fork;
var test = require('tap').test;
-test("parent listener", function (t) {
- var server = require('net').createServer();
+var server
- this.tearDown(function () {
- server.close();
- });
+test("parent listener", function (t) {
+ server = require('net').createServer();
server.listen(8585, function () {
t.ok(server, "parent listening on port 8585");
@@ -20,11 +18,16 @@ test("parent listener", function (t) {
if (message === 'shutdown') {
t.ok(message, "child handled error properly");
listener.send('shutdown');
- t.end();
}
else {
t.fail("parent got unexpected message " + message);
}
+ t.end();
});
});
});
+
+test("tearDown", function (t) {
+ server.close();
+ t.end();
+}) | test: tearDown went away in tap@1 |
diff --git a/src/Utilities.php b/src/Utilities.php
index <HASH>..<HASH> 100644
--- a/src/Utilities.php
+++ b/src/Utilities.php
@@ -252,7 +252,7 @@ class Utilities
*
* @return bool
*/
- public static function validateSid($sid)
+ public static function isValidSid($sid)
{
preg_match("/S-1-5-21-\d+-\d+\-\d+\-\d+/", $sid, $matches); | Renamed validateSid utility method to isValidSid |
diff --git a/test/test_commit.rb b/test/test_commit.rb
index <HASH>..<HASH> 100644
--- a/test/test_commit.rb
+++ b/test/test_commit.rb
@@ -54,6 +54,7 @@ class TestCommit < Test::Unit::TestCase
diffs = Commit.diff(@r, '59ddc32', '13d27d5')
assert_equal 3, diffs.size
+ assert_equal %w(lib/grit/commit.rb test/fixtures/show_empty_commit test/test_commit.rb), diffs.collect { |d| d.a_path }
end
def test_diff_with_files
@@ -62,6 +63,7 @@ class TestCommit < Test::Unit::TestCase
diffs = Commit.diff(@r, '59ddc32', %w(lib))
assert_equal 1, diffs.size
+ assert_equal 'lib/grit/diff.rb', diffs.first.a_path
end
def test_diff_with_two_commits_and_files
@@ -70,6 +72,7 @@ class TestCommit < Test::Unit::TestCase
diffs = Commit.diff(@r, '59ddc32', '13d27d5', %w(lib))
assert_equal 1, diffs.size
+ assert_equal 'lib/grit/commit.rb', diffs.first.a_path
end
# diffs | add to Commit::Diff tests so we know the right filename is parsed |
diff --git a/src/lewis/core/utils.py b/src/lewis/core/utils.py
index <HASH>..<HASH> 100644
--- a/src/lewis/core/utils.py
+++ b/src/lewis/core/utils.py
@@ -67,11 +67,11 @@ def get_submodules(module):
try:
submodules[module_name] = importlib.import_module(
'.{}'.format(module_name), package=module.__name__)
- except ImportError as e:
+ except ImportError as import_error:
# This is necessary in case random directories are in the path or things can
# just not be imported due to other ImportErrors.
get_submodules.log.error("ImportError for {module}: {error}"
- .format(module=module_name, error=e))
+ .format(module=module_name, error=import_error))
return submodules | Changed exception variable to be more descriptive |
diff --git a/src/widget/draw/draw-widget.js b/src/widget/draw/draw-widget.js
index <HASH>..<HASH> 100644
--- a/src/widget/draw/draw-widget.js
+++ b/src/widget/draw/draw-widget.js
@@ -338,7 +338,10 @@ DrawWidget.prototype._reset = function() {
var that = this;
if ( this.element.value ) {
- dialog.confirm( t( 'filepicker.resetWarning', { item: t( 'drawwidget.' + this.props.type ) } ) )
+ // This discombulated line is to help the i18next parser pick up all 3 keys.
+ var item = this.props.type === 'signature' ?
+ t( 'drawwidget.signature' ) : ( this.props.type === 'drawing' ? t( 'drawwidget.drawing' ) : t( 'drawwidget.annotation' ) );
+ dialog.confirm( t( 'filepicker.resetWarning', { item: item } ) )
.then( function() {
that.pad.clear();
that.cache = null; | fixed: i<I>next parser doesn't pick up a few translation keys for draw widget |
diff --git a/cmd/juju/service/get.go b/cmd/juju/service/get.go
index <HASH>..<HASH> 100644
--- a/cmd/juju/service/get.go
+++ b/cmd/juju/service/get.go
@@ -41,9 +41,12 @@ settings:
type: string
value: optimized
-NOTE: In the example above the descriptions and most other settings were omitted for
-brevity. The "engine" setting was left at its default value ("nginx"), while the
-"tuning" setting was set to "optimized" (the default value is "single").
+NOTE: In the example above the descriptions and most other settings were omitted or
+truncated for brevity. The "engine" setting was left at its default value ("nginx"),
+while the "tuning" setting was set to "optimized" (the default value is "single").
+
+Note that the "default" field indicates whether a configuration setting is at its
+default value. It does not indicate the default value for the setting.
`
func (c *GetCommand) Info() *cmd.Info { | cmd/juju/service: clarify the meaning of the "default" field in the "get" output
Fixes LP #<I>. |
diff --git a/py/selenium/webdriver/common/action_chains.py b/py/selenium/webdriver/common/action_chains.py
index <HASH>..<HASH> 100644
--- a/py/selenium/webdriver/common/action_chains.py
+++ b/py/selenium/webdriver/common/action_chains.py
@@ -331,12 +331,12 @@ class ActionChains(object):
- on_element: The element to mouse up.
If None, releases on current mouse position.
"""
+ if on_element:
+ self.move_to_element(on_element)
if self._driver.w3c:
self.w3c_actions.pointer_action.release()
self.w3c_actions.key_action.pause()
else:
- if on_element:
- self.move_to_element(on_element)
self._actions.append(lambda: self._driver.execute(Command.MOUSE_UP, {}))
return self | [oy] Fix issue with w3c actions releasing on element (#<I>)
Releasing a held mouse button on an element |
diff --git a/test/res.sendFile.js b/test/res.sendFile.js
index <HASH>..<HASH> 100644
--- a/test/res.sendFile.js
+++ b/test/res.sendFile.js
@@ -747,7 +747,7 @@ describe('res', function(){
})
describe('when cacheControl: false', function () {
- it('shold not send cache-control', function (done) {
+ it('should not send cache-control', function (done) {
var app = express()
app.use(function (req, res) { | tests: fix typo in description
closes #<I> |
diff --git a/src/views/layouts/_nav.haml.php b/src/views/layouts/_nav.haml.php
index <HASH>..<HASH> 100644
--- a/src/views/layouts/_nav.haml.php
+++ b/src/views/layouts/_nav.haml.php
@@ -66,7 +66,7 @@
-if(is_a($auth, 'Bkwld\Decoy\Auth\Sentry') && $auth->can('read', 'admins'))
%li
- -#%a(href=DecoyURL::action('Bkwld\Decoy\Controllers\Admins@index')) Admins
+ %a(href=DecoyURL::action('Bkwld\\Decoy\\Controllers\\Admins@index')) Admins
%li
%a(href=$auth->userUrl()) Your account
%li.divider
@@ -75,12 +75,12 @@
-if($auth->developer())
-$divider = true
%li
- -#%a(href=route('decoy\commands')) Commands
+ %a(href=route('decoy\\commands')) Commands
-if(count(Bkwld\Decoy\Models\Worker::all()))
-$divider = true
%li
- -#%a(href=route('decoy\workers')) Workers
+ %a(href=route('decoy\\workers')) Workers
-if($divider)
%li.divider | Fixing routes that require escaping backslashes |
diff --git a/os_package_registry/package_registry.py b/os_package_registry/package_registry.py
index <HASH>..<HASH> 100644
--- a/os_package_registry/package_registry.py
+++ b/os_package_registry/package_registry.py
@@ -277,7 +277,7 @@ class PackageRegistry(object):
},
'num_countries': {
'cardinality': {
- 'field': 'package.countryCode.keyword',
+ 'field': 'package.countryCode',
},
},
},
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
setup(
name='os-package-registry',
- version='0.0.20',
+ version='0.0.21',
description=(
'Manage a registry of packages on an ElasticSearch instance'
), | <I> Fix stats endpoint with new index mapping |
diff --git a/trie/trie.py b/trie/trie.py
index <HASH>..<HASH> 100644
--- a/trie/trie.py
+++ b/trie/trie.py
@@ -616,12 +616,16 @@ class BinaryTrie(object):
return self._hash_and_save(encode_branch_node(new_left_child, new_right_child))
def exists(self, key):
+ validate_is_bytes(key)
+
return self.get(key) != BLANK_NODE
def delete(self, key):
"""
Equals to setting the value to None
"""
+ validate_is_bytes(key)
+
self.root_hash = self._set(self.root_hash, encode_to_bin(key), b'')
#
@@ -634,6 +638,7 @@ class BinaryTrie(object):
@root_node.setter
def root_node(self, node):
validate_is_bin_node(node)
+
self.root_hash = self._hash_and_save(node)
# | patch: add a few more validate_is_bytes check |
diff --git a/cmd/cammount/cammount.go b/cmd/cammount/cammount.go
index <HASH>..<HASH> 100644
--- a/cmd/cammount/cammount.go
+++ b/cmd/cammount/cammount.go
@@ -147,7 +147,7 @@ func main() {
}
}
- signal.Notify(sigc, syscall.SIGQUIT, syscall.SIGTERM)
+ signal.Notify(sigc, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
doneServe := make(chan error, 1)
go func() { | cammount: handle SIGINT, so that we unmount too in that case.
Change-Id: I5e<I>c<I>aab<I>c<I>e<I>a<I>af<I>d3c |
diff --git a/lib/ronin/ip_address.rb b/lib/ronin/ip_address.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/ip_address.rb
+++ b/lib/ronin/ip_address.rb
@@ -26,6 +26,7 @@ require 'ronin/os_guess'
require 'ronin/os'
require 'ipaddr'
+require 'resolv'
module Ronin
class IPAddress < Address
@@ -71,6 +72,21 @@ module Ronin
:via => :os
#
+ # Looks up the IP Address of a host name.
+ #
+ # @param [String] host_name
+ # The host name to lookup.
+ #
+ # @return [IPAddress]
+ # The new or previously saved IP Address for the host name.
+ #
+ # @since 0.4.0
+ #
+ def IPAddress.lookup(host_name)
+ IPAddress.first_or_new(:address => Resolv.getaddress(host_name))
+ end
+
+ #
# The MAC Address that was most recently used by the IP Address.
#
# @return [MacAddress] | Added IPAddress.lookup. |
diff --git a/lib/Thulium/Session.php b/lib/Thulium/Session.php
index <HASH>..<HASH> 100644
--- a/lib/Thulium/Session.php
+++ b/lib/Thulium/Session.php
@@ -45,4 +45,16 @@ class Session
return $this;
}
+
+ public function push($value)
+ {
+ $_SESSION[$this->_sessionNamespace][] = $value;
+ return $this;
+ }
+
+ public function delete()
+ {
+ unset($_SESSION[$this->_sessionNamespace]);
+ return $this;
+ }
}
\ No newline at end of file | Session push & delete functions. |
diff --git a/tests/ut/test_algorithm.py b/tests/ut/test_algorithm.py
index <HASH>..<HASH> 100644
--- a/tests/ut/test_algorithm.py
+++ b/tests/ut/test_algorithm.py
@@ -16,7 +16,7 @@ real_sleep = asyncio.sleep
@pytest.fixture
def locked_lock():
- return Lock("resource_name", 1, True)
+ return Lock(None, "resource_name", 1, True)
@pytest.fixture | Adding placeholder for lock_manager in lock_lock() fixture |
diff --git a/molecule/driver/openstackdriver.py b/molecule/driver/openstackdriver.py
index <HASH>..<HASH> 100644
--- a/molecule/driver/openstackdriver.py
+++ b/molecule/driver/openstackdriver.py
@@ -320,8 +320,8 @@ class OpenstackDriver(basedriver.BaseDriver):
try:
command = [
'ssh', '-o', 'StrictHostKeyChecking=no', '-o',
- 'UserKnownHostsFile=/dev/null', '-o', 'BatchMode=yes', '-l',
- user, hostip, 'exit'
+ 'UserKnownHostsFile=/dev/null', '-o', 'BatchMode=yes', '-i',
+ sshkey_filename, '-l', user, hostip, 'exit'
]
check_output(command, stderr=STDOUT)
return True | Openstack: Use configured ssh key (#<I>) (#<I>) |
diff --git a/src/Application.php b/src/Application.php
index <HASH>..<HASH> 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -1331,6 +1331,8 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
$response = new Response($response);
}
+ $response->prepare(Request::capture());
+
return $response;
} | Resolved the problem where response()->download() was returning 0 bytes. |
diff --git a/src/match.js b/src/match.js
index <HASH>..<HASH> 100644
--- a/src/match.js
+++ b/src/match.js
@@ -41,9 +41,18 @@ function matchPrefix(matcher) {
return result
}
+function makePathFromQS(qs, ids, path='', delim=',') {
+ let values = ids.map(id => {
+ let rx = new RegExp(`${escapeRx(id)}=([^&#]+)`, 'i')
+ return q.split(rx).slice(1).filter(s => !/^[&#]/.test(s)).join(delim)
+ })
+ return substitute([path, ...values], new Array(ids.length).fill('/'))
+}
+
function prematch(prespec, msg) {
- let { prefix, p } = msg
- p = pipe(normalizePath(prefix), prespec, normalizePath())(p)
+ let { prefix, p, qs, path } = msg
+ let makePath = makePathFromQS.bind(null, q)
+ p = pipe(normalizePath(prefix), prespec.bind(null, makePath, path), normalizePath())(p)
return p === msg.p ? msg : Object.assign({}, msg, { p })
} | new makePathFromQS fn for prespec |
diff --git a/resources/views/bread/browse.blade.php b/resources/views/bread/browse.blade.php
index <HASH>..<HASH> 100644
--- a/resources/views/bread/browse.blade.php
+++ b/resources/views/bread/browse.blade.php
@@ -225,11 +225,13 @@
<script>
$(document).ready(function () {
@if (!$dataType->server_side)
- var table = $('#dataTable').DataTable({
- "order": [],
- "language": {!! json_encode(__('voyager.datatable'), true) !!}
- @if(config('dashboard.data_tables.responsive')), responsive: true @endif
- });
+ var table = $('#dataTable').DataTable({!! json_encode(
+ array_merge([
+ "order" => [],
+ "language" => __('voyager.datatable'),
+ ],
+ config('voyager.dashboard.data_tables'))
+ , true) !!});
@else
$('#search-input select').select2({
minimumResultsForSearch: Infinity | Get datatable options from config file
+ fix responsive option not working for datatables |
diff --git a/bugzilla/bugzilla4.py b/bugzilla/bugzilla4.py
index <HASH>..<HASH> 100644
--- a/bugzilla/bugzilla4.py
+++ b/bugzilla/bugzilla4.py
@@ -143,6 +143,10 @@ class Bugzilla4(bugzilla.base.BugzillaBase):
query['id'] = query['bug_id']
del query['bug_id']
+ if 'component' in query:
+ if type(query['component']) is not list:
+ query['component'] = query['component'].split(',')
+
if 'include_fields' not in query:
query['include_fields'] = list()
if 'column_list' in query: | bugzilla4: translate multiple components into an array
The old bugzilla took a comma separated component list. Add code
to translate the old way to the new array way. |
diff --git a/library/Benri/Controller/Abstract.php b/library/Benri/Controller/Abstract.php
index <HASH>..<HASH> 100644
--- a/library/Benri/Controller/Abstract.php
+++ b/library/Benri/Controller/Abstract.php
@@ -66,7 +66,7 @@ abstract class Benri_Controller_Abstract extends Zend_Rest_Controller
/**
* Disable the view layout.
*
- * @return Benri_Controller_Action
+ * @return self
*/
protected function disableLayout()
{
@@ -185,7 +185,7 @@ abstract class Benri_Controller_Abstract extends Zend_Rest_Controller
*
* @param Benri_Db_Table_Row
* @param mixed Data to normalize and save into the model
- * @return Benri_Controller_Rest
+ * @return self
* @throws Zend_Db_Table_Row_Exception
*/
protected function _saveModel(Benri_Db_Table_Row &$model, $data = null) | chore: improve some php docblocks |
diff --git a/listing-bundle/contao/ModuleListing.php b/listing-bundle/contao/ModuleListing.php
index <HASH>..<HASH> 100644
--- a/listing-bundle/contao/ModuleListing.php
+++ b/listing-bundle/contao/ModuleListing.php
@@ -164,18 +164,22 @@ class ModuleListing extends Module
$page = $this->Input->get('page') ? $this->Input->get('page') : 1;
$per_page = $this->Input->get('per_page') ? $this->Input->get('per_page') : $this->perPage;
- if ($page < 1 || $page > max(ceil($objTotal->count/$per_page), 1))
+ // Thanks to Hagen Klemp (see #4485)
+ if ($per_page > 0)
{
- global $objPage;
- $objPage->noSearch = 1;
- $objPage->cache = 0;
+ if ($page < 1 || $page > max(ceil($objTotal->count/$per_page), 1))
+ {
+ global $objPage;
+ $objPage->noSearch = 1;
+ $objPage->cache = 0;
- $this->Template->thead = array();
- $this->Template->tbody = array();
+ $this->Template->thead = array();
+ $this->Template->tbody = array();
- // Send a 404 header
- header('HTTP/1.1 404 Not Found');
- return;
+ // Send a 404 header
+ header('HTTP/1.1 404 Not Found');
+ return;
+ }
} | [Listing] Fixed the "division by zero" issue in the listing module (see #<I>) |
diff --git a/Tests/DependencyInjection/DoctrineCommandsTest.php b/Tests/DependencyInjection/DoctrineCommandsTest.php
index <HASH>..<HASH> 100644
--- a/Tests/DependencyInjection/DoctrineCommandsTest.php
+++ b/Tests/DependencyInjection/DoctrineCommandsTest.php
@@ -65,17 +65,13 @@ class DoctrineCommandsTest extends TestCase
*/
private function getKernel(ContainerBuilder $container)
{
- $kernel = $this
- ->getMockBuilder(KernelInterface::class)
- ->getMock();
+ $kernel = $this->createMock(KernelInterface::class);
$kernel
- ->expects(self::any())
->method('getContainer')
->willReturn($container);
$kernel
- ->expects(self::once())
->method('getBundles')
->willReturn([]); | adjust the number of times a mock method should be invoked |
diff --git a/pyramid_pages/models.py b/pyramid_pages/models.py
index <HASH>..<HASH> 100644
--- a/pyramid_pages/models.py
+++ b/pyramid_pages/models.py
@@ -37,7 +37,7 @@ class PageMixin(object):
description = Column(UnicodeText)
def __repr__(self):
- return self.name or ''
+ return self.name.encode('utf-8') or ''
def __json__(self, request):
return self.id | encode name of models to UTF-8 |
diff --git a/packages/material-ui/src/utils/debounce.js b/packages/material-ui/src/utils/debounce.js
index <HASH>..<HASH> 100644
--- a/packages/material-ui/src/utils/debounce.js
+++ b/packages/material-ui/src/utils/debounce.js
@@ -3,10 +3,8 @@
export default function debounce(func, wait = 166) {
let timeout;
function debounced(...args) {
- // eslint-disable-next-line consistent-this
- const that = this;
const later = () => {
- func.apply(that, args);
+ func.apply(this, args);
};
clearTimeout(timeout);
timeout = setTimeout(later, wait); | [core] Simplify debounce (#<I>) |
diff --git a/spec/blue_state_digital/address_spec.rb b/spec/blue_state_digital/address_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/blue_state_digital/address_spec.rb
+++ b/spec/blue_state_digital/address_spec.rb
@@ -8,10 +8,12 @@ describe BlueStateDigital::Address do
#completely unclear why these pass.
it "should convert address fields to_xml" do
+ pending
subject.to_xml.should == "<xml>"
end
it "should return a builder" do
+ pending
subject.to_xml.should be_a(Builder)
end
end
\ No newline at end of file | pend test that are not yet ready. |
diff --git a/src/reconspect/dummy.js b/src/reconspect/dummy.js
index <HASH>..<HASH> 100644
--- a/src/reconspect/dummy.js
+++ b/src/reconspect/dummy.js
@@ -0,0 +1,19 @@
+(function (reconspect, d3) {
+ reconspect.dummy = {
+ construct: function (div, data) {
+ var d = d3.select(div);
+
+ d = d.append('ul');
+ d.selectAll('li')
+ .data(data)
+ .enter()
+ .append('li')
+ .text(function (d) {
+ return d.text;
+ })
+ .style(function (d) {
+ return d.color;
+ });
+ }
+ };
+}(window.reconspect, window.d3));
diff --git a/src/reconspect/preamble.js b/src/reconspect/preamble.js
index <HASH>..<HASH> 100644
--- a/src/reconspect/preamble.js
+++ b/src/reconspect/preamble.js
@@ -0,0 +1,3 @@
+(function () {
+ window.reconspect = {};
+}()); | Add dummy visualization component (along with visualization namespace) |
diff --git a/scriptworker/test/__init__.py b/scriptworker/test/__init__.py
index <HASH>..<HASH> 100644
--- a/scriptworker/test/__init__.py
+++ b/scriptworker/test/__init__.py
@@ -210,7 +210,7 @@ def integration_create_task_payload(config, task_group_id, scopes=None,
}
-@pytest.yield_fixture
+@pytest.yield_fixture(scope='function')
def event_loop():
"""Create an instance of the default event loop for each test case.
From https://github.com/pytest-dev/pytest-asyncio/issues/29#issuecomment-226947296 | event_loop with scope=function? |
diff --git a/bootstrap3/__init__.py b/bootstrap3/__init__.py
index <HASH>..<HASH> 100644
--- a/bootstrap3/__init__.py
+++ b/bootstrap3/__init__.py
@@ -1 +1 @@
-__version__ = '2.5.5'
+__version__ = '2.5.6'
diff --git a/bootstrap3/forms.py b/bootstrap3/forms.py
index <HASH>..<HASH> 100644
--- a/bootstrap3/forms.py
+++ b/bootstrap3/forms.py
@@ -218,8 +218,10 @@ def render_field_and_label(field, label, field_class='',
def render_form_group(content, css_class=FORM_GROUP_CLASS):
- return '<div class="{_class}">{content}</div>'.format(_class=css_class,
- content=content)
+ return '<div class="{klass}">{content}</div>'.format(
+ klass=css_class,
+ content=content,
+ )
def is_widget_required_attribute(widget): | Version bump, file field issues fixed (thanks) |
diff --git a/agent/lib/kontena/network_adapters/weave.rb b/agent/lib/kontena/network_adapters/weave.rb
index <HASH>..<HASH> 100644
--- a/agent/lib/kontena/network_adapters/weave.rb
+++ b/agent/lib/kontena/network_adapters/weave.rb
@@ -187,7 +187,7 @@ module Kontena::NetworkAdapters
info "router started without known peers"
end
if info['grid']['trusted_subnets']
- info "using trusted subnets: #{info['grid']['trusted_subnets']}"
+ info "using trusted subnets: #{info['grid']['trusted_subnets'].join(',')}"
end
if info['node_number'] | Fix weave trusted-subnet log output (#<I>) |
diff --git a/internetarchive/session.py b/internetarchive/session.py
index <HASH>..<HASH> 100644
--- a/internetarchive/session.py
+++ b/internetarchive/session.py
@@ -112,8 +112,9 @@ class ArchiveSession(requests.sessions.Session):
if not cookie_dict.get(ck):
continue
cookie = create_cookie(ck, cookie_dict[ck],
- domain=cookie_dict.get('domain'),
- path=cookie_dict.get('path'))
+ # .archive.org might be a better domain.
+ domain=cookie_dict.get('domain', ''),
+ path=cookie_dict.get('path', '/'))
self.cookies.set_cookie(cookie)
self.secure = self.config.get('general', {}).get('secure', True)
diff --git a/internetarchive/utils.py b/internetarchive/utils.py
index <HASH>..<HASH> 100644
--- a/internetarchive/utils.py
+++ b/internetarchive/utils.py
@@ -411,4 +411,8 @@ def parse_dict_cookies(value):
continue
name, value = item.split('=', 1)
result[name] = value
+ if 'domain' not in result:
+ result['domain'] = '' # .archive.org might be better.
+ if 'path' not in result:
+ result['path'] = '/'
return result | Fix possibly faulty values for domain and path in parsed cookies.
Using .archive.org as the default domain would be better,
but I'm not sure whether that covers all use cases.
@jjjake would have to chime in here.
Closes #<I>
Closes #<I> |
diff --git a/management/src/test/java/org/kaazing/gateway/management/jmx/JmxSessionPrincipalsIT.java b/management/src/test/java/org/kaazing/gateway/management/jmx/JmxSessionPrincipalsIT.java
index <HASH>..<HASH> 100644
--- a/management/src/test/java/org/kaazing/gateway/management/jmx/JmxSessionPrincipalsIT.java
+++ b/management/src/test/java/org/kaazing/gateway/management/jmx/JmxSessionPrincipalsIT.java
@@ -297,7 +297,7 @@ public class JmxSessionPrincipalsIT {
startTime = currentTimeMillis();
numberOfCurrentSessions = (Long) mbeanServerConn.getAttribute(echoServiceMbeanName, "NumberOfCurrentSessions");
- while (numberOfCurrentSessions > 1 && (currentTimeMillis() - startTime) < 10000) {
+ while (numberOfCurrentSessions > 0 && (currentTimeMillis() - startTime) < 10000) {
Thread.sleep(500);
numberOfCurrentSessions = (Long) mbeanServerConn.getAttribute(echoServiceMbeanName, "NumberOfCurrentSessions");
} | (management) Fixed a trivial error in JmxSessionPrincipalsIT which was causing occasional test failures (in that test or subclass JmxSessionPrincipalsSupertypeIT) |
diff --git a/spec/cucumber/configuration_spec.rb b/spec/cucumber/configuration_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/cucumber/configuration_spec.rb
+++ b/spec/cucumber/configuration_spec.rb
@@ -136,8 +136,9 @@ module Cucumber
describe "#with_options" do
it "returns a copy of the configuration with new options" do
- new_out_stream = double
- config = Configuration.new.with_options(out_stream: new_out_stream)
+ old_out_stream = double('Old out_stream')
+ new_out_stream = double('New out_stream')
+ config = Configuration.new(out_stream: old_out_stream).with_options(out_stream: new_out_stream)
expect(config.out_stream).to eq new_out_stream
end
end | Failing test for with_optins merge order
MSP-<I>
Shows that with_options test only passed becasue out_stream hadn't been
set on the Configuration before calling with_options(out_stream:). |
diff --git a/h2o-py/h2o/frame.py b/h2o-py/h2o/frame.py
index <HASH>..<HASH> 100644
--- a/h2o-py/h2o/frame.py
+++ b/h2o-py/h2o/frame.py
@@ -46,9 +46,9 @@ class H2OFrame:
rawkey = h2o.import_file(remote_fname)
setup = h2o.parse_setup(rawkey)
parse = h2o.parse(setup, H2OFrame.py_tmp_key()) # create a new key
- cols = parse['columnNames']
- rows = parse['rows']
veckeys = parse['vecKeys']
+ rows = parse['rows']
+ cols = parse['columnNames'] if parse["columnNames"] else ["C" + str(x) for x in range(1,len(veckeys)+1)]
self._vecs = H2OVec.new_vecs(zip(cols, veckeys), rows)
print "Imported", remote_fname, "into cluster with", rows, "rows and", len(cols), "cols" | Allows python to handle datasets without specified columnNames. Generates local names since zip requires names to associate with each column(vec). |
diff --git a/spec/integration/repository_spec.rb b/spec/integration/repository_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/integration/repository_spec.rb
+++ b/spec/integration/repository_spec.rb
@@ -269,6 +269,11 @@ RSpec.describe 'ROM repository' do
it 'returns a hash' do
expect(repo.users.limit(1).one).to eql(id: 1, name: 'Jane')
end
+
+ it 'returns a nested hash for an aggregate' do
+ expect(repo.aggregate(:posts).limit(1).one).
+ to eql(id: 1, name: 'Jane', posts: [{ id: 1, author_id: 1, title: 'Hello From Jane', body: 'Jane Post'}])
+ end
end
end
end | Add a spec for aggregate with auto-struct disabled |
diff --git a/slave/buildslave/test/unit/test_commands_transfer.py b/slave/buildslave/test/unit/test_commands_transfer.py
index <HASH>..<HASH> 100644
--- a/slave/buildslave/test/unit/test_commands_transfer.py
+++ b/slave/buildslave/test/unit/test_commands_transfer.py
@@ -256,8 +256,8 @@ class TestSlaveDirectoryUpload(CommandTestMixin, unittest.TestCase):
return self.test_simple('gz')
# except bz2 can't operate in stream mode on py24
- if sys.version_info <= (2,4):
- del test_simple_bz2
+ if sys.version_info[:2] <= (2,4):
+ test_simple_bz2.skip = "bz2 stream decompression not supported on Python-2.4"
# this is just a subclass of SlaveUpload, so the remaining permutations
# are already tested | correctly - really, this time - detect Python-<I> |
diff --git a/opal/corelib/error.rb b/opal/corelib/error.rb
index <HASH>..<HASH> 100644
--- a/opal/corelib/error.rb
+++ b/opal/corelib/error.rb
@@ -119,7 +119,17 @@ class Exception < `Error`
to_s
end
- def full_message(highlight: $stderr.tty?, order: :top)
+ def full_message(kwargs = nil)
+ unless defined? Hash
+ # We are dealing with an unfully loaded Opal library, so we should
+ # do with as little as we can.
+
+ return "#{@message}\n#{`self.stack`}"
+ end
+
+ kwargs = { highlight: $stderr.tty?, order: :top }.merge(kwargs || {})
+ highlight, order = kwargs[:highlight], kwargs[:order]
+
::Kernel.raise ::ArgumentError, "expected true or false as highlight: #{highlight}" unless [true, false].include? highlight
::Kernel.raise ::ArgumentError, "expected :top or :bottom as order: #{order}" unless %i[top bottom].include? order | Ensure full_message returns something even if Hash isn't loaded |
diff --git a/newrpc/__init__.py b/newrpc/__init__.py
index <HASH>..<HASH> 100644
--- a/newrpc/__init__.py
+++ b/newrpc/__init__.py
@@ -220,7 +220,7 @@ def iter_rpcresponses(queue, channel=None, timeout=None, **kwargs):
for msg in qw:
data = msg.payload
if data['failure']:
- raise RemoteError(**msg)
+ raise RemoteError(**data['failure'])
elif data.get('ending', False):
msg.ack()
return | RemoteError change for kwargs |
diff --git a/src/Layers/FeatureLayer/FeatureManager.js b/src/Layers/FeatureLayer/FeatureManager.js
index <HASH>..<HASH> 100644
--- a/src/Layers/FeatureLayer/FeatureManager.js
+++ b/src/Layers/FeatureLayer/FeatureManager.js
@@ -307,7 +307,7 @@ export var FeatureManager = FeatureGrid.extend({
pendingRequests++;
var coords = this._keyToCellCoords(key);
var bounds = this._cellCoordsToBounds(coords);
- this._requestFeatures(bounds, key, requestCallback);
+ this._requestFeatures(bounds, coords, requestCallback);
}
return this;
@@ -353,7 +353,7 @@ export var FeatureManager = FeatureGrid.extend({
pendingRequests++;
var coords = this._keyToCellCoords(key);
var bounds = this._cellCoordsToBounds(coords);
- this._requestFeatures(bounds, key, requestCallback);
+ this._requestFeatures(bounds, coords, requestCallback);
}
}
@@ -364,7 +364,7 @@ export var FeatureManager = FeatureGrid.extend({
for (var key in this._cells) {
var coords = this._keyToCellCoords(key);
var bounds = this._cellCoordsToBounds(coords);
- this._requestFeatures(bounds, key);
+ this._requestFeatures(bounds, coords);
}
if (this.redraw) { | fix _requestFeatures input params
second param should be an object, not a string. |
diff --git a/lib/fastlane/actions/install_cocapods.rb b/lib/fastlane/actions/install_cocapods.rb
index <HASH>..<HASH> 100644
--- a/lib/fastlane/actions/install_cocapods.rb
+++ b/lib/fastlane/actions/install_cocapods.rb
@@ -4,6 +4,10 @@ module Fastlane
def self.run(_params)
Actions.sh('pod install')
end
+
+ def self.description
+ "Runs `pod install` for the project"
+ end
end
end
end | Added documentation for CocoaPods action |
diff --git a/js/lightbox.js b/js/lightbox.js
index <HASH>..<HASH> 100755
--- a/js/lightbox.js
+++ b/js/lightbox.js
@@ -437,7 +437,7 @@ function Lightbox () {
currImage.img.setAttribute('height',newImgHeight)
currImage.img.setAttribute('style','margin-top:'+((getHeight() - newImgHeight) /2)+'px')
- repositionControls()
+ setTimeout(repositionControls,200)
// execute resize callback
if(this.opt.onresize) this.opt.onresize() | added timeout for correct repositioning of controls |
diff --git a/ArgusCore/src/main/java/com/salesforce/dva/argus/service/schedule/DefaultSchedulingService.java b/ArgusCore/src/main/java/com/salesforce/dva/argus/service/schedule/DefaultSchedulingService.java
index <HASH>..<HASH> 100644
--- a/ArgusCore/src/main/java/com/salesforce/dva/argus/service/schedule/DefaultSchedulingService.java
+++ b/ArgusCore/src/main/java/com/salesforce/dva/argus/service/schedule/DefaultSchedulingService.java
@@ -297,12 +297,6 @@ public class DefaultSchedulingService extends DefaultService implements Scheduli
}
}
- if(scheduler != null) {
- _logger.info("Machine is no longer master disposing current scheduler instance");
- _disposeScheduler(scheduler);
- scheduler = null;
- }
-
boolean interrupted = interrupted();
_releaseLock(key); | Remove dipsoe scheduler when not master sicne it is causing the unit test to loop indefinitely |
diff --git a/lib/rake/version.rb b/lib/rake/version.rb
index <HASH>..<HASH> 100644
--- a/lib/rake/version.rb
+++ b/lib/rake/version.rb
@@ -5,7 +5,7 @@ module Rake
MINOR = 9,
BUILD = 0,
BETA = 'beta',
- BETANUM = 4,
+ BETANUM = 5,
]
end
VERSION = Version::NUMBERS.join('.') | Bumped to version <I>.beta<I> |
diff --git a/Eloquent/Collection.php b/Eloquent/Collection.php
index <HASH>..<HASH> 100755
--- a/Eloquent/Collection.php
+++ b/Eloquent/Collection.php
@@ -4,6 +4,7 @@ namespace Illuminate\Database\Eloquent;
use LogicException;
use Illuminate\Support\Arr;
+use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Queue\QueueableCollection;
use Illuminate\Support\Collection as BaseCollection;
@@ -22,6 +23,10 @@ class Collection extends BaseCollection implements QueueableCollection
$key = $key->getKey();
}
+ if ($key instanceof Arrayable) {
+ $key = $key->toArray();
+ }
+
if (is_array($key)) {
if ($this->isEmpty()) {
return new static; | [<I>] Modify find eloquent collection method to accept collection (#<I>)
* Modify find eloquent method to accept collection
* Fix style ci
* Modify if condetion to check for Arryable instead of BaseCollection |
diff --git a/.eslintrc.js b/.eslintrc.js
index <HASH>..<HASH> 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -164,12 +164,12 @@ module.exports = {
'testem-browserstack.js',
'bin/**/*.js',
'build/**/*.js',
- 'server/**/*.js'
+ 'server/**/*.js',
],
env: {
es6: true,
node: true,
},
- }
- ]
+ },
+ ],
}; | ESLint: Add missing trailing commas in config file |
diff --git a/Test/Unit/Parsing/FormBuilderTester.php b/Test/Unit/Parsing/FormBuilderTester.php
index <HASH>..<HASH> 100644
--- a/Test/Unit/Parsing/FormBuilderTester.php
+++ b/Test/Unit/Parsing/FormBuilderTester.php
@@ -62,6 +62,9 @@ class FormBuilderTester extends PHPMethodTester {
$this->assertStatementIsParentCallAssignment(0, 'form', "The form builder's first statement is a call to the parent.");
}
+ // All form builders implement an interface method.
+ $this->assertMethodDocblockHasInheritdoc();
+
$this->assertReturnsVariable('form', "The form builder returns the completed form.");
// Get the form element statements. | Added testing that form builder methods have the ‘inheritdoc’ tag. |
diff --git a/xml4h/nodes.py b/xml4h/nodes.py
index <HASH>..<HASH> 100644
--- a/xml4h/nodes.py
+++ b/xml4h/nodes.py
@@ -56,7 +56,7 @@ class Node(object):
def __str__(self):
# TODO Degrade non-ASCII characters gracefully
- return str(self.__unicode__())
+ return self.__unicode__().encode(encoding='ascii', errors='replace')
def __repr__(self):
return self.__str__()
@@ -1103,7 +1103,7 @@ class AttributeDict(object):
def __str__(self):
# TODO Degrade non-ASCII characters gracefully
- return str(self.__unicode__())
+ return self.__unicode__().encode(encoding='ascii', errors='replace')
def __repr__(self):
return self.__str__() | Avoid ASCII encoding errors, inelegantly, by replacing problematic chars |
diff --git a/bolt-modules/file/lib/puppet/functions/file/read.rb b/bolt-modules/file/lib/puppet/functions/file/read.rb
index <HASH>..<HASH> 100644
--- a/bolt-modules/file/lib/puppet/functions/file/read.rb
+++ b/bolt-modules/file/lib/puppet/functions/file/read.rb
@@ -8,7 +8,7 @@ Puppet::Functions.create_function(:'file::read', Puppet::Functions::InternalFunc
# @example Read a file from disk
# file::read('/tmp/i_dumped_this_here')
# @example Read a file from the modulepath
- # file::read('example/files/VERSION')
+ # file::read('example/VERSION')
dispatch :read do
scope_param
required_param 'String', :filename | (maint) Fix file::read from module example
The documented example for using file::read plan function to read a file
from a module on the modulepath erroneously included `/files/`. This
changes the example from the path `example/files/VERSION` to
`example/VERSION`.
!no-release-note |
diff --git a/lib/dm-validations.rb b/lib/dm-validations.rb
index <HASH>..<HASH> 100644
--- a/lib/dm-validations.rb
+++ b/lib/dm-validations.rb
@@ -59,6 +59,7 @@ require 'dm-validations/support/object'
module DataMapper
module Validate
+
Model.append_inclusions self
extend Chainable
@@ -161,6 +162,13 @@ module DataMapper
@validators ||= ContextualValidators.new
end
+ def inherited(base)
+ super
+ validators.contexts.each do |context, validators|
+ base.validators.context(context).concat(validators)
+ end
+ end
+
private
# Clean up the argument list and return a opts hash, including the | [dm-validations] Copy validators into inherited models |
diff --git a/chainlet/dataflow.py b/chainlet/dataflow.py
index <HASH>..<HASH> 100644
--- a/chainlet/dataflow.py
+++ b/chainlet/dataflow.py
@@ -100,7 +100,10 @@ class MergeLink(chainlink.ChainLink):
def chainlet_send(self, value=None):
iter_values = iter(value)
- base_value = next(iter_values)
+ try:
+ base_value = next(iter_values)
+ except StopIteration:
+ raise chainlink.StopTraversal
sample_type = type(base_value)
try:
merger = self._cache_mapping[sample_type] | MergeLink no longer breaks a chain permanently when not receiving input |
diff --git a/lib/active_model_serializers_binary/active_model_serializers_binary.rb b/lib/active_model_serializers_binary/active_model_serializers_binary.rb
index <HASH>..<HASH> 100644
--- a/lib/active_model_serializers_binary/active_model_serializers_binary.rb
+++ b/lib/active_model_serializers_binary/active_model_serializers_binary.rb
@@ -49,7 +49,7 @@ module ActiveModel
true
else
attr_name = attr[:name].to_s
- if !instance.respond_to? attr_name
+ if !instance.class.column_names.include? attr_name
attr[:virtual] = true
attr_accessor attr_name
true
diff --git a/lib/active_model_serializers_binary/version.rb b/lib/active_model_serializers_binary/version.rb
index <HASH>..<HASH> 100644
--- a/lib/active_model_serializers_binary/version.rb
+++ b/lib/active_model_serializers_binary/version.rb
@@ -1,3 +1,3 @@
module ActiveModelSerializersBinary
- VERSION = "0.2.7"
+ VERSION = "0.2.8"
end | when a previous query filter attributes, the attr of the model was overwrited. Fix Bug |
diff --git a/howler.js b/howler.js
index <HASH>..<HASH> 100644
--- a/howler.js
+++ b/howler.js
@@ -25,7 +25,11 @@
// create a master gain node
if (usingWebAudio) {
- var gainNode = ctx.createGainNode();
+ if (typeof ctx.createGain === 'undefined') { // Chrome / Safari
+ var gainNode = ctx.createGainNode();
+ } else {
+ var gainNode = ctx.createGain();
+ }
gainNode.gain.value = 1;
gainNode.connect(ctx.destination);
}
@@ -169,7 +173,11 @@
self._audioNode = [];
} else {
// create gain node
- self._gainNode = ctx.createGainNode();
+ if (typeof ctx.createGain === 'undefined') { // Chrome / Safari
+ self._gainNode = ctx.createGainNode();
+ } else { // spec-compliant
+ self._gainNode = ctx.createGain();
+ }
self._gainNode.gain.value = self._volume;
self._gainNode.connect(gainNode);
} | added spec-implementation detection to howler, as createGainNode is deprecated. |
diff --git a/src/basis/template.js b/src/basis/template.js
index <HASH>..<HASH> 100644
--- a/src/basis/template.js
+++ b/src/basis/template.js
@@ -1117,13 +1117,13 @@
{
if (bindDef.length == 1) // bool
newAttrValue.add(bind[0] + bindName);
- else // enum
+ else // enum
newAttrValue.add(bind[0] + bindDef[1][bindDef[0] - 1]);
}
}
else
{
- ;;;template.warns.push('Class binding `' + bind[1] + '` is not defined');
+ ;;;template.warns.push('Class binding `' + bindName + '` is not defined');
unpredictable++;
}
} | fix warning message for binding is not defined |
diff --git a/src/main/java/nl/jqno/equalsverifier/AbstractDelegationChecker.java b/src/main/java/nl/jqno/equalsverifier/AbstractDelegationChecker.java
index <HASH>..<HASH> 100644
--- a/src/main/java/nl/jqno/equalsverifier/AbstractDelegationChecker.java
+++ b/src/main/java/nl/jqno/equalsverifier/AbstractDelegationChecker.java
@@ -76,7 +76,7 @@ class AbstractDelegationChecker<T> implements Checker {
for (Field field : FieldIterable.of(type)) {
Class<?> c = field.getType();
Object instance = safelyGetInstance(c);
- Object copy = safelyGetInstance(c);
+ Object copy = safelyCopyInstance(instance);
if (instance != null && copy != null) {
checkAbstractMethods(c, instance, copy, true);
}
@@ -143,6 +143,15 @@ class AbstractDelegationChecker<T> implements Checker {
}
}
+ private Object safelyCopyInstance(Object o) {
+ try {
+ return ObjectAccessor.of(o).copy();
+ }
+ catch (Throwable ignored) {
+ return o;
+ }
+ }
+
@SuppressFBWarnings(value = "DE_MIGHT_IGNORE", justification = "These exceptions will re-occur and be handled later.")
private <S> void checkAbstractMethods(Class<?> instanceClass, S instance, S copy, boolean prefabPossible) {
try { | Issue <I>: Fix AbstractDelegation test |
diff --git a/menu/menu.go b/menu/menu.go
index <HASH>..<HASH> 100644
--- a/menu/menu.go
+++ b/menu/menu.go
@@ -463,15 +463,23 @@ func (menu *Menu) AttachToWindow(w *window.Window) {
if runtime.GOOS != "linux" {
return
}
- command := Command{
- Method: "attach",
- Args: CommandArguments{
- WindowID: w.TargetID,
- },
- }
- // Thread to wait for Stable Menu State
- menu.CallWhenTreeStable(&command)
+ go func() {
+ for {
+ if w.TargetID != 0 {
+ command := Command{
+ Method: "attach",
+ Args: CommandArguments{
+ WindowID: w.TargetID,
+ },
+ }
+
+ // Thread to wait for Stable Menu State
+ menu.CallWhenTreeStable(&command)
+ return
+ }
+ }
+ }()
}
/* | Fix for window ready state for linux menu AttachToWindow |
diff --git a/src/Context/TqContext.php b/src/Context/TqContext.php
index <HASH>..<HASH> 100644
--- a/src/Context/TqContext.php
+++ b/src/Context/TqContext.php
@@ -131,7 +131,7 @@ class TqContext extends RawTqContext
}
/**
- * @Then /^I checkout to whole page$/
+ * @Then /^(?:|I )checkout to whole page$/
*/
public function unsetWorkingElementScope()
{
@@ -233,7 +233,7 @@ class TqContext extends RawTqContext
public function beforeStep(Scope\BeforeStepScope $step = null)
{
if (null !== $step) {
- $this->pageUrl = $this->getCurrentUrl();
+ self::$pageUrl = $this->getCurrentUrl();
}
} | Added usage of RawTqContext::$pageUrl inside of TqContext |
diff --git a/lib/starscope/record.rb b/lib/starscope/record.rb
index <HASH>..<HASH> 100644
--- a/lib/starscope/record.rb
+++ b/lib/starscope/record.rb
@@ -27,21 +27,32 @@ class StarScope::Record
end
def self.ctag_line(rec)
- "#{rec[:name][-1]}\t#{rec[:file]}\t/^#{rec[:line]}$/" + self.ctag_ext(rec)
+ ret = "#{rec[:name][-1]}\t#{rec[:file]}\t/^#{rec[:line]}$/"
+
+ ext = self.ctag_ext_tags(rec)
+ if not ext.empty?
+ ret << ";\""
+ ext.each do |k, v|
+ ret << "\t#{k}:#{v}"
+ end
+ end
+
+ ret
end
- def self.ctag_ext(rec)
- s = ";\"\t"
+ def self.ctag_ext_tags(rec)
+ tag = {}
+
#TODO implement the many more extensions documented at
#http://ctags.sourceforge.net/FORMAT
case rec[:type]
when :func
- s << "kind:f"
+ tag["kind"] = "f"
when :class
- s << "kind:c"
- else
- ""
+ tag["kind"] = "c"
end
+
+ tag
end
def self.cscope_mark(tbl, rec) | Rework generation of ctag extension fields
This should make it much easier to add new ones. |
diff --git a/lib/ransack/adapters/active_record/ransack/nodes/condition.rb b/lib/ransack/adapters/active_record/ransack/nodes/condition.rb
index <HASH>..<HASH> 100644
--- a/lib/ransack/adapters/active_record/ransack/nodes/condition.rb
+++ b/lib/ransack/adapters/active_record/ransack/nodes/condition.rb
@@ -18,7 +18,7 @@ module Ransack
predicates.inject(&:or)
end
else
- predicates.first.right[0] = predicates.first.right[0].val if predicates.first.right[0].class == Arel::Nodes::Casted
+ predicates.first.right[0] = predicates.first.right[0].val if defined?(Arel::Nodes::Casted) && predicates.first.class == Arel::Nodes::In && predicates.first.right.is_a?(Array) && predicates.first.right[0].class == Arel::Nodes::Casted
predicates.first
end
end | make tests pass by adding to if statement |
diff --git a/src/ServerRequest/ParsedBody.php b/src/ServerRequest/ParsedBody.php
index <HASH>..<HASH> 100644
--- a/src/ServerRequest/ParsedBody.php
+++ b/src/ServerRequest/ParsedBody.php
@@ -243,7 +243,7 @@ trait ParsedBody
$request->parseCondition = ($data === null ? null : false);
- if ($this->shouldUsePostData()) {
+ if ($this->shouldUsePostData() && $data !== null) {
$request->postData = $data;
$request->parsedBody = null;
} else { | Fix: never set $_POST to null |
diff --git a/spec/support/shared/functional/diff_disabled.rb b/spec/support/shared/functional/diff_disabled.rb
index <HASH>..<HASH> 100644
--- a/spec/support/shared/functional/diff_disabled.rb
+++ b/spec/support/shared/functional/diff_disabled.rb
@@ -1,7 +1,7 @@
shared_context "diff disabled" do
before do
- @original_diff_disable = Chef::Config[:diff_disabled]
+ @original_diff_disable ||= Chef::Config[:diff_disabled]
Chef::Config[:diff_disabled] = true
end | avoid clobbering original diff disable state when nested |
diff --git a/allennlp/training/trainer.py b/allennlp/training/trainer.py
index <HASH>..<HASH> 100644
--- a/allennlp/training/trainer.py
+++ b/allennlp/training/trainer.py
@@ -729,7 +729,7 @@ class Trainer:
def _description_from_metrics(self, metrics: Dict[str, float]) -> str:
# pylint: disable=no-self-use
- return ', '.join(["%s: %.2f" % (name, value) for name, value in metrics.items()]) + " ||"
+ return ', '.join(["%s: %.4f" % (name, value) for name, value in metrics.items()]) + " ||"
def _save_checkpoint(self,
epoch: Union[int, str], | increase metrics logging precision (#<I>) |
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -3494,7 +3494,15 @@ function mapNugetFeed(pattern, offset, getInfo) {
function getNugetVersion(apiUrl, id, includePre, request, done) {
// get service index document
regularUpdate(apiUrl + '/index.json',
- (3600 * 1000 * 24), // 1 day - can theoretically change often but in practice it doesn't
+ // The endpoint changes once per year (ie, a period of n = 1 year).
+ // We minimize the users' waiting time for information.
+ // With l = latency to fetch the endpoint and x = endpoint update period
+ // both in years, the yearly number of queries for the endpoint are 1/x,
+ // and when the endpoint changes, we wait for up to x years to get the
+ // right endpoint.
+ // So the waiting time within n years is n*l/x + x years, for which a
+ // derivation yields an optimum at x = sqrt(n*l), roughly 42 minutes.
+ (42 * 60 * 1000),
function(buffer) {
var data = JSON.parse(buffer); | Set Nuget version endpoint update to <I> minutes |
diff --git a/salt/modules/aliases.py b/salt/modules/aliases.py
index <HASH>..<HASH> 100644
--- a/salt/modules/aliases.py
+++ b/salt/modules/aliases.py
@@ -8,7 +8,15 @@ import re
import stat
import tempfile
-from salt.utils import which
+from salt.utils import which as _which
+
+__outputter__ = {
+ 'rm_alias': 'txt',
+ 'has_target': 'txt',
+ 'get_target': 'txt',
+ 'set_target': 'txt',
+ 'list_aliases': 'yaml',
+}
__ALIAS_RE = re.compile(r'([^:#]*)\s*:?\s*([^#]*?)(\s+#.*|$)')
@@ -75,7 +83,7 @@ def __write_aliases_file(lines):
os.rename(out.name, afn)
# Search $PATH for the newalises command
- newaliases = which('newaliases')
+ newaliases = _which('newaliases')
if newaliases is not None:
__salt__['cmd.run'](newaliases) | salt.modules.aliases: use outputters for each function
Also change which() to _which to prevent the doc system from using it |
diff --git a/src/main/resources/META-INF/resources/primefaces/forms/forms.selectonemenu.js b/src/main/resources/META-INF/resources/primefaces/forms/forms.selectonemenu.js
index <HASH>..<HASH> 100644
--- a/src/main/resources/META-INF/resources/primefaces/forms/forms.selectonemenu.js
+++ b/src/main/resources/META-INF/resources/primefaces/forms/forms.selectonemenu.js
@@ -462,7 +462,6 @@ PrimeFaces.widget.SelectOneMenu = PrimeFaces.widget.DeferredWidget.extend({
}
if(!silent) {
- this.focusInput.trigger('focus');
this.callBehavior('itemSelect');
} | Fix #<I>: Remove unnecessary focus |
diff --git a/src/core/lombok/javac/JavacResolution.java b/src/core/lombok/javac/JavacResolution.java
index <HASH>..<HASH> 100644
--- a/src/core/lombok/javac/JavacResolution.java
+++ b/src/core/lombok/javac/JavacResolution.java
@@ -325,6 +325,8 @@ public class JavacResolution {
// NB: There's such a thing as maker.Type(type), but this doesn't work very well; it screws up anonymous classes, captures, and adds an extra prefix dot for some reason too.
// -- so we write our own take on that here.
+ if (type.tag == TypeTags.BOT) return createJavaLangObject(maker, ast);
+
if (type.isPrimitive()) return primitiveToJCTree(type.getKind(), maker);
if (type.isErroneous()) throw new TypeNotConvertibleException("Type cannot be resolved"); | Fix for javac: 'val x = null;' is now valid, and results in x being of type Object. |
diff --git a/seaglass/trunk/seaglass/src/main/java/com/seaglasslookandfeel/painter/DesktopPanePainter.java b/seaglass/trunk/seaglass/src/main/java/com/seaglasslookandfeel/painter/DesktopPanePainter.java
index <HASH>..<HASH> 100644
--- a/seaglass/trunk/seaglass/src/main/java/com/seaglasslookandfeel/painter/DesktopPanePainter.java
+++ b/seaglass/trunk/seaglass/src/main/java/com/seaglasslookandfeel/painter/DesktopPanePainter.java
@@ -44,9 +44,11 @@ public final class DesktopPanePainter extends AbstractRegionPainter {
}
protected void doPaint(Graphics2D g, JComponent c, int width, int height, Object[] extendedCacheKeys) {
- DesktopPane panePainter = new DesktopPane();
- panePainter.setDimension(new Dimension(width, height));
- panePainter.paintIcon(c, g, 0, 0);
+ if (c.isOpaque()) {
+ DesktopPane panePainter = new DesktopPane();
+ panePainter.setDimension(new Dimension(width, height));
+ panePainter.paintIcon(c, g, 0, 0);
+ }
}
protected final PaintContext getPaintContext() { | Fixed issue <I>
isOpaque is now checked in the painter |
diff --git a/config/module.config.php b/config/module.config.php
index <HASH>..<HASH> 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -237,4 +237,12 @@ return array(
),
),
),
+
+ // PlaygroundStats defines itself as the admin Dashboard controller
+ 'playgrounduser' => array(
+ 'admin' => array(
+ 'controller' => 'adminstats',
+ 'action' => 'index'
+ ),
+ )
); | Stats declares itself as the dashboard controller |
diff --git a/pkg/mount/sharedsubtree_linux.go b/pkg/mount/sharedsubtree_linux.go
index <HASH>..<HASH> 100644
--- a/pkg/mount/sharedsubtree_linux.go
+++ b/pkg/mount/sharedsubtree_linux.go
@@ -59,7 +59,7 @@ func MakeMount(mnt string) error {
return nil
}
- return Mount(mnt, mnt, "none", "bind")
+ return ForceMount(mnt, mnt, "none", "bind")
}
func ensureMountedAs(mountPoint, options string) error { | pkg/mount: MakeMount: minor optimization
Current code in MakeMount parses /proc/self/mountinfo twice:
first in call to Mounted(), then in call to Mount(). Use
ForceMount() to eliminate such double parsing. |
diff --git a/src/Common/Communication/Controller/CommunicationControllerRule.php b/src/Common/Communication/Controller/CommunicationControllerRule.php
index <HASH>..<HASH> 100644
--- a/src/Common/Communication/Controller/CommunicationControllerRule.php
+++ b/src/Common/Communication/Controller/CommunicationControllerRule.php
@@ -12,6 +12,14 @@ class CommunicationControllerRule extends AbstractRule implements ClassAware
const RULE = 'All public controller methods have the suffix `*Action`.';
/**
+ * @var array
+ */
+ protected $notActionMethodNames = [
+ 'initialize',
+ '__construct',
+ ];
+
+ /**
* @return string
*/
public function getDescription()
@@ -55,6 +63,10 @@ class CommunicationControllerRule extends AbstractRule implements ClassAware
return;
}
+ if ($this->isNotActionMethod($method->getName())) {
+ return;
+ }
+
$this->addViolation(
$method,
[
@@ -65,4 +77,14 @@ class CommunicationControllerRule extends AbstractRule implements ClassAware
]
);
}
+
+ /**
+ * @param string $name
+ *
+ * @return bool
+ */
+ protected function isNotActionMethod($name)
+ {
+ return in_array($name, $this->notActionMethodNames);
+ }
} | Feature: Add not action methods to the rule |
diff --git a/devices/philips.js b/devices/philips.js
index <HASH>..<HASH> 100644
--- a/devices/philips.js
+++ b/devices/philips.js
@@ -334,6 +334,15 @@ module.exports = [
ota: ota.zigbeeOTA,
},
{
+ zigbeeModel: ['4090431P9'],
+ model: '4090431P9',
+ vendor: 'Philips',
+ description: 'Hue Flourish white and color ambiance table light with Bluetooth',
+ meta: {turnsOffAtBrightness1: true},
+ extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+ ota: ota.zigbeeOTA,
+ },
+ {
zigbeeModel: ['LCG002'],
model: '929001953101',
vendor: 'Philips', | Add <I>P9 (#<I>)
* Update philips.js
Added support for Philips Flourish white and Color ambiance table light with bluetooth as a copy of the floor version. This one is working well!
* Update philips.js
* Update philips.js
added {colorTempRange: [<I>, <I>]}
But I'm not an expert on this. |
diff --git a/salt/netapi/rest_cherrypy/__init__.py b/salt/netapi/rest_cherrypy/__init__.py
index <HASH>..<HASH> 100644
--- a/salt/netapi/rest_cherrypy/__init__.py
+++ b/salt/netapi/rest_cherrypy/__init__.py
@@ -8,8 +8,6 @@ This is run by ``salt-api`` and started in a multiprocess.
# Import Python libs
import logging
import os
-import signal
-import sys
# Import CherryPy without traceback so we can provide an intelligent log
# message in the __virtual__ function
@@ -90,9 +88,4 @@ def start():
cherrypy.server.ssl_certificate = apiopts['ssl_crt']
cherrypy.server.ssl_private_key = apiopts['ssl_key']
- def signal_handler(*args):
- cherrypy.engine.exit()
- sys.exit(0)
- signal.signal(signal.SIGINT, signal_handler)
-
cherrypy.quickstart(root, apiopts.get('root_prefix', '/'), conf) | Lint errors; removed imports; removed signal_handler function
CherryPy's quickstart does signal handling. We don't need this here. |
diff --git a/src/controllers/RootController.js b/src/controllers/RootController.js
index <HASH>..<HASH> 100644
--- a/src/controllers/RootController.js
+++ b/src/controllers/RootController.js
@@ -9,7 +9,7 @@ let modal;
class RootController {
- constructor($location, $rootScope, $route, $translate, $translatePartialLoader, Authentication, Navigation, $modal) {
+ constructor($location, $rootScope, $route, $translate, Authentication, Navigation, $modal) {
loc = $location;
auth = Authentication;
nav = Navigation;
@@ -43,7 +43,6 @@ class RootController {
$translate.use(this.language);
});
route = $route;
- $translatePartialLoader.addPart('monad/src');
}
get Authentication() {
@@ -84,7 +83,7 @@ class RootController {
};
-RootController.$inject = ['$location', '$rootScope', '$route', '$translate', '$translatePartialLoader', 'moAuthentication', 'moNavigation', '$modal'];
+RootController.$inject = ['$location', '$rootScope', '$route', '$translate', 'moAuthentication', 'moNavigation', '$modal'];
export {RootController}; | this is now in the config function |
diff --git a/tests/tests.js b/tests/tests.js
index <HASH>..<HASH> 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -1,4 +1,4 @@
-QUnit.config.testTimeout = 1000;
+QUnit.config.testTimeout = 5000;
var router, url, handlers; | Reset test timeout to previous value for slow phantom tests |
diff --git a/code/libraries/koowa/components/com_activities/controllers/behaviors/loggable.php b/code/libraries/koowa/components/com_activities/controllers/behaviors/loggable.php
index <HASH>..<HASH> 100644
--- a/code/libraries/koowa/components/com_activities/controllers/behaviors/loggable.php
+++ b/code/libraries/koowa/components/com_activities/controllers/behaviors/loggable.php
@@ -32,7 +32,7 @@ class ComActivitiesControllerBehaviorLoggable extends KControllerBehaviorAbstrac
/**
* Activity controller identifier.
*
- * @param KObjectConfig
+ * @param string|KObjectIdentifierInterface
*/
protected $_activity_controller; | re #<I> Fixed docblock. |
diff --git a/test.py b/test.py
index <HASH>..<HASH> 100644
--- a/test.py
+++ b/test.py
@@ -52,7 +52,7 @@ if __name__ == '__main__':
p = unittest.main(testRunner=xmlrunner.XMLTestRunner(
output='test-reports'), exit=False)
else:
- unittest.main(exit=False)
+ p = unittest.main(exit=False)
platform.shutdown()
s.shutdown("Jabber server terminated...") | test.py now uses the number of failed tests as exit code. |
diff --git a/includes/Form.class.php b/includes/Form.class.php
index <HASH>..<HASH> 100644
--- a/includes/Form.class.php
+++ b/includes/Form.class.php
@@ -17,7 +17,7 @@ class AC_Form extends ActiveCampaign {
}
function html($params) {
- $request_url = "{$this->url}&api_action=form_html&api_output={$this->output}";
+ $request_url = "{$this->url}&api_action=form_html&api_output={$this->output}&{$params}";
$response = $this->curl($request_url);
return $response;
} | need params available for form_html, so it can accept a form ID |
diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
index <HASH>..<HASH> 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -106,6 +106,7 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
}
if (mngr.getNotificationChannel(id) != null) {
promise.resolve(null);
+ return;
}
//
NotificationChannel channel = new NotificationChannel( | Avoid resolving promise twice if channel already exists |
diff --git a/graphistry/__init__.py b/graphistry/__init__.py
index <HASH>..<HASH> 100644
--- a/graphistry/__init__.py
+++ b/graphistry/__init__.py
@@ -16,5 +16,6 @@ bolt, cypher,
tigergraph, gsql, gsql_endpoint,
nodexl,
ArrowUploader,
+ArrowFileUploader,
PyGraphistry
)
\ No newline at end of file
diff --git a/graphistry/pygraphistry.py b/graphistry/pygraphistry.py
index <HASH>..<HASH> 100644
--- a/graphistry/pygraphistry.py
+++ b/graphistry/pygraphistry.py
@@ -5,6 +5,7 @@ from datetime import datetime
from distutils.util import strtobool
from .arrow_uploader import ArrowUploader
+from .ArrowFileUploader import ArrowFileUploader
from . import util
from . import bolt_util | feat(publish ArrowFileUploader) |
diff --git a/azurerm/resource_arm_managed_disk_test.go b/azurerm/resource_arm_managed_disk_test.go
index <HASH>..<HASH> 100644
--- a/azurerm/resource_arm_managed_disk_test.go
+++ b/azurerm/resource_arm_managed_disk_test.go
@@ -257,10 +257,11 @@ resource "azurerm_resource_group" "test" {
}
resource "azurerm_storage_account" "test" {
- name = "accsa%d"
- resource_group_name = "${azurerm_resource_group.test.name}"
- location = "${azurerm_resource_group.test.location}"
- account_type = "Standard_LRS"
+ name = "accsa%d"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+ location = "${azurerm_resource_group.test.location}"
+ account_tier = "Standard"
+ account_replication_type = "LRS"
tags {
environment = "staging" | Fixing the Managed Disk test |
diff --git a/tests/test_js.py b/tests/test_js.py
index <HASH>..<HASH> 100644
--- a/tests/test_js.py
+++ b/tests/test_js.py
@@ -449,8 +449,8 @@ class PullSubscribeTest(SingleJetStreamServerTestCase):
assert isinstance(e, APIError)
break
- info = await js.consumer_info("TEST3", "example")
- assert info.num_waiting == 0
+ # info = await js.consumer_info("TEST3", "example")
+ # assert info.num_waiting == 0
for i in range(0, 10):
await js.publish("max", b'foo')
@@ -519,8 +519,8 @@ class PullSubscribeTest(SingleJetStreamServerTestCase):
elif isinstance(e, APIError):
raise e
- info = await js.consumer_info("TEST31", "example")
- assert info.num_waiting == 0
+ # info = await js.consumer_info("TEST31", "example")
+ # assert info.num_waiting == 0
await nc.close()
@async_long_test | Skip checking num_waiting on tests |
diff --git a/lib/alchemy/deprecation.rb b/lib/alchemy/deprecation.rb
index <HASH>..<HASH> 100644
--- a/lib/alchemy/deprecation.rb
+++ b/lib/alchemy/deprecation.rb
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Alchemy
- Deprecation = ActiveSupport::Deprecation.new("6.0", "Alchemy")
+ Deprecation = ActiveSupport::Deprecation.new("7.0", "Alchemy")
end | Raise deprecated major version to <I> |
diff --git a/tests/unit/core/ModelsTest.py b/tests/unit/core/ModelsTest.py
index <HASH>..<HASH> 100644
--- a/tests/unit/core/ModelsTest.py
+++ b/tests/unit/core/ModelsTest.py
@@ -108,9 +108,7 @@ class ModelsTest:
geo.clear()
with LogCapture() as log:
geo.regenerate_models(propnames=['pore.diameter'])
- log.check(('root', 'WARNING', "pore.diameter was not run since the " +
- "following properties are missing: ['pore.max_size', " +
- "'pore.seed']"))
+ assert "['pore.max_size', 'pore.seed']" in log.actual()[0][2]
def test_regenerate_models_on_phase_with_deep(self):
pn = op.network.Cubic(shape=[5, 5, 5]) | updating a test that broke due new logger format |
diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index <HASH>..<HASH> 100644
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -149,7 +149,7 @@ $string['configproxyport'] = 'If this server needs to use a proxy computer, then
$string['configquarantinedir'] = 'If you want clam AV to move infected files to a quarantine directory, enter it here. It must be writable by the webserver. If you leave this blank, or if you enter a directory that doesn\'t exit or isn\'t writable, infected files will be deleted. Do not include a trailing slash.';
$string['configcronclionly'] = 'If this is set, then the cron script can only be run from the commandline instead of via the web. This overrides the cron password setting below.';
$string['configcronremotepassword'] = 'This means that the cron.php script cannot be run from a web browser without supplying the password using the following form of URL:<pre>
- http://site.example.com/admin.cron.php?password=opensesame
+ http://site.example.com/admin/cron.php?password=opensesame
</pre>If this is left empty, no password is required.';
$string['configrcache'] = 'Use the cache to store database records. Remember to set \'cachetype\' as well!';
$string['configrcachettl'] = 'Time-to-live for cached records, in seconds. Use a short (<15) value here.'; | MDL-<I> Mistake in admin.php - wrong cron url; merged from MOODLE_<I>_STABLE |
diff --git a/spec/unit/resource_spec.rb b/spec/unit/resource_spec.rb
index <HASH>..<HASH> 100755
--- a/spec/unit/resource_spec.rb
+++ b/spec/unit/resource_spec.rb
@@ -365,9 +365,7 @@ describe Puppet::Resource do
Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).returns(nil)
- rt = resource.resource_type
- rt.send(:inject_external_parameters, resource, scope)
- rt.send(:assign_defaults, resource, scope, {})
+ inject_and_set_defaults(resource, scope)
expect(resource[:port]).to eq('80')
end | (PUP-<I>) Fix test that was broken in master after merge
One of the resource tests called private methods on the resource
type instead of the API method. That test broke when merging to
master. This commit fixes the problem. |
diff --git a/example/settings/common.py b/example/settings/common.py
index <HASH>..<HASH> 100644
--- a/example/settings/common.py
+++ b/example/settings/common.py
@@ -124,15 +124,21 @@ INSTALLED_APPS = (
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
+# the site admins on every HTTP 500 error when DEBUG=False.
# See http://docs.djangoproject.com/en/dev/topics/logging for
# more details on how to customize your logging configuration.
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
+ 'filters': {
+ 'require_debug_false': {
+ '()': 'django.utils.log.RequireDebugFalse'
+ }
+ },
'handlers': {
'mail_admins': {
'level': 'ERROR',
+ 'filters': ['require_debug_false'],
'class': 'django.utils.log.AdminEmailHandler'
}
}, | update logging settings to avoid deprecation warning about missing filters |
diff --git a/lib/dossier/version.rb b/lib/dossier/version.rb
index <HASH>..<HASH> 100644
--- a/lib/dossier/version.rb
+++ b/lib/dossier/version.rb
@@ -1,3 +1,3 @@
module Dossier
- VERSION = "2.12.0"
+ VERSION = "2.12.1"
end | bumping to <I> with #<I> fixed |
diff --git a/coremodules/core/src/test/java/org/treetank/ModuleFactory.java b/coremodules/core/src/test/java/org/treetank/ModuleFactory.java
index <HASH>..<HASH> 100644
--- a/coremodules/core/src/test/java/org/treetank/ModuleFactory.java
+++ b/coremodules/core/src/test/java/org/treetank/ModuleFactory.java
@@ -75,8 +75,8 @@ public class ModuleFactory implements IModuleFactory {
metaFacName = "org.treetank.data.ISCSIMetaPageFactory";
break;
case "filelistener":
- dataFacName = "org.treetank.filelistener.file.node.FileNodeFactory";
- metaFacName = "org.treetank.filelistener.file.node.FilelistenerMetaPageFactory";
+ dataFacName = "org.treetank.filelistener.file.data.FileDataFactory";
+ metaFacName = "org.treetank.filelistener.file.data.FilelistenerMetaPageFactory";
break;
default:
throw new IllegalStateException("Suitable module not found"); | [FIX] ModuleFactory still had a reference to the FileNodeFactory
git-svn-id: <URL> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.