diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/scripts/dashboard/dashboard.jobs.store.js b/src/scripts/dashboard/dashboard.jobs.store.js
index <HASH>..<HASH> 100644
--- a/src/scripts/dashboard/dashboard.jobs.store.js
+++ b/src/scripts/dashboard/dashboard.jobs.store.js
@@ -84,7 +84,7 @@ let DashboardJobStore = Reflux.createStore({
for (let app of res.body.availableApps) {app.value = app.label;}
this.update({apps: res.body.availableApps, appsLoading: false});
this.sort('analysis.created', '+', res.body.jobs, true);
- }, isPublic, isSignedOut);
+ }, isPublic);
});
},
|
Don't pass unused argument to getJobs.
|
diff --git a/samples/blueprint/filter/src/main/java/org/ops4j/pax/wicket/samples/blueprint/filter/internal/SampleFilterFactory.java b/samples/blueprint/filter/src/main/java/org/ops4j/pax/wicket/samples/blueprint/filter/internal/SampleFilterFactory.java
index <HASH>..<HASH> 100644
--- a/samples/blueprint/filter/src/main/java/org/ops4j/pax/wicket/samples/blueprint/filter/internal/SampleFilterFactory.java
+++ b/samples/blueprint/filter/src/main/java/org/ops4j/pax/wicket/samples/blueprint/filter/internal/SampleFilterFactory.java
@@ -22,16 +22,6 @@ import org.ops4j.pax.wicket.api.FilterFactory;
public class SampleFilterFactory implements FilterFactory {
- public int compareTo(FilterFactory o) {
- if (o.getPriority() < 1) {
- return 1;
- }
- if (o.getPriority() > 1) {
- return -1;
- }
- return 0;
- }
-
public Integer getPriority() {
return 1;
}
|
Adjust for changes made by PAXWICKET-<I>
|
diff --git a/lib/couch_potato/railtie.rb b/lib/couch_potato/railtie.rb
index <HASH>..<HASH> 100644
--- a/lib/couch_potato/railtie.rb
+++ b/lib/couch_potato/railtie.rb
@@ -6,8 +6,8 @@ module CouchPotato
CouchPotato::Config.database_name = YAML::load(File.read(Rails.root.join('config/couchdb.yml')))[Rails.env]
end
- if Rails.version >= '3'
- class Railtie < Rails::Railtie
+ if defined?(::Rails::Railtie)
+ class Railtie < ::Rails::Railtie
railtie_name :couch_potato
config.after_initialize do |app|
|
more robust check for ::Rails::Railtie
|
diff --git a/lxd/storage/drivers/interface.go b/lxd/storage/drivers/interface.go
index <HASH>..<HASH> 100644
--- a/lxd/storage/drivers/interface.go
+++ b/lxd/storage/drivers/interface.go
@@ -57,9 +57,8 @@ type Driver interface {
SetVolumeQuota(vol Volume, size string, op *operations.Operation) error
GetVolumeDiskPath(vol Volume) (string, error)
- // MountVolume mounts a storage volume, returns true if we caused a new mount, false if
- // already mounted.
- MountVolume(vol Volume, op *operations.Operation) (bool, error)
+ // MountVolume mounts a storage volume (if not mounted) and increments reference counter.
+ MountVolume(vol Volume, op *operations.Operation) error
// MountVolumeSnapshot mounts a storage volume snapshot as readonly, returns true if we
// caused a new mount, false if already mounted.
|
lxd/storage/drivers/interface: Removes "our mount" bool return value from MountVolume
Ref counting keeps track of whether an unmount should proceed or not, so no need for indicating to caller whether they need to unmount or not.
|
diff --git a/src/Command/GenerateCommand.php b/src/Command/GenerateCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/GenerateCommand.php
+++ b/src/Command/GenerateCommand.php
@@ -18,6 +18,7 @@ class GenerateCommand extends ProxyCommand
$this->command = new \Doctrine\DBAL\Migrations\Tools\Console\Command\GenerateCommand();
$this->command->setMigrationConfiguration($migrationConfig);
$this->command->setName(self::getCommandName());
+ $this->command->setAliases(['make:migration']);
$class = new \ReflectionClass($this->command);
$property = $class->getProperty('_template');
diff --git a/src/Command/MigrateCommand.php b/src/Command/MigrateCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/MigrateCommand.php
+++ b/src/Command/MigrateCommand.php
@@ -18,6 +18,7 @@ class MigrateCommand extends ProxyCommand
$this->command = new \Doctrine\DBAL\Migrations\Tools\Console\Command\MigrateCommand();
$this->command->setMigrationConfiguration($migrationConfig);
$this->command->setName(self::getCommandName());
+ $this->command->setAliases(['migrate']);
parent::__construct(null);
}
|
command aliases (to be swapped)
|
diff --git a/will/acl.py b/will/acl.py
index <HASH>..<HASH> 100644
--- a/will/acl.py
+++ b/will/acl.py
@@ -22,7 +22,7 @@ def get_acl_members(acl):
def is_acl_allowed(nick, acl):
if not getattr(settings, "ACL", None):
- logging.warn(
+ logging.warning(
"%s was just allowed to perform actions in %s because no ACL settings exist. This can be a security risk." % (
nick,
acl,
|
warn is deprecated, change to warning in logging module
|
diff --git a/packages/openneuro-server/graphql/schema.js b/packages/openneuro-server/graphql/schema.js
index <HASH>..<HASH> 100644
--- a/packages/openneuro-server/graphql/schema.js
+++ b/packages/openneuro-server/graphql/schema.js
@@ -263,6 +263,8 @@ const typeDefs = `
analytics: Analytic
# Dataset README
readme: String @cacheControl(maxAge: 31536000, scope: PUBLIC)
+ # The git hash associated with this snapshot
+ hexsha: String
}
# Contents of dataset_description.json
|
Add 'hexsha' field to Snapshot API
|
diff --git a/lib/ngoverrides.js b/lib/ngoverrides.js
index <HASH>..<HASH> 100644
--- a/lib/ngoverrides.js
+++ b/lib/ngoverrides.js
@@ -432,7 +432,7 @@ function registerModule(context) {
if (isJSONP) {
// Assume everything up to the opening paren is the callback name
resStr = resStr.replace(/^[^(]+\(/, '')
- .replace(/\);?$/, '');
+ .replace(/\)\s*;?\s*$/, '');
}
// Call the callback before endRequest, to give the
// callback a chance to push more requests into the queue
|
Allow for trailing whitespace in JSON-P response
|
diff --git a/src/Asserts/ReflectionAsserts.php b/src/Asserts/ReflectionAsserts.php
index <HASH>..<HASH> 100644
--- a/src/Asserts/ReflectionAsserts.php
+++ b/src/Asserts/ReflectionAsserts.php
@@ -4,6 +4,18 @@ namespace Illuminated\Testing\Asserts;
trait ReflectionAsserts
{
+ protected function assertSubclassOf($class, $parent)
+ {
+ $message = "Failed asserting that class `{$class}` is subclass of `{$parent}`.";
+ $this->assertTrue(is_subclass_of($class, $parent), $message);
+ }
+
+ protected function assertNotSubclassOf($class, $parent)
+ {
+ $message = "Failed asserting that class `{$class}` is not subclass of `{$parent}`.";
+ $this->assertFalse(is_subclass_of($class, $parent), $message);
+ }
+
protected function assertTraitUsed($class, $trait)
{
$message = "Failed asserting that class `{$class}` is using trait `{$trait}`.";
|
ITT: New reflection asserts added.
|
diff --git a/src/cttvApi.js b/src/cttvApi.js
index <HASH>..<HASH> 100644
--- a/src/cttvApi.js
+++ b/src/cttvApi.js
@@ -219,7 +219,7 @@ var cttvApi = function () {
};
_.url.target = function (obj) {
- return config.prefix + config.version + "/" + prefixTarget + obj.target_id;
+ return config.prefix + config.version + "/" + prefixTarget + parseUrlParams(obj);
};
_.url.disease = function (obj) {
|
target endpoint can have other params
|
diff --git a/lib/middleware/body_size_limiter.js b/lib/middleware/body_size_limiter.js
index <HASH>..<HASH> 100644
--- a/lib/middleware/body_size_limiter.js
+++ b/lib/middleware/body_size_limiter.js
@@ -40,7 +40,11 @@ exports.attach = function attachBodySizeLimiter(options) {
log.msg('Denying client for too large content length', {content_length: cl, max: maxSize});
res.writeHead(413, {Connection: 'close'});
res.end();
- req.transport.close();
+
+ if (req.transport) {
+ req.transport.close();
+ }
+
return;
}
}
@@ -56,7 +60,11 @@ exports.attach = function attachBodySizeLimiter(options) {
log.msg('Denying client for body too large', {content_length: bodyLen, max: maxSize});
res.writeHead(413, {Connection: 'close'});
res.end();
- req.transport.close();
+
+ if (req.transport) {
+ req.transport.close();
+ }
+
oversize = true;
}
});
|
Only call close on transport if transport is available. (it's only available in
node < <I>)
|
diff --git a/eZ/Publish/API/Repository/Tests/ContentTypeServiceTest.php b/eZ/Publish/API/Repository/Tests/ContentTypeServiceTest.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/Repository/Tests/ContentTypeServiceTest.php
+++ b/eZ/Publish/API/Repository/Tests/ContentTypeServiceTest.php
@@ -2161,7 +2161,14 @@ class ContentTypeServiceTest extends BaseTest
*/
public function testLoadContentTypeByRemoteIdThrowsNotFoundException()
{
- $this->markTestIncomplete( "Test for ContentTypeService::loadContentTypeByRemoteId() is not implemented." );
+ $repository = $this->getRepository();
+
+ /* BEGIN: Use Case */
+ $contentTypeService = $repository->getContentTypeService();
+
+ // This call will fail with a NotFoundException
+ $contentTypeService->loadContentTypeByRemoteId( 'not-exists' );
+ /* END: Use Case */
}
/**
|
Implemented error condition on load by remote ID.
|
diff --git a/google/google.go b/google/google.go
index <HASH>..<HASH> 100644
--- a/google/google.go
+++ b/google/google.go
@@ -179,13 +179,13 @@ func (g *GoogleCloud) getTopic(ctx context.Context, name string) (*pubsub.Topic,
var err error
t := g.client.Topic(name)
- ok, err := t.Exists(ctx)
+ ok, err := t.Exists(context.Background())
if err != nil {
return nil, err
}
if !ok {
- t, err = g.client.CreateTopic(ctx, name)
+ t, err = g.client.CreateTopic(context.Background(), name)
if err != nil {
return nil, err
}
|
Use new context for publish to async operations work outside of rpc's
|
diff --git a/builtin/credential/okta/cli.go b/builtin/credential/okta/cli.go
index <HASH>..<HASH> 100644
--- a/builtin/credential/okta/cli.go
+++ b/builtin/credential/okta/cli.go
@@ -38,6 +38,15 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
"password": password,
}
+ mfa_method, ok := m["method"]
+ if ok {
+ data["method"] = mfa_method
+ }
+ mfa_passcode, ok := m["passcode"]
+ if ok {
+ data["passcode"] = mfa_passcode
+ }
+
path := fmt.Sprintf("auth/%s/login/%s", mount, username)
secret, err := c.Logical().Write(path, data)
if err != nil {
|
Add the ability to pass in mfa parameters when authenticating via the… (#<I>)
|
diff --git a/lib/discordrb/events/roles.rb b/lib/discordrb/events/roles.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/events/roles.rb
+++ b/lib/discordrb/events/roles.rb
@@ -68,33 +68,8 @@ module Discordrb::Events
end
# Event raised when a role updates on a server
- class ServerRoleUpdateEvent < Event
- attr_reader :role, :server
-
- def initialize(data, bot)
- @server = bot.server(data['guild_id'].to_i)
- return unless @server
-
- role_id = data['role']['id'].to_i
- @role = @server.roles.find { |r| r.id == role_id }
- end
- end
+ class ServerRoleUpdateEvent < ServerRoleCreateEvent; end
# Event handler for ServerRoleUpdateEvent
- class ServerRoleUpdateEventHandler < EventHandler
- def matches?(event)
- # Check for the proper event type
- return false unless event.is_a? ServerRoleUpdateEvent
-
- [
- matches_all(@attributes[:name], event.name) do |a, e|
- a == if a.is_a? String
- e.to_s
- else
- e
- end
- end
- ].reduce(true, &:&)
- end
- end
+ class ServerRoleUpdateEventHandler < ServerRoleCreateEventHandler; end
end
|
Make ServerRoleUpdateEvent simply inherit from ServerRoleCreate event as both do exactly the same thing
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ setup(
include_package_data = True,
# Package dependencies.
- install_requires = ['setuptools', 'simplejson'],
+ install_requires = ['simplejson'],
# Metadata for PyPI.
author = 'Ryan McGrath',
|
Don't need to include `setuptools`, heh.
|
diff --git a/intranet/settings/base.py b/intranet/settings/base.py
index <HASH>..<HASH> 100644
--- a/intranet/settings/base.py
+++ b/intranet/settings/base.py
@@ -114,7 +114,7 @@ MIDDLEWARE_CLASSES = (
"intranet.middleware.ldap_db.CheckLDAPBindMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"intranet.middleware.ajax.AjaxNotAuthenticatedMiddleWare",
- # "intranet.middleware.templates.AdminSelectizeLoadingIndicatorMiddleware",
+ "intranet.middleware.templates.AdminSelectizeLoadingIndicatorMiddleware",
)
ROOT_URLCONF = "intranet.urls"
|
Re-enable selectize middleware
|
diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index <HASH>..<HASH> 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -272,7 +272,7 @@ class ArrayHelper
foreach ($keys as $i => $key) {
$flag = $sortFlag[$i];
$cs = $caseSensitive[$i];
- if (!$cs && ($flag === SORT_STRING || $flag === SORT_NATURAL)) {
+ if (!$cs && ($flag === SORT_STRING)) {
if (defined('SORT_FLAG_CASE')) {
$flag = $flag | SORT_FLAG_CASE;
$args[] = static::getColumn($array, $key);
|
Fix unsupported flag in php <I>.x environment [ArrayHelper::multisort]
|
diff --git a/lib/instrumentation/span.js b/lib/instrumentation/span.js
index <HASH>..<HASH> 100644
--- a/lib/instrumentation/span.js
+++ b/lib/instrumentation/span.js
@@ -122,10 +122,9 @@ Span.prototype._encode = function (cb) {
timestamp: self.timestamp,
duration: self.duration(),
context: undefined,
- stacktrace: undefined
+ stacktrace: frames
}
- if (frames) payload.stacktrace = frames
if (self._db || self._tags) {
payload.context = {
db: self._db || undefined,
|
refactor: improve span payload encoding (#<I>)
|
diff --git a/lib/qu/backend/mongo.rb b/lib/qu/backend/mongo.rb
index <HASH>..<HASH> 100644
--- a/lib/qu/backend/mongo.rb
+++ b/lib/qu/backend/mongo.rb
@@ -21,7 +21,8 @@ module Qu
def connection
@connection ||= begin
- uri = URI.parse(ENV['MONGOHQ_URL'].to_s)
+ host_uri = (ENV['MONGOHQ_URL'] || ENV['MONGOLAB_URI']).to_s
+ uri = URI.parse(host_uri)
database = uri.path.empty? ? 'qu' : uri.path[1..-1]
options = {}
if uri.password
|
Add mongolab environment variable to mongo backend
|
diff --git a/dramatiq/message.py b/dramatiq/message.py
index <HASH>..<HASH> 100644
--- a/dramatiq/message.py
+++ b/dramatiq/message.py
@@ -48,9 +48,9 @@ class Message(namedtuple("Message", (
"""Create a copy of this message.
"""
updated_options = attributes.pop("options", {})
- options = attributes["options"] = self.options.copy()
+ options = self.options.copy()
options.update(updated_options)
- return self._replace(**attributes)
+ return self._replace(**attributes, options=options)
def __str__(self):
params = ", ".join(repr(arg) for arg in self.args)
|
revert: make Message.copy work under Python <I>
This reverts commit <I>d<I>e5f<I>f<I>cd8c<I>a1de<I>a<I>.
|
diff --git a/src/webpack.js b/src/webpack.js
index <HASH>..<HASH> 100644
--- a/src/webpack.js
+++ b/src/webpack.js
@@ -3,7 +3,6 @@
* @flow
*/
-import invariant from 'invariant';
import {renderToString} from './index';
import {
findConfig,
@@ -22,4 +21,4 @@ module.exports = function reactdown(source: string): string {
parseConfigFromQuery(this.query)
);
return renderToString(source, config).code;
-}
+};
|
style(webpack): lint errors
|
diff --git a/src/benchsuite/rest/app.py b/src/benchsuite/rest/app.py
index <HASH>..<HASH> 100644
--- a/src/benchsuite/rest/app.py
+++ b/src/benchsuite/rest/app.py
@@ -20,11 +20,13 @@
import logging
import signal
import sys
+import json
from flask import Flask
+from flask_restplus import Swagger
from benchsuite.rest.apiv1 import blueprint as blueprint1
-
+from benchsuite.rest.apiv1 import api as apiv1
app = Flask(__name__)
@@ -41,6 +43,14 @@ def on_exit(sig, func=None):
sys.exit(1)
+def dump_swagger_specs():
+ app.config['SERVER_NAME'] = 'example.org:80'
+ with app.app_context():
+ print()
+ with open('swagger-apiv1.json', 'w') as outfile:
+ json.dump(Swagger(apiv1).as_dict(), outfile)
+
+
if __name__ == '__main__':
set_exit_handler(on_exit)
@@ -48,6 +58,12 @@ if __name__ == '__main__':
level=logging.DEBUG,
stream=sys.stdout)
+ if len(sys.argv) > 1 and sys.argv[1] == '--dump-specs':
+ dump_swagger_specs()
+ sys.exit(0)
+
+
+
print('Using internal server. Not use this in production!!!')
app.run(debug=True)
|
added function to dump swagger api specs
|
diff --git a/lib/Pagon/App.php b/lib/Pagon/App.php
index <HASH>..<HASH> 100644
--- a/lib/Pagon/App.php
+++ b/lib/Pagon/App.php
@@ -55,7 +55,7 @@ class App extends EventEmitter
'route' => array(),
'buffer' => true,
'timezone' => 'UTC',
- 'charset' => 'UTF-8'
+ 'charset' => 'UTF-8',
);
/**
@@ -470,6 +470,9 @@ class App extends EventEmitter
}
}
+ // Default set app
+ $data['_'] = $this;
+
// Create view
$view = new View($path, $data + $this->locals, $options + array(
'dir' => $this->config['views']
|
Set app to view variable "_"
|
diff --git a/circuit/circuit.py b/circuit/circuit.py
index <HASH>..<HASH> 100644
--- a/circuit/circuit.py
+++ b/circuit/circuit.py
@@ -678,10 +678,10 @@ class circuit():
if outputs is None or len(outputs) == 0:
return 0
else:
- return 1 + max([ # pylint: disable=R1728
+ return 1 + max(
__subtrees_max_depth(g.outputs)
for g in outputs
- ])
+ )
return __subtrees_max_depth(circuit_inputs)
|
Resolve Pylint-R<I>: pass generator to `max(`
|
diff --git a/test/Specs.js b/test/Specs.js
index <HASH>..<HASH> 100644
--- a/test/Specs.js
+++ b/test/Specs.js
@@ -1,4 +1,4 @@
-var convertor = require('../index'),
+var convertor = require('../chncrs'),
expect = require('expect.js');
describe('ProjectionTransform', function () {
it('convert coordinates from gcj02 to bd09ll',function() {
|
update Specs to chncrs.js
|
diff --git a/fastlane/lib/fastlane/actions/appetize_viewing_url_generator.rb b/fastlane/lib/fastlane/actions/appetize_viewing_url_generator.rb
index <HASH>..<HASH> 100644
--- a/fastlane/lib/fastlane/actions/appetize_viewing_url_generator.rb
+++ b/fastlane/lib/fastlane/actions/appetize_viewing_url_generator.rb
@@ -26,6 +26,7 @@ module Fastlane
url_params << "scale=#{params[:scale]}"
url_params << "launchUrl=#{params[:launch_url]}" if params[:launch_url]
url_params << "language=#{params[:language]}" if params[:language]
+ url_params << "osVersion=#{params[:os_version]}" if params[:os_version]
return link + "?" + url_params.join("&")
end
@@ -97,6 +98,11 @@ module Fastlane
env_name: "APPETIZE_VIEWING_URL_GENERATOR_LAUNCH_URL",
description: "Specify a deep link to open when your app is launched",
is_string: true,
+ optional: true),
+ FastlaneCore::ConfigItem.new(key: :os_version,
+ env_name: "APPETIZE_VIEWING_URL_GENERATOR_OS_VERSION",
+ description: "The operating system version on which to run your app, e.g. 10.3, 8.0",
+ is_string: true,
optional: true)
]
end
|
Add support for OS version in Appetize options (#<I>)
|
diff --git a/lib/art-decomp/fsm.rb b/lib/art-decomp/fsm.rb
index <HASH>..<HASH> 100644
--- a/lib/art-decomp/fsm.rb
+++ b/lib/art-decomp/fsm.rb
@@ -42,13 +42,11 @@ module ArtDecomp class FSM
end
def beta_x ins
- return Blanket[B[*[email protected]]] if ins.empty?
- ins.map { |i| Blanket.from_array @inputs[i] }.inject :*
+ beta @inputs, ins
end
def beta_y ins
- return Blanket[B[*[email protected]]] if ins.empty?
- ins.map { |i| Blanket.from_array @outputs[i] }.inject :*
+ beta @outputs, ins
end
alias eql? ==
@@ -128,6 +126,11 @@ module ArtDecomp class FSM
private
+ def beta column, ins
+ return Blanket[B[*[email protected]]] if ins.empty?
+ ins.map { |i| Blanket.from_array column[i] }.inject :*
+ end
+
def encoding column, rows
encs = rows.bits.map { |row| column[row] }.uniq - [DontCare]
case encs.size
|
factor out FSM#beta
|
diff --git a/sniffy-core/src/main/java/io/sniffy/LegacySpy.java b/sniffy-core/src/main/java/io/sniffy/LegacySpy.java
index <HASH>..<HASH> 100644
--- a/sniffy-core/src/main/java/io/sniffy/LegacySpy.java
+++ b/sniffy-core/src/main/java/io/sniffy/LegacySpy.java
@@ -5,7 +5,6 @@ import io.sniffy.sql.SqlStatement;
import io.sniffy.sql.SqlStats;
import io.sniffy.sql.StatementMetaData;
-import java.lang.ref.WeakReference;
import java.util.Map;
import static io.sniffy.Threads.CURRENT;
|
Avoid unused imports such as 'java.lang.ref.WeakReference'
|
diff --git a/demos/paymentDirect/payment.php b/demos/paymentDirect/payment.php
index <HASH>..<HASH> 100644
--- a/demos/paymentDirect/payment.php
+++ b/demos/paymentDirect/payment.php
@@ -50,10 +50,10 @@ try {
// payment type as CARD
$payIn->PaymentDetails = new \MangoPay\PayInPaymentDetailsCard();
$payIn->PaymentDetails->CardType = $card->CardType;
+ $payIn->PaymentDetails->CardId = $card->Id;
// execution type as DIRECT
$payIn->ExecutionDetails = new \MangoPay\PayInExecutionDetailsDirect();
- $payIn->ExecutionDetails->CardId = $card->Id;
$payIn->ExecutionDetails->SecureModeReturnURL = 'http://test.com';
// create Pay-In
|
set cardId on PaymentDetails in place of ExecutionDetails
As CardId is not a property of PayInExecutionDetailsDirect but is property of PayInPaymentDetailsCard
|
diff --git a/src/transformers/trainer.py b/src/transformers/trainer.py
index <HASH>..<HASH> 100755
--- a/src/transformers/trainer.py
+++ b/src/transformers/trainer.py
@@ -843,6 +843,8 @@ class Trainer:
if getattr(self, "objective", None) is None:
metrics = self.evaluate()
self.objective = self.compute_objective(metrics)
+ if self.hp_search_backend == HPSearchBackend.RAY:
+ tune.report(objective=self.objective)
return self.objective
if self.hp_search_backend == HPSearchBackend.OPTUNA:
|
Lat fix for Ray HP search (#<I>)
|
diff --git a/lib/hazel/cli.rb b/lib/hazel/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/hazel/cli.rb
+++ b/lib/hazel/cli.rb
@@ -114,7 +114,7 @@ module Hazel
unless @no_bundle_install
rvm_env.chdir(@app_path) do
- puts "\n Installing dependencies into #{rvm_ruby}\n\n"
+ say_status :installing, "All dependencies into #{rvm_ruby}"
rvm_env.system "gem install bundler"
rvm_env.system "bundle install"
end
|
Better looking output when installing dependencies into a RVM Gemset.
|
diff --git a/src/View/Helper/EmailHelper.php b/src/View/Helper/EmailHelper.php
index <HASH>..<HASH> 100644
--- a/src/View/Helper/EmailHelper.php
+++ b/src/View/Helper/EmailHelper.php
@@ -59,8 +59,8 @@ class EmailHelper extends HtmlHelper
public function beforeRenderFile(Event $event, $viewFile)
{
- $file = explode(DS, $viewFile);
- $this->_emailType = $file[count($file) - 2];
+ preg_match('/Email\/(text|html)\//', $viewFile, $match);
+ list(, $this->_emailType) = $match;
$this->_eol = 'text' == $this->_emailType ? PHP_EOL : '<br>';
}
|
Improve auto-detection of email type
|
diff --git a/ants/utils/quantile.py b/ants/utils/quantile.py
index <HASH>..<HASH> 100644
--- a/ants/utils/quantile.py
+++ b/ants/utils/quantile.py
@@ -23,7 +23,7 @@ from .. import utils
from .. import core
-def rank_intensity( x, mask=None, get_mask=True, method='max', ):
+def rank_intensity( x, mask=None, get_mask=False, method='max', ):
"""
Rank transform the intensity of the input image with or without masking.
Intensities will transform from [0,1,2,55] to [0,1,2,3] so this may not be
|
BUG: was masking be default. Dammit!
|
diff --git a/suspect/io/twix.py b/suspect/io/twix.py
index <HASH>..<HASH> 100644
--- a/suspect/io/twix.py
+++ b/suspect/io/twix.py
@@ -96,7 +96,10 @@ def load_twix_vb(fin, builder):
# read the rest of the header minus the four bytes we already read
header = fin.read(header_size - 4)
# for some reason the last 24 bytes of the header contain some junk that is not a string
- header = header[:-24].decode('windows-1250')
+ try:
+ header = header[:-24].decode('windows-1252')
+ except UnicodeDecodeError as e:
+ header = header[:-24].decode('windows-1250')
builder.set_header_string(header)
# the way that vb files are set up we just keep reading scans until the acq_end flag is set
|
using two encoding for twix files
|
diff --git a/lib/discordrb/data.rb b/lib/discordrb/data.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/data.rb
+++ b/lib/discordrb/data.rb
@@ -603,7 +603,7 @@ module Discordrb
role_ids = role_id_array(role)
if role_ids.count == 1
- API::Server.add_member_role(@bot.token, @server.id, @user.id, role_ids[0], reason: reason)
+ API::Server.add_member_role(@bot.token, @server.id, @user.id, role_ids[0], reason)
else
old_role_ids = @roles.map(&:id)
new_role_ids = (old_role_ids + role_ids).uniq
@@ -618,7 +618,7 @@ module Discordrb
role_ids = role_id_array(role)
if role_ids.count == 1
- API::Server.remove_member_role(@bot.token, @server.id, @user.id, role_ids[0], reason: reason)
+ API::Server.remove_member_role(@bot.token, @server.id, @user.id, role_ids[0], reason)
else
old_role_ids = @roles.map(&:id)
new_role_ids = old_role_ids.reject { |i| role_ids.include?(i) }
|
Fix reasons being hashes in calls to add/remove_member_role
|
diff --git a/MANIFEST.in b/MANIFEST.in
index <HASH>..<HASH> 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include README.* setup.py setup.cfg
+include README.* setup.py setup.cfg LICENSE.txt
recursive-include pymemcache *.py
global-exclude *.pyc
global-exclude *.pyo
diff --git a/pymemcache/__init__.py b/pymemcache/__init__.py
index <HASH>..<HASH> 100644
--- a/pymemcache/__init__.py
+++ b/pymemcache/__init__.py
@@ -1 +1 @@
-__version__ = '1.2.4'
+__version__ = '1.2.5'
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
long_description = open('README.md').read(),
license = 'Apache License 2.0',
url = 'https://github.com/Pinterest/pymemcache',
- classifiers=[
+ classifiers = [
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
|
Adding the LICENSE.txt file to the distribution
|
diff --git a/generators/app/templates/app.js b/generators/app/templates/app.js
index <HASH>..<HASH> 100644
--- a/generators/app/templates/app.js
+++ b/generators/app/templates/app.js
@@ -21,7 +21,7 @@ const appHooks = require('./app.hooks');
const app = feathers();
// Load app configuration
-app.configure(configuration(path.join(__dirname, '..')));
+app.configure(configuration());
// Enable CORS, security, compression, favicon and body parsing
app.use(cors());
app.use(helmet());
|
Remove path argument from configuration (#<I>)
Argument is no longer in use. Fixes #<I>.
|
diff --git a/seed_stage_based_messaging/__init__.py b/seed_stage_based_messaging/__init__.py
index <HASH>..<HASH> 100644
--- a/seed_stage_based_messaging/__init__.py
+++ b/seed_stage_based_messaging/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.9.5.dev0'
+__version__ = '0.9.5'
VERSION = __version__
|
bumped release version to <I>
|
diff --git a/server/src/site/js/orientdb-api.js b/server/src/site/js/orientdb-api.js
index <HASH>..<HASH> 100755
--- a/server/src/site/js/orientdb-api.js
+++ b/server/src/site/js/orientdb-api.js
@@ -173,7 +173,7 @@ function ODatabase(databasePath) {
}
$.ajax({
beforeSend: function(xhr){
- if( userName != '' && userPass != '' )
+ if( userName != '' )
return xhr.setRequestHeader('Authorization', 'BASIC ' + btoa(userName+':'+userPass));
},
type : type,
|
Resolves #<I> - JS API library doesn't support empty passwords
|
diff --git a/gems/rake-support/share/rails/template.rb b/gems/rake-support/share/rails/template.rb
index <HASH>..<HASH> 100644
--- a/gems/rake-support/share/rails/template.rb
+++ b/gems/rake-support/share/rails/template.rb
@@ -84,9 +84,9 @@ end
INIT
end
-# Create directories for tasks, jobs, services, and processors just for fun
+# Create directories for jobs, services, and processors just for fun
inside('app') {
- %w( tasks jobs services processors).each { |dir| FileUtils.mkdir(dir) unless File.exists?(dir) }
+ %w(jobs services processors).each { |dir| FileUtils.mkdir(dir) unless File.exists?(dir) }
}
app_constant = RAILS_2 ? 'Rails::Application' : app_const
|
Don't generate an app/tasks/ dir since tasks have been deprecated.
|
diff --git a/blockstack_client/zonefile.py b/blockstack_client/zonefile.py
index <HASH>..<HASH> 100644
--- a/blockstack_client/zonefile.py
+++ b/blockstack_client/zonefile.py
@@ -211,6 +211,8 @@ def load_name_zonefile(name, expected_zonefile_hash, storage_drivers=None, raw_z
# try atlas node first
res = get_zonefiles( hostport, [expected_zonefile_hash], proxy=proxy )
if 'error' in res or expected_zonefile_hash not in res['zonefiles'].keys():
+ log.warning("Zonefile {} not available from {}; falling back to storage".format(expected_zonefile_hash, hostport))
+
# fall back to storage drivers if atlas node didn't have it
zonefile_txt = storage.get_immutable_data(
expected_zonefile_hash, hash_func=storage.get_zonefile_data_hash,
|
log failure to find zonefiles in atlas
|
diff --git a/cmd/server-mux.go b/cmd/server-mux.go
index <HASH>..<HASH> 100644
--- a/cmd/server-mux.go
+++ b/cmd/server-mux.go
@@ -350,7 +350,7 @@ func (m *ServerMux) ListenAndServe(certFile, keyFile string) (err error) {
RawQuery: r.URL.RawQuery,
Fragment: r.URL.Fragment,
}
- http.Redirect(w, r, u.String(), http.StatusMovedPermanently)
+ http.Redirect(w, r, u.String(), http.StatusTemporaryRedirect)
} else {
// Execute registered handlers
m.Server.Handler.ServeHTTP(w, r)
|
Use <I> StatusTemporaryRedirect to redirect clients from http to https with forcing them to keep HTTP Verb (#<I>)
|
diff --git a/lib/jazzy/config.rb b/lib/jazzy/config.rb
index <HASH>..<HASH> 100644
--- a/lib/jazzy/config.rb
+++ b/lib/jazzy/config.rb
@@ -222,8 +222,8 @@ module Jazzy
config_attr :skip_undocumented,
command_line: '--[no-]skip-undocumented',
- description: "Don't document declarations that have no documentation '\
- 'comments.",
+ description: "Don't document declarations that have no documentation "\
+ "comments.",
default: false
config_attr :hide_documentation_coverage,
|
Fix whitespace error in :skip_undocumented config.
Before: Don't document declarations that have no documentation ' 'comments.
After: Don't document declarations that have no documentation comments.
|
diff --git a/lib/yao/resources/server.rb b/lib/yao/resources/server.rb
index <HASH>..<HASH> 100644
--- a/lib/yao/resources/server.rb
+++ b/lib/yao/resources/server.rb
@@ -21,6 +21,11 @@ module Yao::Resources
self.service = "compute"
self.resource_name = "server"
self.resources_name = "servers"
+
+ def old_samples(counter_name: nil, query: {})
+ Yao::OldSample.list(counter_name, query).select{|os| os.resource_metadata["instance_id"] == id}
+ end
+
def self.start(id)
action(id, "os-start" => nil)
end
|
added Yao::Server#old_samples
|
diff --git a/spotinst/aws_group.go b/spotinst/aws_group.go
index <HASH>..<HASH> 100644
--- a/spotinst/aws_group.go
+++ b/spotinst/aws_group.go
@@ -82,6 +82,7 @@ type AwsGroupScalingPolicy struct {
EvaluationPeriods *int `json:"evaluationPeriods,omitempty"`
Period *int `json:"period,omitempty"`
Cooldown *int `json:"cooldown,omitempty"`
+ Operator *string `json:"operator,omitempty"`
Dimensions []*AwsGroupScalingPolicyDimension `json:"dimensions,omitempty"`
}
|
feature: Add support for scaling policy operator
|
diff --git a/lib/prey/connection.js b/lib/prey/connection.js
index <HASH>..<HASH> 100644
--- a/lib/prey/connection.js
+++ b/lib/prey/connection.js
@@ -10,19 +10,14 @@ var logger = require('./common').logger,
util = require('util'),
Emitter = require('events').EventEmitter;
-var Connection = function(proxy_config){
+var Connection = function(options){
var self = this;
this.established = false;
this.timeout = 5 * 1000; // 5 seconds
- if(proxy_config.enabled){
- this.check_port = proxy_config.port;
- this.check_host = proxy_config.host;
- } else {
- this.check_port = 80;
- this.check_host = 'www.google.com';
- }
+ this.target_host = options.host || 'www.google.com';
+ this.target_port = options.port || 80;
this.done = function(status, err){
if(err) logger.error(err);
@@ -37,7 +32,7 @@ var Connection = function(proxy_config){
var socket = this.socket = new net.Socket();
socket.setTimeout(this.timeout);
- socket.connect(parseInt(this.check_port), this.check_host);
+ socket.connect(parseInt(this.target_port), this.target_host);
socket.once('connect', function() {
self.established = true;
|
Use {port: port, host: host} options structure for connection.js.
|
diff --git a/salt/utils/verify.py b/salt/utils/verify.py
index <HASH>..<HASH> 100644
--- a/salt/utils/verify.py
+++ b/salt/utils/verify.py
@@ -154,12 +154,12 @@ def verify_files(files, user):
try:
pwnam = pwd.getpwnam(user)
uid = pwnam[2]
-
except KeyError:
err = ('Failed to prepare the Salt environment for user '
'{0}. The user is not available.\n').format(user)
sys.stderr.write(err)
sys.exit(salt.defaults.exitcodes.EX_NOUSER)
+
for fn_ in files:
dirname = os.path.dirname(fn_)
try:
@@ -171,6 +171,14 @@ def verify_files(files, user):
if not os.path.isfile(fn_):
with salt.utils.fopen(fn_, 'w+') as fp_:
fp_.write('')
+
+ except IOError as err:
+ if err.errno != errno.EACCES:
+ raise
+ msg = 'No permissions to access "{0}", are you running as the correct user?\n'
+ sys.stderr.write(msg.format(fn_))
+ sys.exit(err.errno)
+
except OSError as err:
msg = 'Failed to create path "{0}" - {1}\n'
sys.stderr.write(msg.format(fn_, err))
|
Have a nice error message if running as the wrong user.
This is a nice-to-have to avoid exception tracebacks in the output
if running Salt as the wrong user, which I tend to do by accident a lot.
The actual exception message is no longer shown because it is redundant.
|
diff --git a/test/unit/basic-tests.js b/test/unit/basic-tests.js
index <HASH>..<HASH> 100644
--- a/test/unit/basic-tests.js
+++ b/test/unit/basic-tests.js
@@ -80,7 +80,10 @@ describe('types', function () {
['00c31e', '49950'],
['0500e3c2cef9eaaab3', '92297829382473034419'],
['033171cbe0fac2d665b78d4e', '988229782938247303441911118'],
- ['fcce8e341f053d299a4872b2', '-988229782938247303441911118']
+ ['fcce8e341f053d299a4872b2', '-988229782938247303441911118'],
+ ['00b70cefb9c19c9c5112972fd01a4e676d', '243315893003967298069149506221212854125'],
+ ['00ba0cef', '12193007'],
+ ['00ffffffff', '4294967295']
];
it('should create from buffer', function () {
values.forEach(function (item) {
|
Test: positive varints with msb on NODEJS-<I>
|
diff --git a/examples/app.js b/examples/app.js
index <HASH>..<HASH> 100644
--- a/examples/app.js
+++ b/examples/app.js
@@ -6,7 +6,7 @@
var sys = require('sys'),
jade = require('./../lib/jade');
-jade.renderFile(__dirname + '/layout.jade', function(err, html){
+jade.renderFile(__dirname + '/layout.jade', { debug: true }, function(err, html){
if (err) throw err;
sys.puts(html);
});
\ No newline at end of file
diff --git a/lib/jade.js b/lib/jade.js
index <HASH>..<HASH> 100644
--- a/lib/jade.js
+++ b/lib/jade.js
@@ -306,7 +306,7 @@ Parser.prototype = {
: buf + ';';
case 'newline':
this.advance;
- return this.parseExpr();
+ return '_.lineno = ' + this.lineno + ';' + this.parseExpr();
}
},
@@ -532,6 +532,10 @@ exports.render = function(str, options){
function parse(){
try {
var parser = new Parser(str, filename);
+ if (options.debug) {
+ parser.debug();
+ parser = new Parser(str, filename);
+ }
return parser.parse();
} catch (err) {
var lineno = parser.lineno,
|
Added "debug" option back
|
diff --git a/spec/punit/trap_spec.rb b/spec/punit/trap_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/punit/trap_spec.rb
+++ b/spec/punit/trap_spec.rb
@@ -97,10 +97,11 @@ describe 'Flor punit' do
'here(0_1_0_0) terminated(f:0)'
)
- tm = @unit.journal.select { |m| m['point'] == 'trigger' }.first
+ ms = @unit.journal
+ m0 = ms.find { |m| m['point'] == 'terminated' }
+ m1 = ms.find { |m| m['point'] == 'trigger' }
- expect(tm['m']).to eq(19)
- expect(tm['sm']).to eq(18)
+ expect(m1['sm']).to eq(m0['m'])
end
it 'traps multiple times' do
|
Make trap trigger spec more adaptable
|
diff --git a/src/app/Classes/Builder.php b/src/app/Classes/Builder.php
index <HASH>..<HASH> 100644
--- a/src/app/Classes/Builder.php
+++ b/src/app/Classes/Builder.php
@@ -63,13 +63,13 @@ class Builder
private function appendConfigParams()
{
- $this->template->authorize = isset($this->template->authorize)
- ? $this->template->authorize
- : config('enso.forms.authorize');
+ if (!property_exists($this->template, 'authorize')) {
+ $this->template->authorize = config('enso.forms.authorize');
+ }
- $this->template->dividerTitlePlacement = isset($this->template->dividerTitlePlacement)
- ? $this->template->dividerTitlePlacement
- : config('enso.forms.dividerTitlePlacement');
+ if (!property_exists($this->template, 'dividerTitlePlacement')) {
+ $this->template->dividerTitlePlacement = config('enso.forms.dividerTitlePlacement');
+ }
}
private function isForbidden($route)
|
refactors `appendConfigParams` from the builder
|
diff --git a/salt/renderers/stateconf.py b/salt/renderers/stateconf.py
index <HASH>..<HASH> 100644
--- a/salt/renderers/stateconf.py
+++ b/salt/renderers/stateconf.py
@@ -411,7 +411,8 @@ def add_goal_state(data):
return
else:
reqlist = []
- for sid, _, state, _ in statelist(data):
+ for sid, _, state, _ in \
+ statelist(data, set(['include', 'exclude', 'extend'])):
reqlist.append({state_name(state): sid})
data[goal_sid] = {'state.config': [dict(require=reqlist)]}
|
Fix a bug in goal generation that forgot to ignore the 'extend' special sid.
|
diff --git a/spec/views/shared/_atom_feed_spec.rb b/spec/views/shared/_atom_feed_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/views/shared/_atom_feed_spec.rb
+++ b/spec/views/shared/_atom_feed_spec.rb
@@ -34,13 +34,19 @@ describe "shared/atom_feed.atom.builder" do
end
end
- describe "rendering trackbacks" do
+ describe "rendering trackbacks with one trackback" do
let(:article) { base_article }
let(:trackback) { Factory.build(:trackback, :article => article) }
- it "should render a valid atom feed" do
+ before do
render "shared/atom_feed", :items => [trackback]
+ end
+
+ it "should render a valid feed" do
assert_feedvalidator rendered
+ end
+
+ it "should render an Atom feed with one item" do
assert_atom10 rendered, 1
end
end
|
Split large atom feed view spec for trackbacks.
|
diff --git a/livetests.py b/livetests.py
index <HASH>..<HASH> 100755
--- a/livetests.py
+++ b/livetests.py
@@ -52,7 +52,7 @@ def _initialize(api):
@pytest.fixture(
- scope="module", params=["2.16.22", "3.0.13", "3.1.8", "3.2.3", "3.3.0-rc2"]
+ scope="module", params=["2.16.22", "3.0.13", "3.1.8", "3.2.3", "3.3.0-rc3"]
)
def gerrit_api(request):
"""Create a Gerrit container for the given version and return an API."""
|
Set the <I>-rc3 version in livetests
|
diff --git a/elasticsearch-model/lib/elasticsearch/model/response/base.rb b/elasticsearch-model/lib/elasticsearch/model/response/base.rb
index <HASH>..<HASH> 100644
--- a/elasticsearch-model/lib/elasticsearch/model/response/base.rb
+++ b/elasticsearch-model/lib/elasticsearch/model/response/base.rb
@@ -48,7 +48,11 @@ module Elasticsearch
# Returns the total number of hits
#
def total
- response.response['hits']['total']
+ if response.response['hits']['total'].respond_to?(:keys)
+ response.response['hits']['total']['value']
+ else
+ response.response['hits']['total']
+ end
end
# Returns the max_score
|
[MODEL] Handle total hits as an object in search response
|
diff --git a/src/Entities/Menu.php b/src/Entities/Menu.php
index <HASH>..<HASH> 100644
--- a/src/Entities/Menu.php
+++ b/src/Entities/Menu.php
@@ -1,6 +1,7 @@
<?php namespace Arcanedev\Menus\Entities;
use Closure;
+use IteratorAggregate;
/**
* Class Menu
@@ -8,7 +9,7 @@ use Closure;
* @package Arcanedev\Menus\Entities
* @author ARCANEDEV <[email protected]>
*/
-class Menu
+class Menu implements IteratorAggregate
{
/* ------------------------------------------------------------------------------------------------
| Properties
@@ -44,6 +45,20 @@ class Menu
}
/* ------------------------------------------------------------------------------------------------
+ | Getters & Setters
+ | ------------------------------------------------------------------------------------------------
+ */
+ /**
+ * Get the menu items iterator.
+ *
+ * @return \Arcanedev\Menus\Entities\MenuItemCollection
+ */
+ public function getIterator()
+ {
+ return $this->items;
+ }
+
+ /* ------------------------------------------------------------------------------------------------
| Main Functions
| ------------------------------------------------------------------------------------------------
*/
|
Adding IteratorAggregate Interface to Menu Entity
|
diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go
index <HASH>..<HASH> 100644
--- a/aws/resource_aws_kinesis_firehose_delivery_stream.go
+++ b/aws/resource_aws_kinesis_firehose_delivery_stream.go
@@ -2497,7 +2497,7 @@ func firehoseDeliveryStreamSSEWaitUntilTargetState(conn *firehose.Firehose, deli
func isKinesisFirehoseDeliveryStreamOptionDisabled(v interface{}) bool {
options := v.([]interface{})
- if len(options) == 0 {
+ if len(options) == 0 || options[0] == nil {
return true
}
e := options[0].(map[string]interface{})["enabled"]
|
Update aws/resource_aws_kinesis_firehose_delivery_stream.go
|
diff --git a/packages/typography/src/__stories__/Typography.new-stories.js b/packages/typography/src/__stories__/Typography.new-stories.js
index <HASH>..<HASH> 100644
--- a/packages/typography/src/__stories__/Typography.new-stories.js
+++ b/packages/typography/src/__stories__/Typography.new-stories.js
@@ -15,15 +15,15 @@ export default {
argTypes: {
variant: {
options: AVAILABLE_VARIANTS,
- control: { type: "select" },
+ control: "select",
},
align: {
options: AVAILABLE_ALIGNMENTS,
- control: { type: "select" },
+ control: "select",
},
fontWeight: {
options: AVAILABLE_FONT_WEIGHTS,
- control: { type: "select" },
+ control: "select",
},
},
parameters: {
|
feat: use latest theme-data
- forcing a missed release, this should be a docs: commit for new storybook stories
|
diff --git a/api.js b/api.js
index <HASH>..<HASH> 100644
--- a/api.js
+++ b/api.js
@@ -81,6 +81,12 @@ define([
});
},
+ deauthorize_url: function (done) {
+ this.get('/info', {}, function (err, res) {
+ done(res.body.authorization_endpoint + '/logout.do');
+ });
+ },
+
processResponse: function (options, err, res, done) {
// Prioritize our error condition checking over jqueries...
if (res.status_code === 401) {return this.authorize();}
@@ -142,4 +148,4 @@ define([
return api;
}
-);
\ No newline at end of file
+);
|
define deauthorize_url which is for logging out of uaa
|
diff --git a/lib/quickbooks/service/reports.rb b/lib/quickbooks/service/reports.rb
index <HASH>..<HASH> 100644
--- a/lib/quickbooks/service/reports.rb
+++ b/lib/quickbooks/service/reports.rb
@@ -6,6 +6,7 @@ module Quickbooks
if(options == {})
return "#{url_for_base}/reports/#{which_report}?date_macro=#{URI.encode_www_form_component(date_macro)}"
else
+ options_string = ""
options.each do |key, value|
options_string += "#{key}=#{value}&"
end
@@ -16,7 +17,7 @@ module Quickbooks
end
end
- def fetch_collection(model, date_macro, object_query, options)
+ def fetch_collection(model, date_macro, object_query, options = {})
response = do_http_get(url_for_query(object_query, date_macro, options))
parse_collection(response, model)
|
default for 'options' in fetch_collection, and set reports_string to "" initially
|
diff --git a/packages/core/core/src/BundlerRunner.js b/packages/core/core/src/BundlerRunner.js
index <HASH>..<HASH> 100644
--- a/packages/core/core/src/BundlerRunner.js
+++ b/packages/core/core/src/BundlerRunner.js
@@ -238,21 +238,15 @@ export default class BundlerRunner {
}
});
- let entryIsReference = false;
for (let asset of duplicated) {
bundleGraph.removeAssetGraphFromBundle(asset, bundle);
-
- if (entry.id === asset.id) {
- entryIsReference = true;
- }
}
bundleGraph._graph.addEdge(
dependency
? dependency.id
: nullthrows(bundleGraph._graph.getNode(bundle.id)).id,
- entry.id,
- entryIsReference ? 'references' : null
+ entry.id
);
if (isEntry) {
|
Update runtimes to reflect removals aren't references anymore
|
diff --git a/undocker.py b/undocker.py
index <HASH>..<HASH> 100644
--- a/undocker.py
+++ b/undocker.py
@@ -95,11 +95,11 @@ def main():
args = parse_args()
logging.basicConfig(level=args.loglevel)
- stdin = io.open(sys.stdin.fileno(), 'rb')
-
- with tempfile.NamedTemporaryFile() as fd:
+ with tempfile.NamedTemporaryFile() as fd, (
+ open(args.image, 'rb') if args.image
+ else io.open(sys.stdin.fileno(), 'rb')) as image:
while True:
- data = stdin.read(8192)
+ data = image.read(8192)
if not data:
break
fd.write(data)
|
stop lying about supporting an "image" argument
|
diff --git a/src/ContaoCommunityAlliance/DcGeneral/Contao/View/Contao2BackendView/TreeSelect.php b/src/ContaoCommunityAlliance/DcGeneral/Contao/View/Contao2BackendView/TreeSelect.php
index <HASH>..<HASH> 100644
--- a/src/ContaoCommunityAlliance/DcGeneral/Contao/View/Contao2BackendView/TreeSelect.php
+++ b/src/ContaoCommunityAlliance/DcGeneral/Contao/View/Contao2BackendView/TreeSelect.php
@@ -91,7 +91,6 @@ class TreeSelect
define('CURRENT_ID', ($strTable ? \Session::getInstance()->get('CURRENT_ID') : \Input::get('id')));
$dispatcher = $GLOBALS['container']['event-dispatcher'];
- $propagator = new EventDispatcher($dispatcher);
$translator = new TranslatorChain();
$translator->add(new LangArrayTranslator($dispatcher));
@@ -100,7 +99,7 @@ class TreeSelect
$this->itemContainer = $factory
->setContainerName($strTable)
->setTranslator($translator)
- ->setEventDispatcher($propagator)
+ ->setEventDispatcher($dispatcher)
->createDcGeneral();
$information = (array) $GLOBALS['TL_DCA'][$strTable]['fields'][$strField];
|
Remove the old EventDispatcher.
|
diff --git a/dpxdt/server/frontend.py b/dpxdt/server/frontend.py
index <HASH>..<HASH> 100644
--- a/dpxdt/server/frontend.py
+++ b/dpxdt/server/frontend.py
@@ -123,6 +123,9 @@ def view_build():
# Count totals for each run state within that release.
for candidate_id, status, count in stats_counts:
+ if candidate_id not in run_stats_dict:
+ continue
+
stats_dict = run_stats_dict[candidate_id]
if status in (models.Run.DIFF_APPROVED,
|
Fix another bug in the caching code
|
diff --git a/src/Sulu/Component/Content/Mapper/ContentMapper.php b/src/Sulu/Component/Content/Mapper/ContentMapper.php
index <HASH>..<HASH> 100644
--- a/src/Sulu/Component/Content/Mapper/ContentMapper.php
+++ b/src/Sulu/Component/Content/Mapper/ContentMapper.php
@@ -808,14 +808,14 @@ class ContentMapper implements ContentMapperInterface
$languageCode,
null
);
- $title = $property->getValue();
+ $nodeName = $property->getValue();
$structure->setUuid($node->getPropertyValue('jcr:uuid'));
// throw an content.node.load event (disabled for now)
//$event = new ContentNodeEvent($node, $structure);
//$this->eventDispatcher->dispatch(ContentEvents::NODE_LOAD, $event);
- $result[] = new BreadcrumbItem($depth, $nodeUuid, $title);
+ $result[] = new BreadcrumbItem($depth, $nodeUuid, $nodeName);
}
return $result;
|
refactored var name
|
diff --git a/src/helpers.php b/src/helpers.php
index <HASH>..<HASH> 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -149,7 +149,7 @@ function base64_decrypt($data, $key = false){
if($key){
$data = str_rot_pass($data, $key, true);
} else if(Config::get('encryption_key')){
- $data = str_rot_pass($data, Config::get('encryption_key'));
+ $data = str_rot_pass($data, Config::get('encryption_key'), true);
}
return $data;
|
base<I>_decrypt was doing encryption instead of decryption
|
diff --git a/fireplace/card.py b/fireplace/card.py
index <HASH>..<HASH> 100644
--- a/fireplace/card.py
+++ b/fireplace/card.py
@@ -1,5 +1,5 @@
from itertools import chain
-from hearthstone.enums import CardType, PlayReq, Race, Rarity, Zone
+from hearthstone.enums import CardType, PlayReq, Race, Rarity, Step, Zone
from . import actions, cards, rules
from .aura import TargetableByAuras
from .entity import BaseEntity, Entity, boolean_property, int_property, slot_property
@@ -236,9 +236,12 @@ class PlayableCard(BaseCard, Entity, TargetableByAuras):
self.log("%s draws %r", self.controller, self)
self.zone = Zone.HAND
self.controller.cards_drawn_this_turn += 1
- actions = self.get_actions("draw")
- if actions:
- self.game.queue_actions(self, actions)
+
+ if self.game.step > Step.BEGIN_MULLIGAN:
+ # Proc the draw script, but only if we are past mulligan
+ actions = self.get_actions("draw")
+ if actions:
+ self.game.queue_actions(self, actions)
def heal(self, target, amount):
return self.game.queue_actions(self, [actions.Heal(target, amount)])
|
Do not trigger draw scripts during Mulligan
|
diff --git a/lib/knode.js b/lib/knode.js
index <HASH>..<HASH> 100644
--- a/lib/knode.js
+++ b/lib/knode.js
@@ -324,7 +324,8 @@ exports.KNode.prototype._iterativeFind = function(key, mode, cb) {
}
if (closestNode == previousClosestNode || shortlist.length >= constants.K) {
- // TODO: clarify we might have to do a FIND_NODE here too
+ // TODO: do a FIND_* call on all nodes in shortlist
+ // who have not been contacted
externalCallback(null, 'NODE', shortlist);
return;
}
|
clarified that find node has to be performed
|
diff --git a/core/src/test/java/com/google/errorprone/dataflow/nullnesspropagation/testdata/NullnessPropagationTransferCases8.java b/core/src/test/java/com/google/errorprone/dataflow/nullnesspropagation/testdata/NullnessPropagationTransferCases8.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/com/google/errorprone/dataflow/nullnesspropagation/testdata/NullnessPropagationTransferCases8.java
+++ b/core/src/test/java/com/google/errorprone/dataflow/nullnesspropagation/testdata/NullnessPropagationTransferCases8.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
/**
- * Tests for caught exceptions.
+ * Tests for {@code try} blocks.
*/
public class NullnessPropagationTransferCases8 {
public void caughtException() {
@@ -29,6 +29,10 @@ public class NullnessPropagationTransferCases8 {
} catch (Throwable t) {
// BUG: Diagnostic contains: (Non-null)
triggerNullnessChecker(t);
+
+ t = something();
+ // BUG: Diagnostic contains: (Nullable)
+ triggerNullnessChecker(t);
}
}
@@ -44,7 +48,7 @@ public class NullnessPropagationTransferCases8 {
}
}
- OutputStream something() {
- return new ByteArrayOutputStream();
+ <T> T something() {
+ return null;
}
}
|
Test assignment to catch() variable.
RELNOTES: none
-------------
Created by MOE: <URL>
|
diff --git a/src/DB/Entity/LazyLoading.php b/src/DB/Entity/LazyLoading.php
index <HASH>..<HASH> 100644
--- a/src/DB/Entity/LazyLoading.php
+++ b/src/DB/Entity/LazyLoading.php
@@ -9,7 +9,7 @@ namespace Jasny\DB\Entity;
* @license https://raw.github.com/jasny/db/master/LICENSE MIT
* @link https://jasny.github.com/db
*/
-interface LazyLoading extends \Jasny\DB\Entity, SelfAware
+interface LazyLoading extends \Jasny\DB\Entity
{
/**
* Create a ghost object.
|
LazyLoading doesn't automatically mean an Entity is SelfAware
|
diff --git a/sbgn-converter/src/main/java/org/biopax/paxtools/io/sbgn/SBGNLayoutManager.java b/sbgn-converter/src/main/java/org/biopax/paxtools/io/sbgn/SBGNLayoutManager.java
index <HASH>..<HASH> 100644
--- a/sbgn-converter/src/main/java/org/biopax/paxtools/io/sbgn/SBGNLayoutManager.java
+++ b/sbgn-converter/src/main/java/org/biopax/paxtools/io/sbgn/SBGNLayoutManager.java
@@ -122,10 +122,10 @@ public class SBGNLayoutManager
graphMgr.updateBounds();
// Update the bounds
- /*for (VNode vNode: this.root.children)
+ for (VNode vNode: this.root.children)
{
updateCompoundBounds(vNode.glyph, vNode.glyph.getGlyph());
- }*/
+ }
// Clear inside of the compartmentGlyphs
for (Glyph compGlyph: idToCompartmentGlyphs.values())
|
Fix for width and height of compartment nodes.
|
diff --git a/colorise/__init__.py b/colorise/__init__.py
index <HASH>..<HASH> 100644
--- a/colorise/__init__.py
+++ b/colorise/__init__.py
@@ -23,9 +23,9 @@ import colorise.cluts
import colorise.parser
__author__ = 'Alexander Bock'
-__version__ = '0.1.4'
+__version__ = '1.0.0'
__license__ = 'MIT'
-__date__ = '2015-04-29' # YYYY-MM-DD
+__date__ = '2016-02-05' # YYYY-MM-DD
__all__ = ['set_color', 'cprint', 'fprint', 'formatcolor', 'formatbyindex',
'highlight']
|
Updated version number to reflect changes on this branch
|
diff --git a/src/Database/Expression/CaseExpression.php b/src/Database/Expression/CaseExpression.php
index <HASH>..<HASH> 100644
--- a/src/Database/Expression/CaseExpression.php
+++ b/src/Database/Expression/CaseExpression.php
@@ -24,7 +24,7 @@ use Closure;
/**
* This class represents a SQL Case statement
*
- * @deprecated 4.3.0 Use CaseStatementExpression instead or Query::case()
+ * @deprecated 4.3.0 Use QueryExpression::case() or CaseStatementExpression instead
*/
class CaseExpression implements ExpressionInterface
{
|
Fix QueryExpression::case suggestion in deprecated
|
diff --git a/src/Helpers/Mixed.php b/src/Helpers/Mixed.php
index <HASH>..<HASH> 100644
--- a/src/Helpers/Mixed.php
+++ b/src/Helpers/Mixed.php
@@ -38,10 +38,20 @@ class Mixed {
return call_user_func_array( [$entity, $method], $arguments );
}
- if ( is_string( $entity ) && class_exists( $entity ) ) {
+ if ( static::isClass( $entity ) ) {
return call_user_func_array( [new $entity(), $method], $arguments );
}
return $entity;
}
+
+ /**
+ * Check if a value is a valid class name
+ *
+ * @param mixed $class_name
+ * @return boolean
+ */
+ public static function isClass( $class_name ) {
+ return ( is_string( $class_name ) && class_exists( $class_name ) );
+ }
}
|
reduce complexity of Mixed::value()
|
diff --git a/src/sap.ui.fl/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js b/src/sap.ui.fl/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js
index <HASH>..<HASH> 100644
--- a/src/sap.ui.fl/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js
+++ b/src/sap.ui.fl/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js
@@ -176,6 +176,14 @@ sap.ui.define([
CompVariant.STANDARD_VARIANT_ID = "*standard*";
/**
+ * Returns the id of the variant object
+ * @returns {string} the id of the variant object.
+ */
+ CompVariant.prototype.getVariantId = function () {
+ return this.getId();
+ };
+
+ /**
* Checks whenever the variant can be renamed updating the entity or crating an <code>updateChange</code>.
*
* @param {sap.ui.fl.Layer} [sLayer] - Layer in which the edition may take place
|
[INTERNAL] sap.ui.fl: preparation change for fl restructuring
To be able to change the variant api calls in sapui5.runtime we
required to prepare this function first.
Change-Id: I0e<I>c1a6cf1b<I>f9d<I>d<I>f<I>d<I>d9
JIRA: TEAM<I>-<I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,17 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Thanks to Kenneth Reitz, I stole the template for this
+import os
try:
from setuptools import setup
except ImportError:
from distutils.core import setup
-required = []
+appdir = os.path.dirname(os.path.realpath(__file__))
+requirements = f"{appdir}/requirements.txt"
+# should I bother to remove testing requirements?
+required = [l.strip() for l in open(requirements) if not l.startswith("#")]
+
packages = ["limbo", "limbo.plugins"]
try:
@@ -17,7 +21,7 @@ except:
setup(
name="limbo",
- version="8.2.0",
+ version="8.2.1",
description="Simple and Clean Slack Chatbot",
long_description=longdesc,
author="Bill Mill",
|
Actually require requirements
I installed limbo on a new server, and realized that it didn't require all of its dependencies
closes #<I>
|
diff --git a/client/interfaces.go b/client/interfaces.go
index <HASH>..<HASH> 100644
--- a/client/interfaces.go
+++ b/client/interfaces.go
@@ -227,6 +227,7 @@ type InstanceServer interface {
DeleteNetwork(name string) (err error)
// Network ACL functions ("network_acl" API extension)
+ GetNetworkACLs() (acls []api.NetworkACL, err error)
CreateNetworkACL(acl api.NetworkACLsPost) (err error)
// Operation functions
|
client/interfaces: Adds GetNetworkACLs
|
diff --git a/lib/ronin/address.rb b/lib/ronin/address.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/address.rb
+++ b/lib/ronin/address.rb
@@ -34,7 +34,7 @@ module Ronin
property :id, Serial
# The class name of the Address
- property :type, Discriminator
+ property :type, Discriminator, :required => true
# The Address
property :address, String, :required => true,
|
Add a :required => true to Address.type, to match it's migration.
|
diff --git a/mock.py b/mock.py
index <HASH>..<HASH> 100644
--- a/mock.py
+++ b/mock.py
@@ -56,7 +56,7 @@ except ImportError:
return f
return inner
else:
- if sys.version_info[:2] >= (3, 3):
+ if sys.version_info[:2] >= (3, 2):
wraps = original_wraps
else:
def wraps(func):
|
Fix for wraps - __wrapped__ was added in <I> not <I>
|
diff --git a/lib/project_euler_cli/archive_viewer.rb b/lib/project_euler_cli/archive_viewer.rb
index <HASH>..<HASH> 100644
--- a/lib/project_euler_cli/archive_viewer.rb
+++ b/lib/project_euler_cli/archive_viewer.rb
@@ -14,7 +14,7 @@ class ArchiveViewer
puts
- Problem.total.downto(Problem.total - 9) { |i| puts "#{i} - #{@problems[i].title}" }
+ (Problem.total).downto(Problem.total - 9) { |i| puts "#{i} - #{@problems[i].title}" }
end
# Displays the problem numbers and titles for an individual page of the archive.
diff --git a/lib/project_euler_cli/page.rb b/lib/project_euler_cli/page.rb
index <HASH>..<HASH> 100644
--- a/lib/project_euler_cli/page.rb
+++ b/lib/project_euler_cli/page.rb
@@ -19,10 +19,6 @@ class Page
@@visited
end
- def self.visited=(visited)
- @@visited = visited
- end
-
end
end
|
Fix error introduced by removing parentheses in call to downto
|
diff --git a/samples/add_item.py b/samples/add_item.py
index <HASH>..<HASH> 100644
--- a/samples/add_item.py
+++ b/samples/add_item.py
@@ -82,9 +82,10 @@ def main():
itemParams.tags = "tags"
itemParams.snippet = "Test File"
itemParams.typeKeywords = "Data,Image,png"
- itemParams.filename = upload_file
+ #itemParams.filename = upload_file
item = userInfo.addItem(
itemParameters=itemParams,
+ filePath= upload_file,
overwrite=True,
relationshipType=None,
originItemId=None,
@@ -100,4 +101,4 @@ def main():
print "with error message: %s" % synerror
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
|
Update add_item.py
For adding an item of type "Image" or " Tile Package" (tested with those, but probably others) , a file path parameter is needed. ItemParameter fileName is not being used.
|
diff --git a/hollow/src/main/java/com/netflix/hollow/api/producer/HollowProducer.java b/hollow/src/main/java/com/netflix/hollow/api/producer/HollowProducer.java
index <HASH>..<HASH> 100644
--- a/hollow/src/main/java/com/netflix/hollow/api/producer/HollowProducer.java
+++ b/hollow/src/main/java/com/netflix/hollow/api/producer/HollowProducer.java
@@ -343,11 +343,11 @@ public class HollowProducer {
return new HollowObjectMapper(writeEngine);
}
- protected HollowWriteStateEngine getWriteEngine() {
+ public HollowWriteStateEngine getWriteEngine() {
return objectMapper.getStateEngine();
}
-
- protected HollowObjectMapper getObjectMapper() {
+
+ public HollowObjectMapper getObjectMapper() {
return objectMapper;
}
|
make HollowProducer's writeEngine and objectMapper methods public
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ for many purposes for example implement __hash__ for your complex object
very fast. freeze_stable and flatten are usable for testing and analysis.""",
keywords = "freeze state hash sort compare unittest",
url = "https://github.com/adfinis-sygroup/freeze",
- download_url = "https://github.com/adfinis-sygroup/freeze/archive/freeze-0.1.0.tar.gz",
+ #download_url = "https://github.com/adfinis-sygroup/freeze/archive/freeze-0.1.0.tar.gz",
#bugtrack_url = "https://github.com/adfinis-sygroup/freeze/issues",
classifiers = [
"Development Status :: 4 - Beta",
|
* removed download link since it freeze is hosted on pypi
|
diff --git a/lib/gravatarify/base.rb b/lib/gravatarify/base.rb
index <HASH>..<HASH> 100644
--- a/lib/gravatarify/base.rb
+++ b/lib/gravatarify/base.rb
@@ -48,7 +48,7 @@ module Gravatarify
# defined.
def subdomain(str); subdomains[str.hash % subdomains.size] || 'www' end
- # Helper method to escape string using either <tt>Rack::Utils#escape</tt> if available or else
+ # Helper method to URI escape a string using either <tt>Rack::Utils#escape</tt> if available or else
# fallback to <tt>CGI#escape</tt>.
def escape(str)
str = str.to_s unless str.is_a?(String) # convert to string!
@@ -97,7 +97,6 @@ module Gravatarify
# @return [String] In any case (even if supplied +email+ is +nil+) returns a fully qualified gravatar.com URL.
# The returned string is not yet HTML escaped, *but* all +url_options+ have been URI escaped.
def build_gravatar_url(email, url_options = {})
- # FIXME: add symbolize_keys again, maybe just write custom method, so we do not depend on ActiveSupport magic...
url_options = Gravatarify.options.merge(url_options)
email_hash = Digest::MD5.hexdigest(Base.get_smart_email_from(email).strip.downcase)
extension = (ext = url_options.delete(:filetype) and ext != '') ? ".#{ext || 'jpg'}" : ''
|
removed FIXME and added more descriptive rdoc
|
diff --git a/pkg/policy/identifier.go b/pkg/policy/identifier.go
index <HASH>..<HASH> 100644
--- a/pkg/policy/identifier.go
+++ b/pkg/policy/identifier.go
@@ -67,8 +67,8 @@ func NewEndpointSet(capacity int) *EndpointSet {
// signals to the provided WaitGroup when epFunc has been executed for each
// endpoint.
func (e *EndpointSet) ForEach(wg *sync.WaitGroup, epFunc func(epp Endpoint)) {
- e.mutex.Lock()
- defer e.mutex.Unlock()
+ e.mutex.RLock()
+ defer e.mutex.RUnlock()
wg.Add(len(e.endpoints))
|
pkg/policy: use Read mutex instead of Write mutex
The shared region the mutex is protecting is not being modified so there
is no point in having a Lock instead of a RLock
|
diff --git a/WeaveAPI/src/weave/api/WeavePath.js b/WeaveAPI/src/weave/api/WeavePath.js
index <HASH>..<HASH> 100644
--- a/WeaveAPI/src/weave/api/WeavePath.js
+++ b/WeaveAPI/src/weave/api/WeavePath.js
@@ -76,7 +76,7 @@ function WeavePath(args)
// private variables
var stack = []; // stack of argument counts from push() calls, used with pop()
var reconstructArgs = false; // if true, JSON.parse(JSON.stringify(...)) will be used on all parameters
- var path = A(args, 1)[0] || [];
+ var path = A(args, 1);
/**
* Private function for internal use.
|
fixed bug that was created in recent commit
|
diff --git a/lib/aws/version.rb b/lib/aws/version.rb
index <HASH>..<HASH> 100644
--- a/lib/aws/version.rb
+++ b/lib/aws/version.rb
@@ -1,3 +1,3 @@
module Aws
- VERSION = '2.0.0.rc8'
+ VERSION = '2.0.0.rc9'
end
|
Tag release <I>.rc9
References:
#<I>, #<I>, #<I>, #<I>, #<I>, aws/aws-sdk-ruby#<I>,
aws/aws-sdk-ruby#<I>
|
diff --git a/great_expectations/cli/datasource.py b/great_expectations/cli/datasource.py
index <HASH>..<HASH> 100644
--- a/great_expectations/cli/datasource.py
+++ b/great_expectations/cli/datasource.py
@@ -155,7 +155,12 @@ You can add a datasource later by editing the great_expectations.yml file.
data_source_name = click.prompt(
msg_prompt_datasource_name, default=default_data_source_name, show_default=True)
- context.add_datasource(data_source_name, "spark", base_directory=path)
+ context.add_datasource(data_source_name,
+ module_name="great_expectations.datasource",
+ class_name="SparkDFDatasource",
+ base_directory=path) # NOTE: Eugene: 2019-09-17: review the path and make sure that the logic works both for abs and rel.
+ # base_directory=os.path.join("..", path))
+
# if data_source_selection == "5": # dbt
# dbt_profile = click.prompt(msg_prompt_dbt_choose_profile)
|
Converted the logic of creating a SparkDF datasource in the CLI to use the new (module/class) convention
|
diff --git a/tests/Client/ApcuClientTest.php b/tests/Client/ApcuClientTest.php
index <HASH>..<HASH> 100644
--- a/tests/Client/ApcuClientTest.php
+++ b/tests/Client/ApcuClientTest.php
@@ -9,6 +9,10 @@ class ApcuClientTest extends TestCase
{
public function testInstantiation(): void
{
+ $enabled = ini_get('apc.enable_cli');
+ $this->assertSame('1', $enabled, 'Forgot to enable apc.enable_cli flag');
+
+ apcu_clear_cache();
$key = 'pid-' . getmypid();
$client = new ApcuClient();
$this->assertInstanceOf(ApcuClient::class, $client);
|
Update ApcuClientTest to check for apc.enable_cli=1 and clear the cache
|
diff --git a/classes/phing/util/FileUtils.php b/classes/phing/util/FileUtils.php
index <HASH>..<HASH> 100644
--- a/classes/phing/util/FileUtils.php
+++ b/classes/phing/util/FileUtils.php
@@ -99,6 +99,9 @@ class FileUtils {
$in->close();
if ( $out !== null )
$out->close();
+
+ $destFile->setMode($sourceFile->getMode());
+
} else {
// simple copy (no filtering)
$sourceFile->copyTo($destFile);
|
Refs #<I> - preserve file mode (patch by Merkas)
|
diff --git a/javascript/safari-driver/inject/page.js b/javascript/safari-driver/inject/page.js
index <HASH>..<HASH> 100644
--- a/javascript/safari-driver/inject/page.js
+++ b/javascript/safari-driver/inject/page.js
@@ -78,9 +78,18 @@ safaridriver.inject.page.init = function() {
safaridriver.inject.page.LOG_.info('Sending ' + message);
message.send(window);
- window.alert = safaridriver.inject.page.wrappedAlert_;
- window.confirm = safaridriver.inject.page.wrappedConfirm_;
- window.prompt = safaridriver.inject.page.wrappedPrompt_;
+ wrapDialogFunction('alert', safaridriver.inject.page.wrappedAlert_);
+ wrapDialogFunction('confirm', safaridriver.inject.page.wrappedConfirm_);
+ wrapDialogFunction('prompt', safaridriver.inject.page.wrappedPrompt_);
+
+ function wrapDialogFunction(name, newFn) {
+ var oldFn = window[name];
+ window[name] = newFn;
+ window.constructor.prototype[name] = newFn;
+ window[name].toString = function() {
+ return oldFn.toString();
+ };
+ }
};
goog.exportSymbol('init', safaridriver.inject.page.init);
|
JasonLeyba: The SafariDriver should try to hide the fact that it overrides window.{alert,confirm,prompt}.
r<I>
|
diff --git a/src/helpers/default-config.js b/src/helpers/default-config.js
index <HASH>..<HASH> 100644
--- a/src/helpers/default-config.js
+++ b/src/helpers/default-config.js
@@ -26,5 +26,5 @@ module.exports = {
rps: true,
statusCodes: true,
},
- ignoreStartsWith: '',
+ ignoreStartsWith: '/admin',
};
|
Set ignoreStartsWith to /admin
Set ignoreStartsWith to /admin to align with README. ignoreStartsWith set to empty string effectively ignored all routes.
|
diff --git a/src/django_like/__init__.py b/src/django_like/__init__.py
index <HASH>..<HASH> 100644
--- a/src/django_like/__init__.py
+++ b/src/django_like/__init__.py
@@ -11,7 +11,7 @@ connection.operators['ilike'] = connection.operators['icontains']
def get_prep_lookup(self, lookup_type, value):
try:
- self.get_prep_lookup_origin(lookup_type, value)
+ return self.get_prep_lookup_origin(lookup_type, value)
except TypeError, e:
if lookup_type in ('like', 'ilike'):
return value
|
A forgot a return :-)
|
diff --git a/src/Naderman/Composer/AWS/AwsClient.php b/src/Naderman/Composer/AWS/AwsClient.php
index <HASH>..<HASH> 100644
--- a/src/Naderman/Composer/AWS/AwsClient.php
+++ b/src/Naderman/Composer/AWS/AwsClient.php
@@ -206,7 +206,12 @@ class AwsClient
}
if (!function_exists('AWS\manifest')) {
- require_once __DIR__ . '/../../../../../../aws/aws-sdk-php/src/functions.php';
+ // This file has to be loaded with the exact same name as in the composer static autoloader to avoid
+ // including it twice, which leads to functions in the AWS Namespace to be declared twice.
+ $static_include_path = __DIR__ . '/../../../../../../composer/autoload_static.php';
+ $static_include_path = realpath($static_include_path);
+ $static_include_path = dirname($static_include_path);
+ require_once $static_include_path . '/../aws/aws-sdk-php/src/functions.php';
}
if (!function_exists('GuzzleHttp\Psr7\uri_for')) {
|
Changed AWS require behaviour to mimic composer autoload_static which stops the file from being included twice
|
diff --git a/jawr/jawr-core/src/main/java/net/jawr/web/resource/bundle/factory/PropertiesBasedBundlesHandlerFactory.java b/jawr/jawr-core/src/main/java/net/jawr/web/resource/bundle/factory/PropertiesBasedBundlesHandlerFactory.java
index <HASH>..<HASH> 100644
--- a/jawr/jawr-core/src/main/java/net/jawr/web/resource/bundle/factory/PropertiesBasedBundlesHandlerFactory.java
+++ b/jawr/jawr-core/src/main/java/net/jawr/web/resource/bundle/factory/PropertiesBasedBundlesHandlerFactory.java
@@ -301,7 +301,7 @@ public class PropertiesBasedBundlesHandlerFactory {
StringTokenizer tk = new StringTokenizer(childBundlesProperty, JawrConstant.COMMA_SEPARATOR);
while (tk.hasMoreTokens()) {
ResourceBundleDefinition childDef = buildCustomBundleDefinition(tk.nextToken().trim(), true);
- childDef.setBundleId(bundleId);
+ childDef.setBundleId(props.getCustomBundleProperty(childDef.getBundleName(), BUNDLE_FACTORY_CUSTOM_ID));
if (StringUtils.isEmpty(childDef.getDebugURL())) {
children.add(childDef);
} else {
|
Fix issues with child bundles being included instead of parent bundle because parent bundleId was being used.
|
diff --git a/cloudconfig/containerinit/container_userdata_test.go b/cloudconfig/containerinit/container_userdata_test.go
index <HASH>..<HASH> 100644
--- a/cloudconfig/containerinit/container_userdata_test.go
+++ b/cloudconfig/containerinit/container_userdata_test.go
@@ -133,6 +133,8 @@ bootcmd:
- |-
printf '%s\n' '` + indentedNetConfig + `
' > '` + s.networkInterfacesFile + `'
+runcmd:
+- ifup -a || true
`
assertUserData(c, cloudConf, expected)
}
|
cloudconfig/containerinit: Fixed userdata tests to include ifup -a || true
|
diff --git a/core/client/views/blog.js b/core/client/views/blog.js
index <HASH>..<HASH> 100644
--- a/core/client/views/blog.js
+++ b/core/client/views/blog.js
@@ -35,6 +35,7 @@
initialize: function (options) {
this.$('.content-list-content').scrollClass({target: '.content-list', offset: 10});
this.listenTo(this.collection, 'remove', this.showNext);
+ this.listenTo(this.collection, 'add', this.renderPost);
// Can't use backbone event bind (see: http://stackoverflow.com/questions/13480843/backbone-scroll-event-not-firing)
this.$('.content-list-content').scroll($.proxy(this.checkScroll, this));
},
@@ -102,9 +103,18 @@
});
},
+ renderPost: function (model) {
+ this.$('ol').append(this.addSubview(new ContentItem({model: model})).render().el);
+ },
+
render: function () {
+ var $list = this.$('ol');
+
+ // Clear out any pre-existing subviews.
+ this.removeSubviews();
+
this.collection.each(function (model) {
- this.$('ol').append(this.addSubview(new ContentItem({model: model})).render().el);
+ $list.append(this.addSubview(new ContentItem({model: model})).render().el);
}, this);
this.showNext();
}
|
Fix duplication of entries in infinite scroll
Fixes #<I>
- Switched to render each new item as its added to the collection when
retrieving via scroll checks.
- Added check to remove all subviews whenever `render` is called on
`ContentList` as a preventative measure.
- Cached the jquery reference to the ordered list in `render`.
|
diff --git a/generators/app/templates/tasks/karma.js b/generators/app/templates/tasks/karma.js
index <HASH>..<HASH> 100644
--- a/generators/app/templates/tasks/karma.js
+++ b/generators/app/templates/tasks/karma.js
@@ -23,9 +23,15 @@ module.exports = {
autoWatch: false,
// List of browsers to execute tests on
- browsers: [
- 'PhantomJS'
- ],
+ browsers: ['ChromeHeadlessCI'],
+
+ // Configure custom ChromHeadlessCI as an extension of ChromeHeadlessCI without sandbox
+ customLaunchers: {
+ ChromeHeadlessCI: {
+ base: 'ChromeHeadless',
+ flags: ['--no-sandbox']
+ }
+ },
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
|
plugin: execute client tests on headless Chrome
|
diff --git a/tasks/blanket_mocha.js b/tasks/blanket_mocha.js
index <HASH>..<HASH> 100644
--- a/tasks/blanket_mocha.js
+++ b/tasks/blanket_mocha.js
@@ -24,14 +24,7 @@ var helpers = require('../support/mocha-helpers');
module.exports = function(grunt) {
- var ok = true;
- var status, coverageThreshold, modulePattern, modulePatternRegex, excludedFiles, customThreshold, customModuleThreshold;
- var totals = {
- totalLines: 0,
- coveredLines: 0,
- moduleTotalStatements : {},
- moduleTotalCoveredStatements : {}
- };
+ var ok, totals, status, coverageThreshold, modulePattern, modulePatternRegex, excludedFiles, customThreshold, customModuleThreshold;
// External lib.
var phantomjs = require('grunt-lib-phantomjs').init(grunt);
@@ -220,6 +213,14 @@ module.exports = function(grunt) {
logErrors: false
});
+ ok = true;
+ totals = {
+ totalLines: 0,
+ coveredLines: 0,
+ moduleTotalStatements : {},
+ moduleTotalCoveredStatements : {}
+ };
+
status = {blanketTotal: 0, blanketPass: 0, blanketFail: 0};
coverageThreshold = grunt.option('threshold') || options.threshold;
|
Allow coverage to be run multiple times cleanly
Currently if this is run as a part of a watch task, the statement count will
carry over from the previous run which will throw off the coverage
percentage over time. The same applies to the ok status.
This will define both status and totals on a per run basis so each run is
clean, whether the task is run on watch or manually from the command line.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.