diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/pmag_menu_dialogs.py b/pmag_menu_dialogs.py index <HASH>..<HASH> 100755 --- a/pmag_menu_dialogs.py +++ b/pmag_menu_dialogs.py @@ -1984,6 +1984,7 @@ class PlotFrame(wx.Frame): def on_save(self, event): plt.savefig(self.figname) + plt.clf() # clear figure dir_path, figname = o...
add clf() to PlotFrame to make sure each plot is unique
diff --git a/tests/test_dates.py b/tests/test_dates.py index <HASH>..<HASH> 100644 --- a/tests/test_dates.py +++ b/tests/test_dates.py @@ -15,6 +15,21 @@ def test_date_rounding(): assert chart.date == '1996-08-03' +def test_previous_next(): + """Checks that the date, previousDate, and nextDate attributes ar...
Test that date attributes are parsed, not computed Currently failing. I brought this example up in #<I>.
diff --git a/packages/xod-client/src/project/selectors.js b/packages/xod-client/src/project/selectors.js index <HASH>..<HASH> 100644 --- a/packages/xod-client/src/project/selectors.js +++ b/packages/xod-client/src/project/selectors.js @@ -352,6 +352,7 @@ export const getPatchSearchIndex = createSelector( R.rejec...
feat(xod-client): do not show utility patches from suggester
diff --git a/ethrpc/packages.go b/ethrpc/packages.go index <HASH>..<HASH> 100644 --- a/ethrpc/packages.go +++ b/ethrpc/packages.go @@ -4,7 +4,8 @@ import ( "encoding/json" "errors" "github.com/ethereum/eth-go/ethpub" - _ "log" + "github.com/ethereum/eth-go/ethutil" + "math/big" ) type EthereumApi struct { @@ ...
Assume arguments are supplied as strings to the rpc interface
diff --git a/src/Libraries/File/File.php b/src/Libraries/File/File.php index <HASH>..<HASH> 100644 --- a/src/Libraries/File/File.php +++ b/src/Libraries/File/File.php @@ -17,8 +17,6 @@ namespace Quantum\Libraries\File; /** * File class * - * Initialize the database - * * @package Quantum * @subpackage Librar...
Removing incorrect comments from doc block
diff --git a/core/src/main/java/org/bitcoinj/core/Block.java b/core/src/main/java/org/bitcoinj/core/Block.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/org/bitcoinj/core/Block.java +++ b/core/src/main/java/org/bitcoinj/core/Block.java @@ -180,7 +180,7 @@ public class Block extends Message { hash = ...
Block.parseHeader() and Block.parseTransactions() are now protected, so they can be called from subclasses.
diff --git a/NavigationReactNative/sample/twitter/Home.js b/NavigationReactNative/sample/twitter/Home.js index <HASH>..<HASH> 100644 --- a/NavigationReactNative/sample/twitter/Home.js +++ b/NavigationReactNative/sample/twitter/Home.js @@ -18,7 +18,6 @@ const styles = StyleSheet.create({ paddingTop: 40, paddin...
Removed whitespace gap at top on scroll
diff --git a/lib/active_admin.rb b/lib/active_admin.rb index <HASH>..<HASH> 100644 --- a/lib/active_admin.rb +++ b/lib/active_admin.rb @@ -1,4 +1,6 @@ -require 'active_support/core_ext/class/attribute' # needed for Ransack +require 'active_support/core_ext' +require 'set' + require 'ransack' require 'ransack_ext' re...
clearly require dependencies activerecord-hackery/ransack#<I>
diff --git a/nodes/api_current-state/api_current-state.js b/nodes/api_current-state/api_current-state.js index <HASH>..<HASH> 100644 --- a/nodes/api_current-state/api_current-state.js +++ b/nodes/api_current-state/api_current-state.js @@ -59,7 +59,8 @@ module.exports = function(RED) { } else { ...
re-add success status to api-call-service
diff --git a/src/PHPUnit/PHPMatcherConstraint.php b/src/PHPUnit/PHPMatcherConstraint.php index <HASH>..<HASH> 100644 --- a/src/PHPUnit/PHPMatcherConstraint.php +++ b/src/PHPUnit/PHPMatcherConstraint.php @@ -16,7 +16,9 @@ final class PHPMatcherConstraint extends Constraint public function __construct(string $patt...
Fix PHPUnit 8 BC break by conditionally call Constraint constructor (#<I>)
diff --git a/lib/resque/worker.rb b/lib/resque/worker.rb index <HASH>..<HASH> 100644 --- a/lib/resque/worker.rb +++ b/lib/resque/worker.rb @@ -16,6 +16,12 @@ module Resque WORKER_HEARTBEAT_KEY = "workers:heartbeat" + @@all_heartbeat_threads = [] + def self.kill_all_heartbeat_threads + @@all_heartbea...
Kill all heartbeat threads after each test run
diff --git a/celeryconfig.py b/celeryconfig.py index <HASH>..<HASH> 100644 --- a/celeryconfig.py +++ b/celeryconfig.py @@ -89,3 +89,8 @@ CELERY_IMPORTS = get_core_modules(engine) + [ ] os.environ["DJANGO_SETTINGS_MODULE"] = "openquake.engine.settings" + +try: + from openquake.engine.utils import tasks +excep...
Fixed a bug affecting celery 2 only when nose is used to run the tests Former-commit-id: <I>ce<I>fb<I>b<I>be3f3df<I>d<I>ac1e5
diff --git a/test/13-integration-tests.js b/test/13-integration-tests.js index <HASH>..<HASH> 100644 --- a/test/13-integration-tests.js +++ b/test/13-integration-tests.js @@ -1186,7 +1186,9 @@ describe('Integration tests', () => { err.message.indexOf('You do not have permission to publish') > -...
fix 'Should allow publishing with special flag'
diff --git a/src/textlint-rule-no-nfd.js b/src/textlint-rule-no-nfd.js index <HASH>..<HASH> 100644 --- a/src/textlint-rule-no-nfd.js +++ b/src/textlint-rule-no-nfd.js @@ -13,6 +13,9 @@ function reporter(context) { } const text = getSource(node); matchCaptureGroupAll(text, /([\u309...
fix(rule): avoid -index
diff --git a/lib/type.js b/lib/type.js index <HASH>..<HASH> 100644 --- a/lib/type.js +++ b/lib/type.js @@ -114,7 +114,11 @@ function Type (type) { if ('CString' == type.name) { rtn = type.ffi_type = bindings.FFI_TYPES.pointer } else { - rtn = type.ffi_type = bindings.FFI_TYPES[type.name] + va...
type: recurse up the prototype chain to type to find the `ffi_type` to use Makes the "long" and "ulong" types work.
diff --git a/hotdoc/core/tree.py b/hotdoc/core/tree.py index <HASH>..<HASH> 100644 --- a/hotdoc/core/tree.py +++ b/hotdoc/core/tree.py @@ -87,8 +87,8 @@ Logger.register_warning_code('markdown-bad-link', HotdocSourceException) class Page: "Banana banana" meta_schema = {Optional('title'): And(str, len), - ...
We should not force short-description and description to be none empty
diff --git a/mama_cas/mixins.py b/mama_cas/mixins.py index <HASH>..<HASH> 100644 --- a/mama_cas/mixins.py +++ b/mama_cas/mixins.py @@ -12,7 +12,7 @@ from django.views.decorators.cache import never_cache from mama_cas.models import ServiceTicket from mama_cas.models import ProxyTicket from mama_cas.models import Prox...
Use more specific error for wrong ticket type
diff --git a/pyrogram/connection/transport/tcp/__init__.py b/pyrogram/connection/transport/tcp/__init__.py index <HASH>..<HASH> 100644 --- a/pyrogram/connection/transport/tcp/__init__.py +++ b/pyrogram/connection/transport/tcp/__init__.py @@ -17,5 +17,6 @@ # along with Pyrogram. If not, see <http://www.gnu.org/licens...
Make TCPAbridgedO importable
diff --git a/src/User/UserIdentityDetails.php b/src/User/UserIdentityDetails.php index <HASH>..<HASH> 100644 --- a/src/User/UserIdentityDetails.php +++ b/src/User/UserIdentityDetails.php @@ -64,7 +64,7 @@ class UserIdentityDetails implements \JsonSerializable /** * @return array */ - function jsonSe...
III-<I> Fixed coding standards.
diff --git a/tests/test_pygdk3.py b/tests/test_pygdk3.py index <HASH>..<HASH> 100644 --- a/tests/test_pygdk3.py +++ b/tests/test_pygdk3.py @@ -1,14 +1,18 @@ +from pyscreenshot.util import use_x_display + from ref import backend_to_check, check_import ok = False if check_import("gi"): - import gi - # Arch: At...
test: check gdk3 import
diff --git a/src/pylast/__init__.py b/src/pylast/__init__.py index <HASH>..<HASH> 100644 --- a/src/pylast/__init__.py +++ b/src/pylast/__init__.py @@ -932,7 +932,15 @@ class _Request: raise NetworkError(self.network, e) try: - response_text = _unicode(conn.getresponse().read()) + ...
Improve handling of error responses from the API
diff --git a/tests/Feature/UIWithCustomAssetConfigurationTest.php b/tests/Feature/UIWithCustomAssetConfigurationTest.php index <HASH>..<HASH> 100644 --- a/tests/Feature/UIWithCustomAssetConfigurationTest.php +++ b/tests/Feature/UIWithCustomAssetConfigurationTest.php @@ -18,7 +18,7 @@ class UIWithCustomAssetConfiguratio...
Fixed L7 `assertSee` test compatibility (prevent from unwanted escape)
diff --git a/modules/ViewDataTable.php b/modules/ViewDataTable.php index <HASH>..<HASH> 100644 --- a/modules/ViewDataTable.php +++ b/modules/ViewDataTable.php @@ -214,13 +214,13 @@ abstract class Piwik_ViewDataTable protected function getUniqIdTable() { - + $uniqIdTable = ''; // if we request a subDataTable...
- fixing bug recently introduced, tables were not ajaxified anymore git-svn-id: <URL>
diff --git a/site/assets/js/app.js b/site/assets/js/app.js index <HASH>..<HASH> 100644 --- a/site/assets/js/app.js +++ b/site/assets/js/app.js @@ -41,7 +41,7 @@ if ($lgInlineContainer) { rotate: false, download: false, slideDelay: 400, - plugins: [lgZoom, lgFullscreen, lgShare, lgAutop...
docs(demo): remove fullscreen from inline demo
diff --git a/src/Dev/Tasks/MigrateFileTask.php b/src/Dev/Tasks/MigrateFileTask.php index <HASH>..<HASH> 100644 --- a/src/Dev/Tasks/MigrateFileTask.php +++ b/src/Dev/Tasks/MigrateFileTask.php @@ -144,6 +144,8 @@ class MigrateFileTask extends BuildTask } } + $this->logger->info("Done!"); + ...
MigrateFileTask now outputs "Done" when it has finished running (#<I>)
diff --git a/Metadata/Driver/DoctrineTypeDriver.php b/Metadata/Driver/DoctrineTypeDriver.php index <HASH>..<HASH> 100644 --- a/Metadata/Driver/DoctrineTypeDriver.php +++ b/Metadata/Driver/DoctrineTypeDriver.php @@ -76,7 +76,7 @@ class DoctrineTypeDriver implements DriverInterface $classMetadata = $this->delega...
Fix incorrect parameter in DoctrineTypeDriver Reflection class was passed in instead of class name
diff --git a/km3pipe/utils/h5extract.py b/km3pipe/utils/h5extract.py index <HASH>..<HASH> 100644 --- a/km3pipe/utils/h5extract.py +++ b/km3pipe/utils/h5extract.py @@ -34,6 +34,19 @@ def main(): args = docopt(__doc__, version=kp.version) + default_flags = ( + "--offline-header", + "--event-info...
h5extract everything as default
diff --git a/clients/java/src/test/java/com/thoughtworks/selenium/ClientUnitTestSuite.java b/clients/java/src/test/java/com/thoughtworks/selenium/ClientUnitTestSuite.java index <HASH>..<HASH> 100644 --- a/clients/java/src/test/java/com/thoughtworks/selenium/ClientUnitTestSuite.java +++ b/clients/java/src/test/java/com/...
Stupid Maven bug; suites only get run if they extend TestCase r<I>
diff --git a/manifest.php b/manifest.php index <HASH>..<HASH> 100755 --- a/manifest.php +++ b/manifest.php @@ -29,7 +29,7 @@ return array( 'label' => 'QTI test model', 'description' => 'TAO QTI test implementation', 'license' => 'GPL-2.0', - 'version' => '16.2.3', + 'version' => '...
Bump to version <I>
diff --git a/src/Fcm.php b/src/Fcm.php index <HASH>..<HASH> 100644 --- a/src/Fcm.php +++ b/src/Fcm.php @@ -44,7 +44,7 @@ class Fcm extends Gcm $json = $result->getBody(); - $this->setFeedback(json_decode($json)); + $this->setFeedback(json_decode($json, false, 512, JSON_BIGINT_AS_S...
Using JSON_BIGINT_AS_STRING as bitmask to prevent large integers convertion to float type. Fixes #<I>
diff --git a/lib/take2/configuration.rb b/lib/take2/configuration.rb index <HASH>..<HASH> 100644 --- a/lib/take2/configuration.rb +++ b/lib/take2/configuration.rb @@ -25,9 +25,8 @@ module Take2 ].freeze @retry_proc = proc {} @retry_condition_proc = proc { false } - @time_to_sleep = 3 - @s...
support time to sleep only if set manually
diff --git a/src/test/java/com/algolia/search/saas/SimpleTest.java b/src/test/java/com/algolia/search/saas/SimpleTest.java index <HASH>..<HASH> 100644 --- a/src/test/java/com/algolia/search/saas/SimpleTest.java +++ b/src/test/java/com/algolia/search/saas/SimpleTest.java @@ -543,7 +543,7 @@ public class SimpleTest { ...
Update hmac value in the test
diff --git a/src/main/java/org/craftercms/engine/controller/ComponentRenderController.java b/src/main/java/org/craftercms/engine/controller/ComponentRenderController.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/craftercms/engine/controller/ComponentRenderController.java +++ b/src/main/java/org/craftercms/en...
Controller fix: * Added support of POST method to ComponentRenderController.
diff --git a/tests/conftest.py b/tests/conftest.py index <HASH>..<HASH> 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -379,8 +379,10 @@ def dummy_mailer(): from smtplib import SMTP from dallinger.heroku import messages server = mock.create_autospec(SMTP) + orig_server = messages.get_email_...
Fix style error and un-monkeypatch fixture.
diff --git a/rspec/rspec_helper.rb b/rspec/rspec_helper.rb index <HASH>..<HASH> 100644 --- a/rspec/rspec_helper.rb +++ b/rspec/rspec_helper.rb @@ -1,3 +1,5 @@ -$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/view_assets') +RSPEC_ROOT = File.dirname(__FILE__) +$LOAD_PATH.unshift(RSPEC_ROOT + '/../lib/view_assets') ...
use FIXTURE_ROOT constant to store the path to fixtures
diff --git a/DataFixtures/ObjectFactory.php b/DataFixtures/ObjectFactory.php index <HASH>..<HASH> 100644 --- a/DataFixtures/ObjectFactory.php +++ b/DataFixtures/ObjectFactory.php @@ -9,6 +9,7 @@ class ObjectFactory { private $manager; private $className; + private $defaultAttributes; public functio...
Added a method to set default values to fixtures
diff --git a/aeron-client/src/main/java/uk/co/real_logic/aeron/Publication.java b/aeron-client/src/main/java/uk/co/real_logic/aeron/Publication.java index <HASH>..<HASH> 100644 --- a/aeron-client/src/main/java/uk/co/real_logic/aeron/Publication.java +++ b/aeron-client/src/main/java/uk/co/real_logic/aeron/Publication.ja...
[Java] Handel the case of a publisher reading the active term id and then taking an interrupt before doing an increment on the the term tail.
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -64,9 +64,13 @@ class bump_version(Command): args = ['--verbose'] if self.verbose > 1 else [] for k, v in kwargs.items(): - k = "--{}".format(k.replace("_", "-")) - is_bool = isinstanc...
setup.py: fix issue with False boolean options in bump_version command In the `setup.py release` custom command, when one doesn't pass the -s option (to GPG sign the git tag), the resulting command-line that is passed to the bumpversion script contains an invalid '--sign-tags False' argument. Boolean options with a Fa...
diff --git a/src/FlysystemStreamWrapper.php b/src/FlysystemStreamWrapper.php index <HASH>..<HASH> 100644 --- a/src/FlysystemStreamWrapper.php +++ b/src/FlysystemStreamWrapper.php @@ -384,7 +384,9 @@ class FlysystemStreamWrapper // as needed in that case. This will be a no-op for php 5. $this->stream_f...
#8 Add resource check on stream_flush and stream_close
diff --git a/lib/onebox/engine/amazon_onebox.rb b/lib/onebox/engine/amazon_onebox.rb index <HASH>..<HASH> 100644 --- a/lib/onebox/engine/amazon_onebox.rb +++ b/lib/onebox/engine/amazon_onebox.rb @@ -10,13 +10,13 @@ module Onebox private - def extracted_data + def data { url: @ur...
refactor amazon onebox - data method #<I>
diff --git a/src/filters/Select.js b/src/filters/Select.js index <HASH>..<HASH> 100644 --- a/src/filters/Select.js +++ b/src/filters/Select.js @@ -21,10 +21,21 @@ class SelectFilter extends Component { } componentDidUpdate(prevProps) { + function optionsEquals(options1, options2) { + const keys = Object...
Fix callback condition in Select filter The filter changed callback will be called less often, and in particular it will not be called when the options object has changed but has the same entries. This should fix issue #<I>
diff --git a/lib/transport.js b/lib/transport.js index <HASH>..<HASH> 100644 --- a/lib/transport.js +++ b/lib/transport.js @@ -21,7 +21,11 @@ module.exports = Transport; */ function Transport (opts) { - this.options = opts; + this.path = opts.path; + this.host = opts.host; + this.port = opts.port; + this.secu...
Expose transport options as properties.
diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index <HASH>..<HASH> 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -5,6 +5,7 @@ // FIXME animated shaders! check in redraw import LayerType from '../../LayerType.js'; +import ImageTile ...
Check that tile is ImageTile before using it
diff --git a/ieml/calculation/thesaurus.py b/ieml/calculation/thesaurus.py index <HASH>..<HASH> 100644 --- a/ieml/calculation/thesaurus.py +++ b/ieml/calculation/thesaurus.py @@ -8,10 +8,22 @@ from ieml.script import CONTAINED_RELATION from bidict import bidict from models.relations import RelationsConnector, Relatio...
Add a method to rank the most cited root paradigms for a given usl collection. Pair programming with Zack #Zack
diff --git a/lib/sbsm/session.rb b/lib/sbsm/session.rb index <HASH>..<HASH> 100644 --- a/lib/sbsm/session.rb +++ b/lib/sbsm/session.rb @@ -356,9 +356,19 @@ module SBSM end def user_input(*keys) if(keys.size == 1) - key = keys.first - key_sym = (key.is_a? Symbol) ? key : key.to_s.intern - @valid_inp...
allow access to hashed inputs through hash-syntax strings
diff --git a/lib/fakefs/file.rb b/lib/fakefs/file.rb index <HASH>..<HASH> 100644 --- a/lib/fakefs/file.rb +++ b/lib/fakefs/file.rb @@ -497,8 +497,8 @@ module FakeFS true end - def write(str) - val = super(str) + def write(*args) + val = super(*args) @file.mtime = Time.now val...
FakeFS::File: fix interface of #write It can take multiple arguments. This caused a warning at least since ruby <I>
diff --git a/tests/Jasny/Config/DynamoDBLoaderTest.php b/tests/Jasny/Config/DynamoDBLoaderTest.php index <HASH>..<HASH> 100644 --- a/tests/Jasny/Config/DynamoDBLoaderTest.php +++ b/tests/Jasny/Config/DynamoDBLoaderTest.php @@ -82,7 +82,9 @@ class DynamoDBLoaderTest extends \PHPUnit_Framework_TestCase if (!$wai...
Set the poll interval for wait in DynamoDBLoaderTest By default WaitOn for DynamoDB poll once every <I>s, causing the test to wait <I> seconds. This is non-sense because the table is created in <I>s by dynalite. Setting the poll interval to 1s significantly speeds up the DynamoDB test.
diff --git a/models/editor.js b/models/editor.js index <HASH>..<HASH> 100644 --- a/models/editor.js +++ b/models/editor.js @@ -29,15 +29,16 @@ module.exports = (bookshelf) => { idAttribute: 'id', initialize() { this.on('saving', (model) => { - if (model.hasChanged('password')) { - return bcrypt.genSalt...
Ensure that password salting function always returns a value
diff --git a/generators/app/configs/package.json.js b/generators/app/configs/package.json.js index <HASH>..<HASH> 100644 --- a/generators/app/configs/package.json.js +++ b/generators/app/configs/package.json.js @@ -26,7 +26,7 @@ module.exports = function(generator) { [packager]: version }, 'scripts': {...
Use the selected packager to run commands (#<I>)
diff --git a/commands/review/post/mode_parent.go b/commands/review/post/mode_parent.go index <HASH>..<HASH> 100644 --- a/commands/review/post/mode_parent.go +++ b/commands/review/post/mode_parent.go @@ -213,7 +213,7 @@ func merge(mergeTask, current, parent string) (act action.Action, err error) { } // Reset the...
review post: Use reset --keep instead of --hard Actually the right thing is to use --keep instead of --hard since we only need to reset the branch to the original position. We don't really care about the working directory state. Change-Id: <I>e3 Story-Id: salsaflow/salsaflow#<I>
diff --git a/docker/transport/unixconn.py b/docker/transport/unixconn.py index <HASH>..<HASH> 100644 --- a/docker/transport/unixconn.py +++ b/docker/transport/unixconn.py @@ -21,13 +21,12 @@ RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer class UnixHTTPResponse(httplib.HTTPResponse, object): de...
Fix broken unbuffered streaming with Py3
diff --git a/sphinx/conf.py b/sphinx/conf.py index <HASH>..<HASH> 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -48,9 +48,9 @@ copyright = u'2011, Florian Ludwig' # built documents. # # The short X.Y version. -version = '0.0.1' +version = '0.2.0' # The full version, including alpha/beta/rc tags. -release = '0...
DOC dump version to <I>
diff --git a/src/InputNumber.js b/src/InputNumber.js index <HASH>..<HASH> 100644 --- a/src/InputNumber.js +++ b/src/InputNumber.js @@ -216,7 +216,11 @@ const InputNumber = React.createClass({ }, render() { - const props = this.props; + const props = {...this.props}; + // Remove React warning. + // W...
fix: should work with React@<I>
diff --git a/src/js/mep-player.js b/src/js/mep-player.js index <HASH>..<HASH> 100644 --- a/src/js/mep-player.js +++ b/src/js/mep-player.js @@ -695,12 +695,13 @@ setPlayerSize: function(width,height) { var t = this; - t.width = width; - t.height = height; + if (typeof width != 'undefined') + t.wi...
updated height/width to check for undfined.
diff --git a/src/util/Util.js b/src/util/Util.js index <HASH>..<HASH> 100644 --- a/src/util/Util.js +++ b/src/util/Util.js @@ -302,11 +302,11 @@ class Util { .sort((a, b) => a.rawPosition - b.rawPosition || Long.fromString(a.id).sub(Long.fromString(b.id)).toNumber()); } - static setPosition(item, position,...
fix a thing (#<I>)
diff --git a/lib/active_interaction/pipeline.rb b/lib/active_interaction/pipeline.rb index <HASH>..<HASH> 100644 --- a/lib/active_interaction/pipeline.rb +++ b/lib/active_interaction/pipeline.rb @@ -34,9 +34,10 @@ module ActiveInteraction # result straight through, use `nil`. To pass the result as a value in a ...
Return nil from pipe I don't want to leak all of the steps.
diff --git a/src/Http/Client/Response.php b/src/Http/Client/Response.php index <HASH>..<HASH> 100644 --- a/src/Http/Client/Response.php +++ b/src/Http/Client/Response.php @@ -13,7 +13,9 @@ */ namespace Cake\Http\Client; -use Cake\Http\Cookie\CookieCollection; +// This alias is necessary to avoid class name conflic...
Use an alias to avoid duplicate class name issues. The deprecated CookieCollection shares a name with this imported class so we need an alias.
diff --git a/translator/prelude.go b/translator/prelude.go index <HASH>..<HASH> 100644 --- a/translator/prelude.go +++ b/translator/prelude.go @@ -211,6 +211,7 @@ var go$newType = function(size, kind, string, name, pkgPath, constructor) { typ.Ptr = go$newType(4, "Ptr", "*" + string, "", "", constructor); typ.Ptr....
fixed nil pointer error on field access of nil
diff --git a/activesupport/lib/active_support/core_ext/object/with_options.rb b/activesupport/lib/active_support/core_ext/object/with_options.rb index <HASH>..<HASH> 100644 --- a/activesupport/lib/active_support/core_ext/object/with_options.rb +++ b/activesupport/lib/active_support/core_ext/object/with_options.rb @@ -4...
[ci skip] Add Doc of with_options for the case when inherited default options and original options have same keys
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonFastParser.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonFastParser.java index <HASH>..<HASH> 100644 --- a/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonFastParser.java +++ b/subprojects/groovy-json/src/...
GROOVY-<I>: Ensure multiple decimal points caught when numbers lazily evaluated in the JsonFastParser.
diff --git a/app/helpers/rails_admin/main_helper.rb b/app/helpers/rails_admin/main_helper.rb index <HASH>..<HASH> 100644 --- a/app/helpers/rails_admin/main_helper.rb +++ b/app/helpers/rails_admin/main_helper.rb @@ -71,7 +71,7 @@ module RailsAdmin max_sets = sets.size-2 total = current_set.between?(1, max_...
If there are no properties, don't crash, just set the per_property to 0, seems safe enough.
diff --git a/tests/functional/test_local.py b/tests/functional/test_local.py index <HASH>..<HASH> 100644 --- a/tests/functional/test_local.py +++ b/tests/functional/test_local.py @@ -5,7 +5,6 @@ from threading import Thread from threading import Event import json import subprocess -import select from contextlib imp...
Remove select() in local test You can't select() on a file desriptor in windows, it has to be a socket. Given we're already retrying connection errors, we don't actually need this. It originally was used to speed up tests.
diff --git a/service/elastigroup/providers/aws/aws.go b/service/elastigroup/providers/aws/aws.go index <HASH>..<HASH> 100644 --- a/service/elastigroup/providers/aws/aws.go +++ b/service/elastigroup/providers/aws/aws.go @@ -510,6 +510,7 @@ type BlockDeviceMapping struct { type EBS struct { DeleteOnTermination *bool ...
[src] Added support for kms_key_id as part of the EBS
diff --git a/lib/generators/templates/blast.rb b/lib/generators/templates/blast.rb index <HASH>..<HASH> 100644 --- a/lib/generators/templates/blast.rb +++ b/lib/generators/templates/blast.rb @@ -295,7 +295,13 @@ module Quorum logger("NCBI Blast", @cmd) - @cmd.each { |c| system(c) } + # Execut...
Execute each Blast system command in a Thread.
diff --git a/system/BaseModel.php b/system/BaseModel.php index <HASH>..<HASH> 100644 --- a/system/BaseModel.php +++ b/system/BaseModel.php @@ -290,12 +290,9 @@ abstract class BaseModel /** * BaseModel constructor. * - * @param object|null $db DB Connection * @param ValidationInterface|n...
BaseModel/Model - Reworked Constructor to properly use reference
diff --git a/src/Select.js b/src/Select.js index <HASH>..<HASH> 100644 --- a/src/Select.js +++ b/src/Select.js @@ -714,7 +714,7 @@ const Select = React.createClass({ onRemove={this.removeValue} value={value} > - {renderLabel(value, 1)} + {renderLabel(value, i)} <span className="Sele...
Fix typo, change "1" -> "i"
diff --git a/cmd/peco/peco.go b/cmd/peco/peco.go index <HASH>..<HASH> 100644 --- a/cmd/peco/peco.go +++ b/cmd/peco/peco.go @@ -1,5 +1,3 @@ -// +build build - package main import ( @@ -13,12 +11,7 @@ import ( "github.com/nsf/termbox-go" ) -// This value is to be initialized by an external tool at link time -// ...
Temporarily do away with hardcoding. See thigs thread: <URL>
diff --git a/test/Tests/RemoteObjectTest.php b/test/Tests/RemoteObjectTest.php index <HASH>..<HASH> 100644 --- a/test/Tests/RemoteObjectTest.php +++ b/test/Tests/RemoteObjectTest.php @@ -221,7 +221,7 @@ class RemoteObjectTest extends \HPCloud\Tests\TestCase { // Change content and retest. $obj->setContent('fo...
Fixed minor typo that I accidentally commit last time.
diff --git a/app/models/organization.rb b/app/models/organization.rb index <HASH>..<HASH> 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -86,7 +86,7 @@ class Organization < ActiveRecord::Base org_verbs = { :update => N_("Manage Organization and Environments"), - + :read =...
added read in the non global list for orgs
diff --git a/src/main/java/com/hp/autonomy/hod/client/api/textindex/query/parametric/FieldValues.java b/src/main/java/com/hp/autonomy/hod/client/api/textindex/query/parametric/FieldValues.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/hp/autonomy/hod/client/api/textindex/query/parametric/FieldValues.java +++ ...
Sever-side meta-filter (FIND-<I>) Add toBuilder to FieldValues so we can easily manipulate parametric response to ape ValueRestriction behaviour [rev. matthew.gordon]
diff --git a/FlowCal/mef.py b/FlowCal/mef.py index <HASH>..<HASH> 100644 --- a/FlowCal/mef.py +++ b/FlowCal/mef.py @@ -24,7 +24,7 @@ import FlowCal.plot import FlowCal.transform import FlowCal.stats -standard_curve_colors = ['tab:blue', 'tab:green', 'tab:orange'] +standard_curve_colors = ['tab:blue', 'tab:green', '...
Changed standard curve color back to red.
diff --git a/classes/Living.js b/classes/Living.js index <HASH>..<HASH> 100644 --- a/classes/Living.js +++ b/classes/Living.js @@ -176,7 +176,7 @@ Living = new Class({ * next command in the action queue will be called. */ startHeart: function() { - this.heartTimer = (function(){ this.beatHeart(); }).periodical...
Fixed the heartbeat's timer clearance, iterated that heartbeat has nothing to do with the player's vital status.
diff --git a/tests/estestcase.py b/tests/estestcase.py index <HASH>..<HASH> 100644 --- a/tests/estestcase.py +++ b/tests/estestcase.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import import os +import logging """ Unit tests for pyes. These require an es server with thrift plugin r...
Adding curl logging to the test connection. Note: output is suppressed by nose framework unless there is an error
diff --git a/tasks/zip.js b/tasks/zip.js index <HASH>..<HASH> 100644 --- a/tasks/zip.js +++ b/tasks/zip.js @@ -45,11 +45,12 @@ module.exports = function(grunt) { // If there is no router if (!router) { // Grab the cwd and return the relative path as our router - var cwd = data.cwd || process.cwd()...
Moved to RegExp.replace over split
diff --git a/lib/Orkestra/Transactor/Entity/AbstractAccount.php b/lib/Orkestra/Transactor/Entity/AbstractAccount.php index <HASH>..<HASH> 100644 --- a/lib/Orkestra/Transactor/Entity/AbstractAccount.php +++ b/lib/Orkestra/Transactor/Entity/AbstractAccount.php @@ -161,7 +161,7 @@ abstract class AbstractAccount extends Ab...
Updated toString for AbstractAccount
diff --git a/lib/expeditor/command.rb b/lib/expeditor/command.rb index <HASH>..<HASH> 100644 --- a/lib/expeditor/command.rb +++ b/lib/expeditor/command.rb @@ -87,10 +87,9 @@ module Expeditor end # `chain` returns new command that has self as dependencies - def chain(&block) - Command.new(dependencie...
Make it possible to use options in Command#chain
diff --git a/angr/storage/memory_mixins/paged_memory/paged_memory_mixin.py b/angr/storage/memory_mixins/paged_memory/paged_memory_mixin.py index <HASH>..<HASH> 100644 --- a/angr/storage/memory_mixins/paged_memory/paged_memory_mixin.py +++ b/angr/storage/memory_mixins/paged_memory/paged_memory_mixin.py @@ -528,10 +528,1...
removed unused attributes and cleaned loop over self._pages
diff --git a/containers/pax-exam-container-karaf/src/main/java/org/ops4j/pax/exam/karaf/container/internal/KarafTestContainer.java b/containers/pax-exam-container-karaf/src/main/java/org/ops4j/pax/exam/karaf/container/internal/KarafTestContainer.java index <HASH>..<HASH> 100644 --- a/containers/pax-exam-container-karaf...
[PAXEXAM-<I>] Support Karaf libraries in the lib/boot folder
diff --git a/salt/fileclient.py b/salt/fileclient.py index <HASH>..<HASH> 100644 --- a/salt/fileclient.py +++ b/salt/fileclient.py @@ -223,7 +223,9 @@ class Client(object): if fn_.strip() and fn_.startswith(path): if salt.utils.check_include_exclude( fn_, include_p...
Bugfix: crash on highstate population when empty path is passed
diff --git a/VM-Core/src/main/java/com/validation/manager/core/server/core/Versionable.java b/VM-Core/src/main/java/com/validation/manager/core/server/core/Versionable.java index <HASH>..<HASH> 100644 --- a/VM-Core/src/main/java/com/validation/manager/core/server/core/Versionable.java +++ b/VM-Core/src/main/java/com/va...
Remove the audit entity listener. Candidate to remove as dead code.
diff --git a/ryu/app/wsgi.py b/ryu/app/wsgi.py index <HASH>..<HASH> 100644 --- a/ryu/app/wsgi.py +++ b/ryu/app/wsgi.py @@ -225,23 +225,15 @@ class WSGIApplication(object): self.registory = {} self._wsmanager = WebSocketManager() super(WSGIApplication, self).__init__() - # XXX: Switch h...
wsgi: Avoid using inspect.getargspec Officially, "inspect.getargspec" is obsoleted in Python <I>, this patch fixes to avoid using this function.
diff --git a/views/js/controller/runtime/testRunner.js b/views/js/controller/runtime/testRunner.js index <HASH>..<HASH> 100644 --- a/views/js/controller/runtime/testRunner.js +++ b/views/js/controller/runtime/testRunner.js @@ -391,7 +391,13 @@ define(['jquery', 'lodash', 'spin', 'serviceApi/ServiceApi', 'serviceApi/Use...
fixing silent fail at delivery time on expired session.
diff --git a/bloop/stream/buffer.py b/bloop/stream/buffer.py index <HASH>..<HASH> 100644 --- a/bloop/stream/buffer.py +++ b/bloop/stream/buffer.py @@ -1,10 +1,4 @@ import heapq -import random - - -def jitter(): - """Used to advance a monotonic clock by a small amount""" - return random.randint(1, 5) def hea...
Remove random jitter from stream.RecordBuffer.clock
diff --git a/tests/test_location_by_point_query_url.py b/tests/test_location_by_point_query_url.py index <HASH>..<HASH> 100644 --- a/tests/test_location_by_point_query_url.py +++ b/tests/test_location_by_point_query_url.py @@ -79,18 +79,3 @@ def test_location_by_point_url_http_protocol(data, expected): def test_locati...
Divided data in between http and https protocol
diff --git a/salt/utils/ssdp.py b/salt/utils/ssdp.py index <HASH>..<HASH> 100644 --- a/salt/utils/ssdp.py +++ b/salt/utils/ssdp.py @@ -380,12 +380,12 @@ class SSDPDiscoveryClient(SSDPBase): :return: ''' - self.log.info("Looking for a server discovery") response = {} - try: - ...
Bugfix for refactoring: the exception was never raised anyway
diff --git a/helper/resource/testing.go b/helper/resource/testing.go index <HASH>..<HASH> 100644 --- a/helper/resource/testing.go +++ b/helper/resource/testing.go @@ -82,10 +82,25 @@ type TestCase struct { // tests will only need one step. type TestStep struct { // PreConfig is called before the Config is applied t...
helper/resource: reshuffling to prepare for importstate testing
diff --git a/src/maplace.js b/src/maplace.js index <HASH>..<HASH> 100644 --- a/src/maplace.js +++ b/src/maplace.js @@ -726,8 +726,9 @@ if (this.o.draggable) { google.maps.event.addListener(this.directionsDisplay, 'directions_changed', function() { + var result = self.d...
[fix] afterRoute not passing status or location with draggable #<I> #<I>
diff --git a/protobuf3/message.py b/protobuf3/message.py index <HASH>..<HASH> 100644 --- a/protobuf3/message.py +++ b/protobuf3/message.py @@ -101,6 +101,8 @@ class Message(object): return self.__wire_message.get(field_number, []) def _set_wire_values(self, field_number, field_type, field_value, index=N...
Fixed KeyError in append method
diff --git a/src/routes.php b/src/routes.php index <HASH>..<HASH> 100644 --- a/src/routes.php +++ b/src/routes.php @@ -55,7 +55,7 @@ Route::group(['prefix' => Config::get('bauhaus::admin.uri')], function () { Route::get('model/{model}/export/{type}', [ 'as' => 'admin.model.export', 'uses' => 'KraftHaus\Bau...
#<I> export route constraints added
diff --git a/src/Cartalyst/Sentry/Hashing/NativeHasher.php b/src/Cartalyst/Sentry/Hashing/NativeHasher.php index <HASH>..<HASH> 100644 --- a/src/Cartalyst/Sentry/Hashing/NativeHasher.php +++ b/src/Cartalyst/Sentry/Hashing/NativeHasher.php @@ -31,6 +31,11 @@ class NativeHasher implements HasherInterface { // Usually ...
Check if password_hash() actually exists (>PHP<I>) and throw a descriptive RuntimeException if it doesn't.
diff --git a/config/tinker.php b/config/tinker.php index <HASH>..<HASH> 100644 --- a/config/tinker.php +++ b/config/tinker.php @@ -4,6 +4,19 @@ return [ /* |-------------------------------------------------------------------------- + | Custom commands + |-----------------------------------------------...
allow to expose console command in tinker
diff --git a/builder/vmware/common/driver.go b/builder/vmware/common/driver.go index <HASH>..<HASH> 100644 --- a/builder/vmware/common/driver.go +++ b/builder/vmware/common/driver.go @@ -106,6 +106,9 @@ func NewDriver(dconfig *DriverConfig, config *SSHConfig) (Driver, error) { errs := "" for _, driver := range driv...
log which vmware driver we decide on
diff --git a/__init__.py b/__init__.py index <HASH>..<HASH> 100644 --- a/__init__.py +++ b/__init__.py @@ -22,5 +22,5 @@ __revision__ = "$Id$" # #--start constants-- -__version__ = "2.6b3" +__version__ = "2.6rc1" #--end constants--
Bumping to <I>rc1
diff --git a/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java index <HASH>..<HASH> 100644 --- a/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java +++ b/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java @@ -1146,15 +1146,11 ...
Smell-fix: refactor method to reduce cognitive complexity
diff --git a/helper/resource/wait.go b/helper/resource/wait.go index <HASH>..<HASH> 100644 --- a/helper/resource/wait.go +++ b/helper/resource/wait.go @@ -74,7 +74,7 @@ func RetryableError(err error) *RetryError { return &RetryError{Err: err, Retryable: true} } -// NonRetryableError is a helper to create a RetryEr...
Fixing small typo in resource/wait.go
diff --git a/debug.go b/debug.go index <HASH>..<HASH> 100644 --- a/debug.go +++ b/debug.go @@ -128,7 +128,7 @@ func (l *State) errorMessage() { l.top++ l.call(l.top-2, 1, false) } - l.throw(fmt.Errorf("%v: %s", RuntimeError, CheckString(l, -1))) + l.throw(RuntimeError(CheckString(l, -1))) } func SetHooker(l...
Throw RuntimeError as a structured error
diff --git a/packages/Pages/src/site/components/com_pages/filters/post.php b/packages/Pages/src/site/components/com_pages/filters/post.php index <HASH>..<HASH> 100644 --- a/packages/Pages/src/site/components/com_pages/filters/post.php +++ b/packages/Pages/src/site/components/com_pages/filters/post.php @@ -39,7 +39,7 @@...
removed support for a, block quote tags
diff --git a/any_urlfield/forms/fields.py b/any_urlfield/forms/fields.py index <HASH>..<HASH> 100644 --- a/any_urlfield/forms/fields.py +++ b/any_urlfield/forms/fields.py @@ -153,11 +153,11 @@ class ExtendedURLValidator(URLValidator): def __call__(self, value): try: super(ExtendedURLValidator...
Raise the original exception instead of reraising with a new traceback
diff --git a/Collection.php b/Collection.php index <HASH>..<HASH> 100644 --- a/Collection.php +++ b/Collection.php @@ -1348,7 +1348,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate // function which we were given. Then, we will sort the returned values and // and g...
revert PR <I> (#<I>)
diff --git a/client/signup/jetpack-connect/controller.js b/client/signup/jetpack-connect/controller.js index <HASH>..<HASH> 100644 --- a/client/signup/jetpack-connect/controller.js +++ b/client/signup/jetpack-connect/controller.js @@ -223,7 +223,7 @@ export default { }, akismetLanding( context ) { - getPlansLand...
JPC: Hide free plan in akismet landing page