diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/scripts/release/mirror.js b/scripts/release/mirror.js
index <HASH>..<HASH> 100644
--- a/scripts/release/mirror.js
+++ b/scripts/release/mirror.js
@@ -366,12 +366,20 @@ const mirrorSupport = (destination, data) => {
);
}
- if (data[upstream] == 'mirror') {
+ let upstreamData = data[upstream];
+
+ if (!upstreamData) {
+ throw new Error(
+ `The data for ${upstream} is not defined for mirroring to ${destination}, cannot mirror!`,
+ );
+ }
+
+ if (upstreamData === 'mirror') {
// Perform mirroring upstream if needed
- data[upstream] = mirrorSupport(upstream, data);
+ upstreamData = mirrorSupport(upstream, data);
}
- return bumpSupport(data[upstream], destination);
+ return bumpSupport(upstreamData, destination);
};
export default mirrorSupport;
|
Don't alter data when performing upstream mirroring (#<I>)
|
diff --git a/builtin/providers/aws/resource_aws_route53_zone_association.go b/builtin/providers/aws/resource_aws_route53_zone_association.go
index <HASH>..<HASH> 100644
--- a/builtin/providers/aws/resource_aws_route53_zone_association.go
+++ b/builtin/providers/aws/resource_aws_route53_zone_association.go
@@ -59,7 +59,7 @@ func resourceAwsRoute53ZoneAssociationCreate(d *schema.ResourceData, meta interf
}
// Store association id
- association_id := *resp.ChangeInfo.ID
+ association_id := cleanChangeID(*resp.ChangeInfo.ID)
d.Set("association_id", association_id)
d.SetId(association_id)
|
keep clean changeinfo as res id
|
diff --git a/src/cr/cube/cube.py b/src/cr/cube/cube.py
index <HASH>..<HASH> 100644
--- a/src/cr/cube/cube.py
+++ b/src/cr/cube/cube.py
@@ -1081,13 +1081,6 @@ class _WeightedValidCountsMeasure(_BaseMeasure):
"""Weighted Valid counts for cube."""
@lazyproperty
- def missing_count(self):
- """numeric representing count of missing rows reflected in response."""
- return self._cube_dict["result"]["measures"]["valid_count_weighted"].get(
- "n_missing", 0
- )
-
- @lazyproperty
def _flat_values(self):
"""Optional 1D np.ndarray of np.float64 weighted valid counts."""
valid_counts = (
|
[#<I>]: remove missing counts from weighted valid count measure in cube
|
diff --git a/lib/Yucca/Component/Selector/Source/Database.php b/lib/Yucca/Component/Selector/Source/Database.php
index <HASH>..<HASH> 100644
--- a/lib/Yucca/Component/Selector/Source/Database.php
+++ b/lib/Yucca/Component/Selector/Source/Database.php
@@ -74,6 +74,9 @@ class Database implements SelectorSourceInterface{
$result = $this->schemaManager->fetchIds($options[SelectorSourceInterface::TABLE], $criterias, $fields, $options[SelectorSourceInterface::FORCE_FROM_MASTER], $options);
if (self::RESULT_COUNT === $options[SelectorSourceInterface::RESULT]) {
+ if(false === is_array($result) || false === is_array(current($result))) {
+ return 0;
+ }
return current(current($result));
} else {
return $result;
|
[COUNT] Fix bug when counting on a request with group_by
|
diff --git a/coconut/icoconut/root.py b/coconut/icoconut/root.py
index <HASH>..<HASH> 100644
--- a/coconut/icoconut/root.py
+++ b/coconut/icoconut/root.py
@@ -37,6 +37,7 @@ class kernel(Kernel):
language_version = VERSION
banner = "Coconut:"
language_info = {
+ "name": "coconut",
"mimetype": "text/x-python",
"file_extension": ".coc",
"codemirror_mode": "python",
|
Adds a name field to language_info
|
diff --git a/specs-go/config.go b/specs-go/config.go
index <HASH>..<HASH> 100644
--- a/specs-go/config.go
+++ b/specs-go/config.go
@@ -34,7 +34,7 @@ type Process struct {
// Terminal creates an interactive terminal for the container.
Terminal bool `json:"terminal,omitempty"`
// ConsoleSize specifies the size of the console.
- ConsoleSize Box `json:"consoleSize,omitempty"`
+ ConsoleSize *Box `json:"consoleSize,omitempty"`
// User specifies user information for the process.
User User `json:"user"`
// Args specifies the binary and arguments for the application to execute.
|
specs-go/config: Use a pointer for Process.ConsoleSize
Avoid injecting:
"consoleSize":{"height":0,"width":0}
when serializing with Go's stock JSON serializer. Using a pointer for
this optional struct property works around [1].
[1]: <URL>
|
diff --git a/worker/instancemutater/worker.go b/worker/instancemutater/worker.go
index <HASH>..<HASH> 100644
--- a/worker/instancemutater/worker.go
+++ b/worker/instancemutater/worker.go
@@ -153,13 +153,11 @@ func newWorker(config Config) (*mutaterWorker, error) {
err = catacomb.Invoke(catacomb.Plan{
Site: &w.catacomb,
Work: w.loop,
+ Init: []worker.Worker{watcher},
})
if err != nil {
return nil, errors.Trace(err)
}
- if err := w.catacomb.Add(watcher); err != nil {
- return nil, errors.Trace(err)
- }
return w, nil
}
|
Fix race in catacomb registraion.
|
diff --git a/slickqa/slickqa.py b/slickqa/slickqa.py
index <HASH>..<HASH> 100644
--- a/slickqa/slickqa.py
+++ b/slickqa/slickqa.py
@@ -25,6 +25,7 @@ def update_result(self):
self.connection.results(self).update()
def update_testrun(self):
+ del self.summary
self.connection.testruns(self).update()
def add_file_to_result(self, filename, fileobj=None):
|
making sure that the summary never get's updated unintentionally
|
diff --git a/corelib/time.rb b/corelib/time.rb
index <HASH>..<HASH> 100644
--- a/corelib/time.rb
+++ b/corelib/time.rb
@@ -129,10 +129,6 @@ class Time
`new Date()`
end
- def self.parse(str)
- `Date.parse(str)`
- end
-
def +(other)
if Time === other
raise TypeError, "time + time?"
@@ -517,3 +513,14 @@ class Time
self
end
end
+
+# FIXME: move this to stdlib when the corelib has its own path
+class Time
+ def self.parse(str)
+ `new Date(Date.parse(str))`
+ end
+
+ def iso8601
+ strftime('%FT%T%z')
+ end
+end
|
Move Date.parse to the stdlib section and make it compliant
|
diff --git a/test/e2e/node/runtimeclass.go b/test/e2e/node/runtimeclass.go
index <HASH>..<HASH> 100644
--- a/test/e2e/node/runtimeclass.go
+++ b/test/e2e/node/runtimeclass.go
@@ -58,7 +58,7 @@ var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
gomega.Expect(apierrs.IsForbidden(err)).To(gomega.BeTrue(), "should be forbidden error")
})
- ginkgo.It("should run a Pod requesting a RuntimeClass with scheduling [NodeFeature:RuntimeHandler] ", func() {
+ ginkgo.It("should run a Pod requesting a RuntimeClass with scheduling [NodeFeature:RuntimeHandler] [Disruptive] ", func() {
nodeName := scheduling.GetNodeThatCanRunPod(f)
nodeSelector := map[string]string{
"foo": "bar",
|
tag test that taints a node as disruptive
|
diff --git a/util/svg-sprite.js b/util/svg-sprite.js
index <HASH>..<HASH> 100644
--- a/util/svg-sprite.js
+++ b/util/svg-sprite.js
@@ -3,7 +3,7 @@
// See https://github.com/kisenka/svg-sprite-loader/issues/200 for an issue that
// may lead to a cleaner way of customising this.
-import BrowserSprite from 'svg-baker-runtime/src/browser-sprite';
+import BrowserSprite from 'svg-baker-runtime/browser-sprite';
import domready from 'domready';
const spriteNodeId = '__SVG_SPRITE_NODE__';
|
Import dist version of svg-baker-runtime/browser-sprite
src version needed transpiling and therefore broke at build time.
|
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java
index <HASH>..<HASH> 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java
@@ -149,7 +149,6 @@ public final class CpeMemoryIndex {
*
* @return the CPE Analyzer.
*/
- @SuppressWarnings("unchecked")
private Analyzer createIndexingAnalyzer() {
final Map<String, Analyzer> fieldAnalyzers = new HashMap<String, Analyzer>();
fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
@@ -161,7 +160,6 @@ public final class CpeMemoryIndex {
*
* @return the CPE Analyzer.
*/
- @SuppressWarnings("unchecked")
private Analyzer createSearchingAnalyzer() {
final Map<String, Analyzer> fieldAnalyzers = new HashMap<String, Analyzer>();
fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
|
Removed unnecessary @SuppressWarnings.
|
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
index <HASH>..<HASH> 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
@@ -529,8 +529,9 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
}
// Ensure connection group is always released if child acquire fails
- finally {
+ catch (GuacamoleException e) {
release(user, connectionGroup);
+ throw e;
}
// Connect to acquired child
|
GUAC-<I>: Don't "ALWAYS" release connection groups ... they only need to be released when acquire fails.
|
diff --git a/lib/decompress-zip.js b/lib/decompress-zip.js
index <HASH>..<HASH> 100644
--- a/lib/decompress-zip.js
+++ b/lib/decompress-zip.js
@@ -5,7 +5,7 @@
// assertions everywhere to make sure that we are not dealing with a ZIP type
// that I haven't designed for. Things like spanning archives, non-DEFLATE
// compression, encryption, etc.
-var fs = require('fs');
+var fs = require('graceful-fs');
var Q = require('q');
var path = require('path');
var util = require('util');
diff --git a/lib/extractors.js b/lib/extractors.js
index <HASH>..<HASH> 100644
--- a/lib/extractors.js
+++ b/lib/extractors.js
@@ -2,7 +2,7 @@ var stream = require('stream');
if (!stream.Readable) {
var stream = require('readable-stream');
}
-var fs = require('fs');
+var fs = require('graceful-fs');
var Q = require('q');
var path = require('path');
var zlib = require('zlib');
diff --git a/package.json b/package.json
index <HASH>..<HASH> 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
"binary": "~0.3.0",
"touch": "0.0.2",
"readable-stream": "~1.1.8",
- "nopt": "~2.2.0"
+ "nopt": "~2.2.0",
+ "graceful-fs": "~2.0.3"
}
}
|
Switched to graceful-fs to avoid EMFILE errors
|
diff --git a/lib/lanes/api/sprockets_extension.rb b/lib/lanes/api/sprockets_extension.rb
index <HASH>..<HASH> 100644
--- a/lib/lanes/api/sprockets_extension.rb
+++ b/lib/lanes/api/sprockets_extension.rb
@@ -2,6 +2,7 @@ require 'sprockets'
require 'sass'
require 'sinatra/sprockets-helpers'
require_relative 'javascript_processor'
+require 'compass/import-once/activate'
module Lanes
module API
@@ -14,11 +15,11 @@ module Lanes
env.cache = ::Sprockets::Cache::FileStore.new(Pathname.pwd.join('tmp','cache'))
end
end
- env.append_path root.join('client')
- JsAssetCompiler.register(env)
Lanes::Extensions.each do | ext |
ext.client_paths.each{ |path| env.append_path(path) }
end
+ env.append_path root.join('client')
+ JsAssetCompiler.register(env)
end
def self.registered(app)
|
Add extensions to sprockets before base
|
diff --git a/google-cloud-spanner/acceptance/spanner/client/single_use_test.rb b/google-cloud-spanner/acceptance/spanner/client/single_use_test.rb
index <HASH>..<HASH> 100644
--- a/google-cloud-spanner/acceptance/spanner/client/single_use_test.rb
+++ b/google-cloud-spanner/acceptance/spanner/client/single_use_test.rb
@@ -65,7 +65,7 @@ describe "Spanner Client", :single_use, :spanner do
end
results.timestamp.wont_be :nil?
- results.timestamp.must_be_close_to timestamp
+ results.timestamp.must_be_close_to timestamp, 1
end
it "runs a read with timestamp option" do
@@ -79,7 +79,7 @@ describe "Spanner Client", :single_use, :spanner do
end
results.timestamp.wont_be :nil?
- results.timestamp.must_be_close_to timestamp
+ results.timestamp.must_be_close_to timestamp, 1
end
it "runs a query with staleness option" do
|
Loosen single-use timestamp asserts, again
|
diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Strings.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Strings.java
index <HASH>..<HASH> 100644
--- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Strings.java
+++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/Strings.java
@@ -23,10 +23,6 @@ public class Strings {
public static final String[] EMPTY_ARRAY = new String[0];
- /**
- * @deprecated will be moved to JUnit utilities.
- */
- @Deprecated
public static boolean equalsIgnoreWhitespace(String left, String right) {
String l = left == null ? "" : left.replaceAll("\\s", "");
String r = right == null ? "" : right.replaceAll("\\s", "");
|
[util] removed 'planned' deprecation.
|
diff --git a/mod/assign/renderable.php b/mod/assign/renderable.php
index <HASH>..<HASH> 100644
--- a/mod/assign/renderable.php
+++ b/mod/assign/renderable.php
@@ -788,7 +788,7 @@ class assign_files implements renderable {
if (!empty($CFG->enableportfolios)) {
require_once($CFG->libdir . '/portfoliolib.php');
- if (count($files) >= 1 &&
+ if (count($files) >= 1 && !empty($sid) &&
has_capability('mod/assign:exportownsubmission', $this->context)) {
$button = new portfolio_add_button();
$callbackparams = array('cmid' => $this->cm->id,
@@ -823,6 +823,7 @@ class assign_files implements renderable {
foreach ($dir['files'] as $file) {
$file->portfoliobutton = '';
if (!empty($CFG->enableportfolios)) {
+ require_once($CFG->libdir . '/portfoliolib.php');
$button = new portfolio_add_button();
if (has_capability('mod/assign:exportownsubmission', $this->context)) {
$portfolioparams = array('cmid' => $this->cm->id, 'fileid' => $file->get_id());
|
MDL-<I> assign: can't export to portfolio on non-submission
|
diff --git a/dev/com.ibm.ws.kernel.feature_fat/fat/src/com/ibm/ws/kernel/feature/fat/ActivationTypeTest.java b/dev/com.ibm.ws.kernel.feature_fat/fat/src/com/ibm/ws/kernel/feature/fat/ActivationTypeTest.java
index <HASH>..<HASH> 100644
--- a/dev/com.ibm.ws.kernel.feature_fat/fat/src/com/ibm/ws/kernel/feature/fat/ActivationTypeTest.java
+++ b/dev/com.ibm.ws.kernel.feature_fat/fat/src/com/ibm/ws/kernel/feature/fat/ActivationTypeTest.java
@@ -40,6 +40,9 @@ public class ActivationTypeTest {
// Note that usr/product features are never parallel activated
server.setMarkToEndOfLog();
+ // Our new server.xml is the same size as the old one, so wait a couple seconds to make
+ // sure the config runtime will recognize the change.
+ Thread.sleep(2000);
server.changeFeatures(Arrays.asList("usr:test.activation.parallel.user-1.0"));
server.waitForConfigUpdateInLogUsingMark(Collections.<String> emptySet());
server.waitForStringInLogUsingMark("test.activation.type.parallel.user: false");
|
Add small wait to make sure server.xml change is recognized
|
diff --git a/src/helpers/ImgixHelpers.php b/src/helpers/ImgixHelpers.php
index <HASH>..<HASH> 100644
--- a/src/helpers/ImgixHelpers.php
+++ b/src/helpers/ImgixHelpers.php
@@ -42,7 +42,7 @@ class ImgixHelpers
}
if (($config->useCloudSourcePath === true) && isset($volume->subfolder) && \get_class($volume) !== 'craft\volumes\Local') {
- $path = implode('/', [$volume->subfolder, $image->getPath()]);
+ $path = implode('/', [\Craft::parseEnv($volume->subfolder), $image->getPath()]);
} else {
$path = $image->getPath();
}
|
Adds environment parsing to volume subfolder setting.
|
diff --git a/spec/DigitalOceanV2/Adapter/BuzzAdapterSpec.php b/spec/DigitalOceanV2/Adapter/BuzzAdapterSpec.php
index <HASH>..<HASH> 100644
--- a/spec/DigitalOceanV2/Adapter/BuzzAdapterSpec.php
+++ b/spec/DigitalOceanV2/Adapter/BuzzAdapterSpec.php
@@ -3,16 +3,17 @@
namespace spec\DigitalOceanV2\Adapter;
use Buzz\Browser;
+use Buzz\Listener\ListenerInterface;
use Buzz\Message\Response;
use DigitalOceanV2\Adapter\BuzzOAuthListener;
class BuzzAdapterSpec extends \PhpSpec\ObjectBehavior
{
- function let(Browser $browser, Response $response)
+ function let(Browser $browser, Response $response, ListenerInterface $listener)
{
- $browser->addListener(new BuzzOAuthListener('my_access_token'))->shouldBeCalled();
+ $browser->addListener($listener)->shouldBeCalled();
- $this->beConstructedWith('my_access_token', $browser);
+ $this->beConstructedWith('my_access_token', $browser, $listener);
}
function it_is_initializable()
|
fix buzz adapter spec which can use custom listener
|
diff --git a/plugins/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/conversion/XbaseValueConverterService.java b/plugins/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/conversion/XbaseValueConverterService.java
index <HASH>..<HASH> 100644
--- a/plugins/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/conversion/XbaseValueConverterService.java
+++ b/plugins/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/conversion/XbaseValueConverterService.java
@@ -37,6 +37,11 @@ public class XbaseValueConverterService extends DefaultTerminalConverters {
@Inject
private Provider<KeywordBasedValueConverter> keywordBasedConverterProvider;
+ @ValueConverter(rule = "IdOrSuper")
+ public IValueConverter<String> getIdOrSuperValueConverter() {
+ return ID();
+ }
+
@ValueConverter(rule = "QualifiedName")
public IValueConverter<String> getQualifiedNameValueConverter() {
return qualifiedNameValueConverter;
|
[Xbase] registered ID value converter for IdOrSuper rule
|
diff --git a/zipline/test_algorithms.py b/zipline/test_algorithms.py
index <HASH>..<HASH> 100644
--- a/zipline/test_algorithms.py
+++ b/zipline/test_algorithms.py
@@ -299,7 +299,7 @@ class BatchTransformAlgorithm(TradingAlgorithm):
fillna=False
)
- self.return_nan = ReturnPriceBatchTransform(
+ self.return_nan = return_price_batch_decorator(
refresh_period=self.refresh_period,
window_length=self.window_length,
fillna=True
|
BUG: Can not test for length when dropping nans.
|
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/CencEncryptingTrackImpl.java b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/CencEncryptingTrackImpl.java
index <HASH>..<HASH> 100644
--- a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/CencEncryptingTrackImpl.java
+++ b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/CencEncryptingTrackImpl.java
@@ -49,7 +49,7 @@ public class CencEncryptingTrackImpl implements CencEncyprtedTrack {
List<Sample> origSamples = source.getSamples();
if (cencSampleAuxiliaryData == null) {
- this.cencSampleAuxiliaryData = cencSampleAuxiliaryData = new LinkedList<CencSampleAuxiliaryDataFormat>();
+ this.cencSampleAuxiliaryData = cencSampleAuxiliaryData = new ArrayList<CencSampleAuxiliaryDataFormat>();
BigInteger one = new BigInteger("1");
byte[] init = new byte[]{};
|
removed linkedlist in favor of arraylist
|
diff --git a/lxd/storage/drivers/driver_zfs_volumes.go b/lxd/storage/drivers/driver_zfs_volumes.go
index <HASH>..<HASH> 100644
--- a/lxd/storage/drivers/driver_zfs_volumes.go
+++ b/lxd/storage/drivers/driver_zfs_volumes.go
@@ -940,7 +940,8 @@ func (d *zfs) SetVolumeQuota(vol Volume, size string, op *operations.Operation)
// Block image volumes cannot be resized because they have a readonly snapshot that doesn't get
// updated when the volume's size is changed, and this is what instances are created from.
- if vol.volType == VolumeTypeImage {
+ // During initial volume fill allowUnsafeResize is enabled because snapshot hasn't been taken yet.
+ if !vol.allowUnsafeResize && vol.volType == VolumeTypeImage {
return ErrNotSupported
}
|
lxd/storage/drivers/driver/zfs/volume: Allow image resize when in unsafe mode in SetVolumeQuota
|
diff --git a/test/test-yaml.rb b/test/test-yaml.rb
index <HASH>..<HASH> 100644
--- a/test/test-yaml.rb
+++ b/test/test-yaml.rb
@@ -1,3 +1,4 @@
+require 'yaml'
require_relative '../lib/grayskull/formats/yaml_handler'
require_relative '../lib/grayskull/formats'
require_relative '../lib/grayskull/validator'
@@ -5,7 +6,7 @@ require_relative '../lib/grayskull/validator'
path = File.expand_path(File.join(File.dirname(__FILE__), "yaml/file.yml"))
schema = File.expand_path(File.join(File.dirname(__FILE__), "yaml/schema.yml"))
+yaml = YAML.load(path)
+validator = Grayskull::Validator.new(yaml,schema)
-validator = Grayskull::Validator.new(path,schema)
-
-validator.validate
+puts validator.validate
|
Added test for passing preloaded data
|
diff --git a/go/kbfs/libkbfs/folder_branch_ops.go b/go/kbfs/libkbfs/folder_branch_ops.go
index <HASH>..<HASH> 100644
--- a/go/kbfs/libkbfs/folder_branch_ops.go
+++ b/go/kbfs/libkbfs/folder_branch_ops.go
@@ -741,7 +741,7 @@ func (fbo *folderBranchOps) clearConflictView(ctx context.Context) (
fbo.log.CDebugf(ctx, "Clearing conflict view")
defer func() {
- fbo.log.CDebugf(ctx, "Done with clearConflictView: %+v", err)
+ fbo.deferLog.CDebugf(ctx, "Done with clearConflictView: %+v", err)
}()
lState := makeFBOLockState()
@@ -8327,7 +8327,8 @@ func (fbo *folderBranchOps) MigrateToImplicitTeam(
fbo.log.CDebugf(ctx, "Starting migration of TLF %s", id)
defer func() {
- fbo.log.CDebugf(ctx, "Finished migration of TLF %s, err=%+v", id, err)
+ fbo.deferLog.CDebugf(
+ ctx, "Finished migration of TLF %s, err=%+v", id, err)
}()
if id.Type() != tlf.Private && id.Type() != tlf.Public {
|
folder_branch_ops: use `deferLog` in deferred logs
To get better line number reporting in the logs.
|
diff --git a/src/math/matrix2.js b/src/math/matrix2.js
index <HASH>..<HASH> 100644
--- a/src/math/matrix2.js
+++ b/src/math/matrix2.js
@@ -20,13 +20,13 @@
/** @scope me.Matrix2d.prototype */ {
/** @ignore */
- init : function (a, b, c, d, e, f, g, h, i) {
+ init : function () {
this.val = new Float32Array(9);
- if (a instanceof me.Matrix2d) {
- this.copy(a);
+ if (arguments.length && arguments[0] instanceof me.Matrix2d) {
+ this.copy(arguments[0]);
}
else if (arguments.length >= 6) {
- this.setTransform(a, b, c, d, e, f, g, h, i);
+ this.setTransform.apply(this, arguments);
}
else {
this.identity();
|
this is working better, as undefined arguments would be considered "present" then by the setTransform function
|
diff --git a/component.js b/component.js
index <HASH>..<HASH> 100644
--- a/component.js
+++ b/component.js
@@ -3,7 +3,20 @@
// they are responsible for calling render on those elements
Mast.Component =
{
-
+ /**
+ * attributes: properties to be added directly to the component
+ * i.e. accessible from component as:
+ * this.someThing
+ * this.someThingElse
+ *
+ * modelAttributes: properties to be added directly to the component's Model
+ * i.e. accessible from component as:
+ * this.get('someThing')
+ * this.get('someThingElse')
+ *
+ * dontRender: whether or not to render this component when it is instantiated
+ * default: false
+ */
initialize: function(attributes,modelAttributes,dontRender){
// Bind context
@@ -166,7 +179,7 @@ Mast.Component =
// Instantiate subcomponent, but don't append/render it yet
- var subcomponent = new Subcomponent(plist);
+ var subcomponent = new Subcomponent(plist,plist);
this.children[key] = subcomponent;
},
|
Documentation that was added via balderdash, and the fix to make subcomponents pass down properties properly.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ def read(fname):
return io.open(file_path, encoding='utf-8').read()
-version = '0.8.5.dev0'
+version = '0.8.4.3'
setuptools.setup(
|
Preparing release <I>
|
diff --git a/lib/config/webpack.config.base.js b/lib/config/webpack.config.base.js
index <HASH>..<HASH> 100644
--- a/lib/config/webpack.config.base.js
+++ b/lib/config/webpack.config.base.js
@@ -4,6 +4,11 @@ const WebpackBar = require('webpackbar');
const ManifestPlugin = require('webpack-manifest-plugin');
const paths = require('./paths');
+let tty = false;
+if (process.stdout) {
+ tty = Boolean(process.stdout.isTTY);
+}
+
let config = {
context: paths.appPath,
@@ -28,7 +33,10 @@ let config = {
},
plugins: [
new WebpackBar({
- color: 'green'
+ name: '',
+ color: 'green',
+ minimal: !tty,
+ compiledIn: false
}),
new ManifestPlugin({
fileName: 'static-manifest.json'
|
webpack config base的webpackBar配置
|
diff --git a/lib/generators/sauce/install/install_generator.rb b/lib/generators/sauce/install/install_generator.rb
index <HASH>..<HASH> 100644
--- a/lib/generators/sauce/install/install_generator.rb
+++ b/lib/generators/sauce/install/install_generator.rb
@@ -41,7 +41,6 @@ module Sauce
require 'sauce'
Sauce.config do |conf|
- conf.browser_url = "http://#{@random_id}.test/"
conf.browsers = [
["Windows 2003", "firefox", "3.6."]
]
|
Remove the unnecessary fake domain nonsense from the Rails2 generator
Fixes #<I>
|
diff --git a/code/libraries/joomlatools/component/koowa/dispatcher/router/route.php b/code/libraries/joomlatools/component/koowa/dispatcher/router/route.php
index <HASH>..<HASH> 100644
--- a/code/libraries/joomlatools/component/koowa/dispatcher/router/route.php
+++ b/code/libraries/joomlatools/component/koowa/dispatcher/router/route.php
@@ -176,8 +176,8 @@ class ComKoowaDispatcherRouterRoute extends KDispatcherRouterRoute
// Set application language
$params = Joomla\CMS\Component\ComponentHelper::getParams('com_languages');
- $language = $params->get('site', $app->get('language', 'en-GB'));
- $app->loadLanguage(Joomla\CMS\Language\Language::getInstance($app->get('language'), $app->get('debug_lang')));
+ $language = $params->get($client, $app->get('language', 'en-GB'));
+ $app->loadLanguage(Joomla\CMS\Language\Language::getInstance($language, $app->get('debug_lang')));
$menu_class = sprintf('\Joomla\CMS\Menu\%sMenu', ucfirst($client));
|
#<I> Set proper client and make use of the lnaguage variable value just fetched
|
diff --git a/lib/component-hint.js b/lib/component-hint.js
index <HASH>..<HASH> 100755
--- a/lib/component-hint.js
+++ b/lib/component-hint.js
@@ -36,7 +36,7 @@ function loadData(checkPath, cb) {
var componentFilename = path.join(checkPath, 'component.json');
fs.exists(componentFilename, function (exists) {
if (!exists) {
- return cb(new Error('Component JSON file does not exist: ' + componentFilename));
+ return callback(new Error('Component JSON file does not exist: ' + componentFilename));
}
componentJson = require(componentFilename);
diff --git a/lib/tests/checkFilesExist.js b/lib/tests/checkFilesExist.js
index <HASH>..<HASH> 100644
--- a/lib/tests/checkFilesExist.js
+++ b/lib/tests/checkFilesExist.js
@@ -4,11 +4,13 @@ var async = require('async');
/**
+ * This test checks each file type within the component.json file and checks whether or not they
+ * exist.
*
- * @param {type} componentPath
- * @param {type} componentData
- * @param {type} options
- * @param {type} cb
+ * @param {String} componentPath
+ * @param {Object} componentData
+ * @param {Object} options
+ * @param {Function} cb
* @returns {undefined}
*/
exports.test = function (componentPath, componentData, options, cb) {
|
Updated some documentation and fixed error with usage of incorrect callback
|
diff --git a/src/javascript/runtime/Runtime.js b/src/javascript/runtime/Runtime.js
index <HASH>..<HASH> 100644
--- a/src/javascript/runtime/Runtime.js
+++ b/src/javascript/runtime/Runtime.js
@@ -488,7 +488,9 @@ define('moxie/runtime/Runtime', [
return {
uid: runtime.uid,
type: runtime.type,
- can: runtime.can
+ can: function() {
+ return runtime.can.apply(runtime, arguments);
+ }
};
}
return null;
|
Runtime: Run can() method returned from getRuntime() in runtime's object.
|
diff --git a/test/transfer_test.go b/test/transfer_test.go
index <HASH>..<HASH> 100644
--- a/test/transfer_test.go
+++ b/test/transfer_test.go
@@ -134,8 +134,16 @@ func testClientTransfer(t *testing.T, ps testClientTransferParams) {
assert.NotEmpty(t, seederTorrent.PeerConns())
leecherPeerConns := leecherTorrent.PeerConns()
assert.NotEmpty(t, leecherPeerConns)
+ foundSeeder := false
for _, pc := range leecherPeerConns {
- assert.EqualValues(t, leecherTorrent.Info().NumPieces(), pc.PeerPieces().Len())
+ completed := pc.PeerPieces().Len()
+ t.Logf("peer conn %v has %v completed pieces", pc, completed)
+ if completed == leecherTorrent.Info().NumPieces() {
+ foundSeeder = true
+ }
+ }
+ if !foundSeeder {
+ t.Errorf("didn't find seeder amongst leecher peer conns")
}
seederStats := seederTorrent.Stats()
|
Fix transfer test check for seeder piece counts
I suspect that there's a race where a connection is established to the seeder, but we haven't received it's completed piece information yet, and we already finished reading all the data we need from another connection. Probably comes up now because pending peers with the same address aren't clobbering each other since that was fixed.
|
diff --git a/src/View/Cell/MenuCell.php b/src/View/Cell/MenuCell.php
index <HASH>..<HASH> 100644
--- a/src/View/Cell/MenuCell.php
+++ b/src/View/Cell/MenuCell.php
@@ -128,7 +128,7 @@ class MenuCell extends Cell
*/
protected function _getMenuItemsFromEvent(EntityInterface $menu, array $modules = [])
{
- $event = new Event('Menu.Menu.getMenu', $this, [
+ $event = new Event('Menu.Menu.getMenuItems', $this, [
'name' => $menu->name,
'user' => $this->_user,
'fullBaseUrl' => $this->_fullBaseUrl,
|
Changed Event name (task #<I>)
|
diff --git a/engine/reformulation/sql/src/main/java/it/unibz/inf/ontop/answering/reformulation/generation/dialect/impl/OracleSQLDialectAdapter.java b/engine/reformulation/sql/src/main/java/it/unibz/inf/ontop/answering/reformulation/generation/dialect/impl/OracleSQLDialectAdapter.java
index <HASH>..<HASH> 100644
--- a/engine/reformulation/sql/src/main/java/it/unibz/inf/ontop/answering/reformulation/generation/dialect/impl/OracleSQLDialectAdapter.java
+++ b/engine/reformulation/sql/src/main/java/it/unibz/inf/ontop/answering/reformulation/generation/dialect/impl/OracleSQLDialectAdapter.java
@@ -48,7 +48,7 @@ public class OracleSQLDialectAdapter extends SQL99DialectAdapter {
SqlDatatypes.put(Types.CHAR, "CHAR");
SqlDatatypes.put(Types.VARCHAR, "VARCHAR(4000)");
SqlDatatypes.put(Types.CLOB, "CLOB");
- SqlDatatypes.put(Types.TIMESTAMP, "VARCHAR(4000)");
+ SqlDatatypes.put(Types.TIMESTAMP, "DATE");
SqlDatatypes.put(Types.INTEGER, "INTEGER");
SqlDatatypes.put(Types.BIGINT, "NUMBER(19)");
SqlDatatypes.put(Types.REAL, "NUMBER");
|
Change Oracle timestamp to DATE instead of VARCHAR(<I>) to maintain time information
|
diff --git a/src/util/Constants.js b/src/util/Constants.js
index <HASH>..<HASH> 100644
--- a/src/util/Constants.js
+++ b/src/util/Constants.js
@@ -60,8 +60,6 @@ exports.DefaultOptions = {
$os: process ? process.platform : 'discord.js',
$browser: 'discord.js',
$device: 'discord.js',
- $referrer: '',
- $referring_domain: '',
},
version: 6,
},
|
where we're going we don't need referrers (#<I>)
|
diff --git a/sockjs/cyclone/session.py b/sockjs/cyclone/session.py
index <HASH>..<HASH> 100644
--- a/sockjs/cyclone/session.py
+++ b/sockjs/cyclone/session.py
@@ -437,14 +437,16 @@ class MultiplexChannelSession(BaseSession):
self.base = base
self.name = name
- def send_message(self, msg):
- self.base.sendMessage('msg,' + self.name + ',' + msg)
+ def send_message(self, msg, stats=True):
+ if not self.base.is_closed:
+ msg = 'msg,%s,%s' % (self.name, msg)
+ self.base.session.send_message(msg, stats)
def messageReceived(self, msg):
self.conn.messageReceived(msg)
def close(self, code=3000, message='Go away!'):
- self.base.sendMessage('uns,' + self.name)
+ self.base.sendMessage('uns,%s' % self.name)
self._close(code, message)
# Non-API version of the close, without sending the close message
|
added stats argument to send_message for Multiplex sessions
|
diff --git a/urwid_datatable/datatable.py b/urwid_datatable/datatable.py
index <HASH>..<HASH> 100644
--- a/urwid_datatable/datatable.py
+++ b/urwid_datatable/datatable.py
@@ -615,7 +615,6 @@ class DataTable(urwid.WidgetWrap):
border = self.border,
padding = self.padding
)
- logger.info("border: %s, padding: %s" %(self.border, self.padding))
self.pile.contents.insert(0,
(self.header, self.pile.options('pack'))
)
@@ -767,8 +766,8 @@ class DataTable(urwid.WidgetWrap):
try:
v = self.df[index:index]
except IndexError:
- logger.error(traceback.format_exc())
- logger.error("%d, %s" %(index, self.df.index))
+ logger.debug(traceback.format_exc())
+ logger.debug("%d, %s" %(index, self.df.index))
return OrderedDict(
(k, v[0])
|
Quiet logging a bit more.
|
diff --git a/Classes/TYPO3/Setup/Controller/SetupController.php b/Classes/TYPO3/Setup/Controller/SetupController.php
index <HASH>..<HASH> 100644
--- a/Classes/TYPO3/Setup/Controller/SetupController.php
+++ b/Classes/TYPO3/Setup/Controller/SetupController.php
@@ -49,7 +49,7 @@ class SetupController extends \TYPO3\Flow\Mvc\Controller\ActionController {
/**
* @return void
*/
- public function initializeAction() {
+ protected function initializeAction() {
$this->distributionSettings = $this->configurationSource->load(FLOW_PATH_CONFIGURATION . \TYPO3\Flow\Configuration\ConfigurationManager::CONFIGURATION_TYPE_SETTINGS);
}
|
[TASK] initializeAction methods have to be protected
Change-Id: I0eee<I>c<I>d0c<I>ccb<I>b<I>a<I>f<I>a<I>f9
|
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
@@ -216,6 +216,12 @@ class OioServerSocketPipelineSink extends AbstractChannelSink {
} catch (SocketTimeoutException e) {
// Thrown every second to stop when requested.
} catch (IOException e) {
+ // Don't log the exception if the server socket was closed
+ // by a user.
+ if (!channel.isBound()) {
+ break;
+ }
+
logger.warn(
"Failed to accept a connection.", e);
try {
|
Fixed issue: NETTY-<I> (Unnecessarily logged exception in the blocking I/O server socket)
* Suppressed the expected exception logging
|
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -9,7 +9,7 @@
from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Filesys(Plugin, DebianPlugin, UbuntuPlugin):
"""Local file systems
"""
@@ -69,4 +69,11 @@ class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
self.do_cmd_output_sub("lsof", regex, '')
+
+class RedHatFilesys(Filesys, RedHatPlugin):
+
+ def setup(self):
+ super(RedHatFilesys, self).setup()
+ self.add_cmd_output("ls -ltradZ /tmp")
+
# vim: set et ts=4 sw=4 :
|
[filesys] Add permission and selinux check for /tmp
Adds a check for the /tmp directory for permissions and selinux
context. If either of these are incorrect, the system in question can
exhibit strange behavior and otherwise be difficult for support teams to
detect.
On systems where SELinux is disabled, the permission check is still
relevant and the command still produces useful output with the -Z
option.
Resolves: #<I>
|
diff --git a/Layers.js b/Layers.js
index <HASH>..<HASH> 100644
--- a/Layers.js
+++ b/Layers.js
@@ -444,6 +444,10 @@ Object.extend(cop, {
// layer around only the class methods
layerClass: function(layer, classObject, defs) {
+ if (!classObject || !classObject.prototype) {
+ throw new Error("ContextJS: can not refine class '" +
+ classObject + "' in " + layer);
+ }
cop.layerObject(layer, classObject.prototype, defs);
},
|
Merging remaining webwerkstatt changes for <I> release to core, part 2
|
diff --git a/pyte/font/opentype/__init__.py b/pyte/font/opentype/__init__.py
index <HASH>..<HASH> 100644
--- a/pyte/font/opentype/__init__.py
+++ b/pyte/font/opentype/__init__.py
@@ -144,4 +144,9 @@ class OpenTypeMetrics(FontMetrics):
return lookup_table.lookup(a.code, b.code)
except KeyError:
pass
+ if 'kern' in self._tables:
+ try:
+ return self._tables['kern'][0].pairs[a.code][b.code]
+ except KeyError:
+ pass
return 0.0
|
OpenType: fall back to using the kern table if GPOS/kern is not present
|
diff --git a/cake/tests/lib/reporter/cake_cli_reporter.php b/cake/tests/lib/reporter/cake_cli_reporter.php
index <HASH>..<HASH> 100644
--- a/cake/tests/lib/reporter/cake_cli_reporter.php
+++ b/cake/tests/lib/reporter/cake_cli_reporter.php
@@ -55,11 +55,8 @@ class CakeCliReporter extends CakeBaseReporter {
* @param array $params
* @return void
*/
- function CakeCLIReporter($separator = NULL, $params = array()) {
- $this->CakeBaseReporter('utf-8', $params);
- if (!is_null($separator)) {
- $this->setFailDetailSeparator($separator);
- }
+ function CakeCLIReporter($charset = 'utf-8', $params = array()) {
+ $this->CakeBaseReporter($charset, $params);
}
function setFailDetailSeparator($separator) {
|
Fixing constructor of CakeCliReporter to match CakeBaseReporter.
|
diff --git a/lib/xcodeproj/plist_helper.rb b/lib/xcodeproj/plist_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/xcodeproj/plist_helper.rb
+++ b/lib/xcodeproj/plist_helper.rb
@@ -53,10 +53,10 @@ module Xcodeproj
def read(path)
path = path.to_s
unless File.exist?(path)
- raise ArgumentError, "The plist file at path `#{path}` doesn't exist."
+ raise Informative, "The plist file at path `#{path}` doesn't exist."
end
if file_in_conflict?(path)
- raise ArgumentError, "The file `#{path}` is in a merge conflict"
+ raise Informative, "The file `#{path}` is in a merge conflict."
end
CoreFoundation.RubyHashPropertyListRead(path)
end
|
[PlistHelper] Raise Informatives when reading a plist fails (either due to a merge conflict or the plist not existing)
|
diff --git a/lib/freeswitcher.rb b/lib/freeswitcher.rb
index <HASH>..<HASH> 100644
--- a/lib/freeswitcher.rb
+++ b/lib/freeswitcher.rb
@@ -1,9 +1,17 @@
+require 'logger'
require 'socket'
require 'pp'
$LOAD_PATH.unshift(File.dirname(__FILE__))
module FreeSwitcher
+ # Usage:
+ #
+ # Log.info('foo')
+ # Log.debug('bar')
+ # Log.warn('foobar')
+ # Log.error('barfoo')
+ Log = Logger.new($stdout)
end
require 'freeswitcher/event'
diff --git a/lib/freeswitcher/commands/originate.rb b/lib/freeswitcher/commands/originate.rb
index <HASH>..<HASH> 100644
--- a/lib/freeswitcher/commands/originate.rb
+++ b/lib/freeswitcher/commands/originate.rb
@@ -22,14 +22,9 @@ module FreeSwitcher::Commands
else
raise "Invalid originator or application"
end
- debug "saying #{orig_command}"
+ Log.debug "saying #{orig_command}"
@fs_socket.say(orig_command)
end
-
- def debug(message)
- $stdout.puts message
- $stdout.flush
- end
end
register(:originate, Originate)
|
Adding FreeSwitcher::Log
|
diff --git a/loomengine/client/server.py b/loomengine/client/server.py
index <HASH>..<HASH> 100755
--- a/loomengine/client/server.py
+++ b/loomengine/client/server.py
@@ -90,9 +90,9 @@ class ServerControls:
def status(self):
verify_has_connection_settings()
if is_server_running():
- print 'OK, the server is up.'
+ print 'OK, the server is up at %s' % get_server_url()
else:
- raise SystemExit('No response from server at "%s".' % get_server_url())
+ raise SystemExit('No response from server at %s' % get_server_url())
@loom_settings_transaction
def start(self):
|
"loom server status" reports ip address
|
diff --git a/Core/PageTree/AlPageTree.php b/Core/PageTree/AlPageTree.php
index <HASH>..<HASH> 100644
--- a/Core/PageTree/AlPageTree.php
+++ b/Core/PageTree/AlPageTree.php
@@ -59,7 +59,7 @@ class AlPageTree
/**
* Constructor
*
- * @param ContainerInterface $container
+ * @param Symfony\Component\DependencyInjection\ContainerInterface $container
* @param AlPageBlocksInterface $pageBlocks
*/
public function __construct(ContainerInterface $container, AlPageBlocksInterface $pageBlocks = null)
@@ -68,6 +68,16 @@ class AlPageTree
$this->pageBlocks = $pageBlocks;
$this->activeTheme = $this->container->get('alphalemon_theme_engine.active_theme');
}
+
+ /**
+ * Returns the container
+ *
+ * @return Symfony\Component\DependencyInjection\ContainerInterface
+ */
+ public function getContainer()
+ {
+ return $this->container;
+ }
/**
* Sets the template object
|
Added method to retrieve the container object
|
diff --git a/pkg/topom/topom.go b/pkg/topom/topom.go
index <HASH>..<HASH> 100644
--- a/pkg/topom/topom.go
+++ b/pkg/topom/topom.go
@@ -103,7 +103,6 @@ func New(client models.Client, config *Config) (*Topom, error) {
}
s.store = models.NewStore(client, config.ProductName)
- s.action.interval.Set(1000 * 10)
s.stats.servers = make(map[string]*RedisStats)
s.stats.proxies = make(map[string]*ProxyStats)
|
topom: set default interval of data migration to 0us
|
diff --git a/test/flac_file_test.rb b/test/flac_file_test.rb
index <HASH>..<HASH> 100644
--- a/test/flac_file_test.rb
+++ b/test/flac_file_test.rb
@@ -44,7 +44,8 @@ class FlacFileTest < Test::Unit::TestCase
should "contain flac-specific information" do
assert_equal 16, @properties.sample_width
- assert_equal "x\xD1\x9B\x86\xDF,\xD4\x88\xB3YW\xE6\xBD\x88Ih", @properties.signature
+ s = ["78d19b86df2cd488b35957e6bd884968"].pack('H*')
+ assert_equal s, @properties.signature
end
end
|
Fix test failure on Ruby <I> with binary string literal
The problem was that <I> interprets string literals as UTF-8 by
default now. As the expected string in that test case is binary, we use
pack to write it as a literal. On <I>, there is also "string".b, but
that is not compatible with <I>/<I>.
|
diff --git a/src/main/java/org/jsoup/parser/CharacterReader.java b/src/main/java/org/jsoup/parser/CharacterReader.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jsoup/parser/CharacterReader.java
+++ b/src/main/java/org/jsoup/parser/CharacterReader.java
@@ -382,11 +382,10 @@ final class CharacterReader {
boolean rangeEquals(final int start, int count, final String cached) {
if (count == cached.length()) {
char one[] = input;
- char two[] = cached.toCharArray();
int i = start;
int j = 0;
while (count-- != 0) {
- if (one[i++] != two[j++])
+ if (one[i++] != cached.charAt(j++))
return false;
}
return true;
|
Less GC in cache check
At expense of getField
|
diff --git a/src/BankBillet/Views/BancoDoNordeste.php b/src/BankBillet/Views/BancoDoNordeste.php
index <HASH>..<HASH> 100644
--- a/src/BankBillet/Views/BancoDoNordeste.php
+++ b/src/BankBillet/Views/BancoDoNordeste.php
@@ -54,13 +54,11 @@ class BancoDoNordeste extends CaixaEconomicaFederal
}
/**
- * Prepare some data to be used during Draw
- *
- * @param mixed[] $data Data for the bank billet
+ * Banco do Banese requires the wallet field to be the wallet operation
*/
- protected function beforeDraw()
+ protected function drawBillet()
{
- $this->models['wallet']->symbol = $this->models['wallet']->operation;
- parent::beforeDraw();
+ $this->fields['wallet']['value'] = $this->models['wallet']->operation;
+ parent::drawBillet();
}
}
|
Update BanoDoNordeste view
- Replace obsolete beforeDraw() with drawBillet()
- Fix wallet field
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -2,9 +2,10 @@ var jf = require('jsonfile');
var fs = require('fs');
var path = require('path');
var mkdirp = require('mkdirp');
+var nachosHome = require('nachos-home');
-function SettingsFile(path) {
- this._path = path;
+function SettingsFile(app) {
+ this._path = nachosHome('data', app + '.json');
}
SettingsFile.TEMPLATE = {global: {}, instances: {}};
|
Getting app name instead of path, using nachos-home
|
diff --git a/django_deployer/paas_templates/dotcloud/mkadmin.py b/django_deployer/paas_templates/dotcloud/mkadmin.py
index <HASH>..<HASH> 100644
--- a/django_deployer/paas_templates/dotcloud/mkadmin.py
+++ b/django_deployer/paas_templates/dotcloud/mkadmin.py
@@ -3,7 +3,7 @@ from wsgi import *
from django.contrib.auth.models import User
u, created = User.objects.get_or_create(username='admin')
if created:
- u.set_password('password')
+ u.set_password('{{ admin_password }}')
u.is_superuser = True
u.is_staff = True
u.save()
\ No newline at end of file
|
make setting the password configurable. need to warn user not to commit mkadmin.py to source control
|
diff --git a/lib/createsend.rb b/lib/createsend.rb
index <HASH>..<HASH> 100644
--- a/lib/createsend.rb
+++ b/lib/createsend.rb
@@ -43,7 +43,7 @@ class Unavailable < StandardError; end
class CreateSend
include HTTParty
- VER = "0.0.2" unless defined?(CreateSend::VER)
+ VER = "0.1.0" unless defined?(CreateSend::VER)
headers({ 'User-Agent' => "createsend-ruby-#{CreateSend::VER}", 'Content-Type' => 'application/json' })
base_uri CreateSendOptions['base_uri']
basic_auth CreateSendOptions['api_key'], 'x'
|
Version <I> for release.
|
diff --git a/src/Htmlizer.js b/src/Htmlizer.js
index <HASH>..<HASH> 100644
--- a/src/Htmlizer.js
+++ b/src/Htmlizer.js
@@ -110,8 +110,6 @@
if (bindings.text && regexMap.DotNotation.test(bindings.text)) {
val = saferEval(bindings.text, data);
if (val !== undefined) {
- //escape <,> and &.
- val = (val + '').replace(/&/g, "&").replace(/>/g, ">").replace(/</g, "<");
node.appendChild(document.createTextNode(val));
}
}
@@ -225,7 +223,8 @@
}
}
if (isOpenTag && node.nodeType === 3) {
- html += node.nodeValue;
+ //escape <,> and &.
+ html += (node.nodeValue || '').replace(/&/g, "&").replace(/>/g, ">").replace(/</g, "<");
}
}, this);
return html;
|
Reverted last two commits, as escaping is not required for document.createTextNode(). However HTML escaping is required after reading from text node (in toString method).
|
diff --git a/lib/environmentlib.php b/lib/environmentlib.php
index <HASH>..<HASH> 100644
--- a/lib/environmentlib.php
+++ b/lib/environmentlib.php
@@ -154,7 +154,7 @@ function check_moodle_environment($version, &$environment_results, $print_table=
* @return void
*/
function print_moodle_environment($result, $environment_results) {
- global $CFG;
+ global $CFG, $OUTPUT;
/// Get some strings
$strname = get_string('name');
@@ -273,7 +273,7 @@ function print_moodle_environment($result, $environment_results) {
if (empty($CFG->docroot)) {
$report = get_string($stringtouse, 'admin', $rec);
} else {
- $report = doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec));
+ $report = $OUTPUT->doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec));
}
|
MDL-<I> Migrated call to doc_link()
|
diff --git a/lib/Phpfastcache/Helper/TestHelper.php b/lib/Phpfastcache/Helper/TestHelper.php
index <HASH>..<HASH> 100644
--- a/lib/Phpfastcache/Helper/TestHelper.php
+++ b/lib/Phpfastcache/Helper/TestHelper.php
@@ -121,6 +121,17 @@ class TestHelper
* @param string $string
* @return $this
*/
+ public function printNoteText($string): self
+ {
+ $this->printText("[NOTE] {$string}");
+
+ return $this;
+ }
+
+ /**
+ * @param string $string
+ * @return $this
+ */
public function printFailText($string): self
{
$this->printText("[FAIL] {$string}");
|
Added "NOTE" method to testHelper
|
diff --git a/src/cursor.js b/src/cursor.js
index <HASH>..<HASH> 100644
--- a/src/cursor.js
+++ b/src/cursor.js
@@ -97,7 +97,7 @@ var Cursor = (function() {
},
setAsSelection: function() {
- rangy.getSelection().setSingleRange(this.range)
+ rangy.getSelection().setSingleRange(this.range);
},
detach: function() {
|
mind the little speck at the end of the line
|
diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py
index <HASH>..<HASH> 100644
--- a/dosagelib/plugins/s.py
+++ b/dosagelib/plugins/s.py
@@ -109,6 +109,14 @@ class SinFest(_BasicScraper):
help = 'Index format: n (unpadded)'
+class SkinDeep(_BasicScraper):
+ url = 'http://www.skindeepcomic.com/'
+ stripUrl = url + 'archive/%s/'
+ imageSearch = compile(r'<span class="webcomic-object[^>]*><img src="([^"]*)"')
+ prevSearch = compile(tagre("a", "href", r'([^"]+)', after="previous-webcomic-link"))
+ help = 'Index format: custom'
+
+
class SlightlyDamned(_BasicScraper):
url = 'http://www.sdamned.com/'
stripUrl = url + '%s/'
|
Add SkinDeep.
Filenames for this are all over the place :(
|
diff --git a/structr-ui/src/main/java/org/structr/files/external/DirectoryWatchService.java b/structr-ui/src/main/java/org/structr/files/external/DirectoryWatchService.java
index <HASH>..<HASH> 100644
--- a/structr-ui/src/main/java/org/structr/files/external/DirectoryWatchService.java
+++ b/structr-ui/src/main/java/org/structr/files/external/DirectoryWatchService.java
@@ -230,7 +230,7 @@ public class DirectoryWatchService extends Thread implements RunnableService {
final SecurityContext securityContext = SecurityContext.getSuperUserInstance();
- try {
+ try (final Tx tx = StructrApp.getInstance(securityContext).tx()) {
// handle all watch events that are older than 2 seconds
for (final Iterator<WatchEventItem> it = eventQueue.values().iterator(); it.hasNext();) {
@@ -244,6 +244,8 @@ public class DirectoryWatchService extends Thread implements RunnableService {
}
}
+ tx.success();
+
} catch (Throwable t) {
logger.error(ExceptionUtils.getStackTrace(t));
}
|
Bugfix: handle transactions in DirectoryWatchService differently.
|
diff --git a/src/main/java/net/spy/memcached/MemcachedConnection.java b/src/main/java/net/spy/memcached/MemcachedConnection.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/spy/memcached/MemcachedConnection.java
+++ b/src/main/java/net/spy/memcached/MemcachedConnection.java
@@ -467,7 +467,7 @@ public final class MemcachedConnection extends SpyObject {
public void addOperation(final String key, final Operation o) {
MemcachedNode placeIn=null;
MemcachedNode primary = locator.getPrimary(key);
- if(primary.isActive()) {
+ if(primary.isActive() || failureMode == FailureMode.Retry) {
placeIn=primary;
} else {
// Look for another node in sequence that is ready.
|
When FailureMode is retry, queue even when inactive.
This is *most* of the implementation of FailureMode.Retry.
|
diff --git a/lib/node_modules/@stdlib/_tools/js/program-summary/test/test.js b/lib/node_modules/@stdlib/_tools/js/program-summary/test/test.js
index <HASH>..<HASH> 100644
--- a/lib/node_modules/@stdlib/_tools/js/program-summary/test/test.js
+++ b/lib/node_modules/@stdlib/_tools/js/program-summary/test/test.js
@@ -321,6 +321,23 @@ tape( 'the function analyzes a JavaScript program (for...in)', opts, function te
t.end();
});
+tape( 'the function analyzes a JavaScript program (guarded for...in)', opts, function test( t ) {
+ var expected;
+ var fpath;
+ var prog;
+ var o;
+
+ fpath = join( __dirname, 'fixtures', 'guarded_for_in_statement.js.txt' );
+ prog = readFileSync( fpath );
+
+ expected = require( './fixtures/guarded_for_in_statement.json' );
+
+ o = analyze( prog );
+ t.deepEqual( o, expected, 'returns expected value' );
+
+ t.end();
+});
+
tape( 'the function analyzes a JavaScript program (throw)', opts, function test( t ) {
var expected;
var fpath;
|
Add guarded for...in statement test
|
diff --git a/src/ZfcUser/Controller/UserController.php b/src/ZfcUser/Controller/UserController.php
index <HASH>..<HASH> 100644
--- a/src/ZfcUser/Controller/UserController.php
+++ b/src/ZfcUser/Controller/UserController.php
@@ -87,7 +87,10 @@ class UserController extends AbstractActionController
$this->flashMessenger()->setNamespace('zfcuser-login-form')->addMessage($this->failedLoginMessage);
return $this->redirect()->toUrl($this->url()->fromRoute('zfcuser/login').($redirect ? '?redirect='.$redirect : ''));
}
+
// clear adapters
+ $this->zfcUserAuthentication()->getAuthAdapter()->resetAdapters();
+ $this->zfcUserAuthentication()->getAuthService()->clearIdentity();
return $this->forward()->dispatch('zfcuser', array('action' => 'authenticate'));
}
|
Clear the auth adapter and identity if successfully posted a new login request
|
diff --git a/includes/session.php b/includes/session.php
index <HASH>..<HASH> 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -55,7 +55,7 @@ if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCO
define ('WT_USE_GOOGLE_API', false);
if (WT_USE_GOOGLE_API) {
define('WT_JQUERY_URL', 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js');
- define('WT_JQUERYUI_URL', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js');
+ define('WT_JQUERYUI_URL', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.19/jquery-ui.min.js');
} else {
define('WT_JQUERY_URL', WT_STATIC_URL.'js/jquery/jquery.min.js');
define('WT_JQUERYUI_URL', WT_STATIC_URL.'js/jquery/jquery-ui.min.js');
|
Update jQuery via CDN to <I>
|
diff --git a/lib/main.js b/lib/main.js
index <HASH>..<HASH> 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -156,7 +156,7 @@ function makeJsonFriendlyRoute(injector, route) {
function makeRunInContext(serverScripts, angularModules, prepContext, template) {
return function (func) {
- var context = angularcontext.Context();
+ var context = angularcontext.Context(template);
context.runFiles(
serverScripts,
function (success, error) {
@@ -165,17 +165,23 @@ function makeRunInContext(serverScripts, angularModules, prepContext, template)
func(undefined, error);
}
- ngoverrides.registerModule(context);
prepContext(
context,
function () {
- var $injector = getInjector(context, angularModules, template);
+ ngoverrides.registerModule(context);
+
+ var angular = context.getAngular();
+
+ var modules = angular.copy(angularModules);
+ modules.unshift('angularjs-server');
+
+ var $injector = context.bootstrap(modules);
// Although the called module will primarily use the injector, we
// also give it indirect access to the angular object so it can
// make use of Angular's "global" functions.
- $injector.angular = context.getAngular();
+ $injector.angular = angular;
// The caller must call this when it's finished in order to free the context.
$injector.close = function () {
|
Bootstrap Angular completely when we prepare a context.
Previously we just did the injector initialization, but fully bootstrapping
allows the caller to assume its template has been parsed, and doesn't
really do any harm if the template is empty.
|
diff --git a/tests/DataObjectTest.php b/tests/DataObjectTest.php
index <HASH>..<HASH> 100644
--- a/tests/DataObjectTest.php
+++ b/tests/DataObjectTest.php
@@ -287,4 +287,37 @@ class DataObjectTest extends TestCase
$this->assertEquals(3, $data->count());
$this->assertCount(3, $data);
}
+
+ /**
+ * @test
+ */
+ function it_recursively_deals_with_nested_arrayables()
+ {
+ $data = new Helpers\TestDataObject([
+ 'contents' => new Helpers\TestDataObject([
+ 'mass' => 'testing',
+ 'assignment' => 2242,
+ ]),
+ 'more' => [
+ new Helpers\TestDataObject([ 'a' => 'b' ]),
+ ],
+ ]);
+
+ $array = $data->toArray();
+
+ $this->assertInternalType('array', $array, 'nested toArray() did not return array');
+ $this->assertCount(2, $array, 'incorrect item count');
+ $this->assertArraySubset(
+ [
+ 'contents' => [
+ 'mass' => 'testing',
+ 'assignment' => 2242,
+ ],
+ 'more' => [
+ [ 'a' => 'b' ],
+ ],
+ ],
+ $array, 'incorrect nested array contents'
+ );
+ }
}
|
added test for recursive toArray handling
because it should handle arrayables inside arrays (2-step)
|
diff --git a/pharen.php b/pharen.php
index <HASH>..<HASH> 100644
--- a/pharen.php
+++ b/pharen.php
@@ -5,6 +5,7 @@ define("EXTENSION", ".phn");
require_once(COMPILER_SYSTEM.DIRECTORY_SEPARATOR.'lexical.php');
require_once("lang.php");
+require_once("sequence.php");
// Some utility functions for use in Pharen
@@ -586,6 +587,14 @@ class Node implements Iterator, ArrayAccess, Countable{
}
}
+ public function convert_to_list(){
+ $list = PharenList::create_from_array($this->children);
+ foreach($list as $key=>$el){
+ $list[$key] = $el->convert_to_list;
+ }
+ return $list;
+ }
+
public function compile_args($args=Null){
$output = array();
for($x=0; $x<count($args); $x++){
@@ -836,6 +845,10 @@ class LeafNode extends Node{
}
}
+ public function convert_to_list(){
+ return $this->value;
+ }
+
public function search($value){
return $this->value === $value;
}
|
Create functions for Node and LeafNode to allow them to convert themselves into their list versions
|
diff --git a/lib/consts/consts.go b/lib/consts/consts.go
index <HASH>..<HASH> 100644
--- a/lib/consts/consts.go
+++ b/lib/consts/consts.go
@@ -28,7 +28,7 @@ import (
)
// Version contains the current semantic version of k6.
-const Version = "0.38.2"
+const Version = "0.38.3"
// VersionDetails can be set externally as part of the build process
var VersionDetails = "" // nolint:gochecknoglobals
|
Release k6 <I>
|
diff --git a/flex/pkg/volume/provision.go b/flex/pkg/volume/provision.go
index <HASH>..<HASH> 100644
--- a/flex/pkg/volume/provision.go
+++ b/flex/pkg/volume/provision.go
@@ -91,7 +91,7 @@ func (p *flexProvisioner) Provision(options controller.VolumeOptions) (*v1.Persi
v1.ResourceName(v1.ResourceStorage): options.PVC.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)],
},
PersistentVolumeSource: v1.PersistentVolumeSource{
- FlexVolume: &v1.FlexVolumeSource{
+ FlexVolume: &v1.FlexPersistentVolumeSource{
Driver: "flex",
Options: map[string]string{},
ReadOnly: false,
|
flex: change to k8s <I> api
|
diff --git a/controller/src/main/java/org/jboss/as/controller/operations/global/GlobalOperationHandlers.java b/controller/src/main/java/org/jboss/as/controller/operations/global/GlobalOperationHandlers.java
index <HASH>..<HASH> 100644
--- a/controller/src/main/java/org/jboss/as/controller/operations/global/GlobalOperationHandlers.java
+++ b/controller/src/main/java/org/jboss/as/controller/operations/global/GlobalOperationHandlers.java
@@ -896,6 +896,7 @@ public class GlobalOperationHandlers {
rrOp.get(PROXIES).set(proxies);
rrOp.get(OPERATIONS).set(ops);
rrOp.get(INHERITED).set(inheritedOps);
+ rrOp.get(LOCALE).set(operation.get(LOCALE));
ModelNode rrRsp = new ModelNode();
childResources.put(element, rrRsp);
|
AS7-<I> Pass locale to recursive description read ops
was: <I>bc<I>fa6d2fd<I>d9bbc<I>d0f<I>fc<I>ad0d1
|
diff --git a/addon/components/sl-grid.js b/addon/components/sl-grid.js
index <HASH>..<HASH> 100755
--- a/addon/components/sl-grid.js
+++ b/addon/components/sl-grid.js
@@ -433,9 +433,10 @@ export default Ember.Component.extend({
setupColumnHeaderWidths: Ember.on(
'didInsertElement',
function() {
+ const context = this;
const colHeaders = this.$( '.list-pane .column-headers tr:first th' );
this.$( '.list-pane .content > table tr:first td' ).each( function( index ) {
- colHeaders.eq( index ).width( $( this ).width() );
+ colHeaders.eq( index ).width( context.$( this ).width() );
});
}
),
|
second attempt to clear out the travis build errors that I caused
|
diff --git a/ricecooker/commands.py b/ricecooker/commands.py
index <HASH>..<HASH> 100644
--- a/ricecooker/commands.py
+++ b/ricecooker/commands.py
@@ -41,15 +41,16 @@ def uploadchannel(arguments, **kwargs):
**kwargs)
config.SUSHI_BAR_CLIENT.report_stage('COMPLETED', 0)
except Exception as e:
- config.SUSHI_BAR_CLIENT.report_stage('FAILURE', 0)
+ if config.SUSHI_BAR_CLIENT:
+ config.SUSHI_BAR_CLIENT.report_stage('FAILURE', 0)
config.LOGGER.critical(e)
raise
finally:
- config.SUSHI_BAR_CLIENT.close()
+ if config.SUSHI_BAR_CLIENT:
+ config.SUSHI_BAR_CLIENT.close()
config.LOGGER.removeHandler(__logging_handler)
-
def __uploadchannel(path, verbose=False, update=False, thumbnails=False, download_attempts=3, resume=False, reset=False, step=Status.LAST.name, token="#", prompt=False, publish=False, warnings=False, compress=False, **kwargs):
""" uploadchannel: Upload channel to Kolibri Studio server
Args:
|
Remote control: applying changes lost after rebasing.
|
diff --git a/src/ActiveQuery.php b/src/ActiveQuery.php
index <HASH>..<HASH> 100644
--- a/src/ActiveQuery.php
+++ b/src/ActiveQuery.php
@@ -411,6 +411,9 @@ class ActiveQuery extends Query implements ActiveQueryInterface
return parent::column($field, $db);
}
+ /**
+ * @deprecated Do not use, will be dropped soon.
+ */
public function getList($as_array = true, $db = null, $options = [])
{
$rawResult = $this->createCommand($db)->getList($options);
|
ActiveQuery::getList() marked as deprecated
|
diff --git a/test/browser/test.js b/test/browser/test.js
index <HASH>..<HASH> 100755
--- a/test/browser/test.js
+++ b/test/browser/test.js
@@ -35,7 +35,7 @@ var sauceClient;
var sauceConnectProcess;
var tunnelId = process.env.TRAVIS_JOB_NUMBER || 'tunnel-' + Date.now();
-var jobName = tunnelId;
+var jobName = tunnelId + '-' + clientStr;
var build = (process.env.TRAVIS_COMMIT ? process.env.TRAVIS_COMMIT : Date.now());
|
fix(sauce): append client str
|
diff --git a/test/http.js b/test/http.js
index <HASH>..<HASH> 100644
--- a/test/http.js
+++ b/test/http.js
@@ -8,8 +8,15 @@ describe("http", function () {
describe("gpf.http", function () {
+ if (config.performance) {
+ it("is not relevant for performance testing", function () {
+ assert(true);
+ });
+ return;
+ }
+
if (config.httpPort === 0) {
- it("is not tested in this environment because config.httpPorty = 0", function () {
+ it("is not tested in this environment because config.httpPort = 0", function () {
assert(true);
});
return;
|
Exclude from performance measurement (#<I>)
|
diff --git a/ReText/window.py b/ReText/window.py
index <HASH>..<HASH> 100644
--- a/ReText/window.py
+++ b/ReText/window.py
@@ -246,7 +246,7 @@ class ReTextWindow(QMainWindow):
trig=lambda: self.insertFormatting('underline'))
self.usefulTags = ('header', 'italic', 'bold', 'underline', 'numbering',
'bullets', 'image', 'link', 'inline code', 'code block', 'blockquote')
- self.usefulChars = ('deg', 'divide', 'dollar', 'hellip', 'laquo', 'larr',
+ self.usefulChars = ('deg', 'divide', 'euro', 'hellip', 'laquo', 'larr',
'lsquo', 'mdash', 'middot', 'minus', 'nbsp', 'ndash', 'raquo',
'rarr', 'rsquo', 'times')
self.formattingBox = QComboBox(self.editBar)
|
window: usefulChars: Replace dollar with euro
Dollar is part of standard QWERTY keyboard layout, so it's useless here.
Fixes #<I>.
|
diff --git a/lib/cxxproject/utils/progress.rb b/lib/cxxproject/utils/progress.rb
index <HASH>..<HASH> 100644
--- a/lib/cxxproject/utils/progress.rb
+++ b/lib/cxxproject/utils/progress.rb
@@ -125,5 +125,5 @@ begin
Rake::add_listener(BenchmarkedProgressListener.new)
end
-rescue
+rescue LoadError => e
end
|
progress task does not raise if colored or progressbar is not installed - Fixes #<I>
|
diff --git a/lib/save.js b/lib/save.js
index <HASH>..<HASH> 100644
--- a/lib/save.js
+++ b/lib/save.js
@@ -23,16 +23,17 @@ module.exports = function (name, options) {
options.logger.info('Creating \'' + name + '\'', object)
})
- engine.on('update', function (object) {
- options.logger.info('Updating \'' + name + '\'', object)
+ engine.on('update', function (object, overwrite) {
+ options.logger.info('Updating \'' + name + '\'', object,
+ ' with overwrite ', overwrite)
})
- engine.on('delete', function (query) {
- options.logger.info('Deleting \'' + name + '\'', query)
+ engine.on('delete', function (id) {
+ options.logger.info('Deleting \'' + name + '\'', id)
})
- engine.on('deleteOne', function (object) {
- options.logger.info('Deleting One \'' + name + '\'', object)
+ engine.on('deleteMany', function (query) {
+ options.logger.info('Deleting many \'' + name + '\'', query)
})
engine.on('read', function (id) {
|
Update events to be more accurate to ones emitted
|
diff --git a/src/GoalioForgotPassword/Controller/ForgotController.php b/src/GoalioForgotPassword/Controller/ForgotController.php
index <HASH>..<HASH> 100644
--- a/src/GoalioForgotPassword/Controller/ForgotController.php
+++ b/src/GoalioForgotPassword/Controller/ForgotController.php
@@ -115,7 +115,7 @@ class ForgotController extends AbstractActionController
$password = $service->getPasswordMapper()->findByUserIdRequestKey($userId, $token);
//no request for a new password found
- if($password === null) {
+ if($password === null || $password == false) {
return $this->redirect()->toRoute('zfcuser/forgotpassword');
}
|
Bugfix reset with an already use token
|
diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -382,9 +382,7 @@ module Vagrant
# Setup the keys
info[:private_key_path] ||= []
- if !info[:private_key_path].is_a?(Array)
- info[:private_key_path] = [info[:private_key_path]]
- end
+ info[:private_key_path] = Array(info[:private_key_path])
# Expand the private key path relative to the root path
info[:private_key_path].map! do |path|
|
core: nicer way to assure array for pviate key path
|
diff --git a/sources/scalac/backend/msil/GenMSIL.java b/sources/scalac/backend/msil/GenMSIL.java
index <HASH>..<HASH> 100644
--- a/sources/scalac/backend/msil/GenMSIL.java
+++ b/sources/scalac/backend/msil/GenMSIL.java
@@ -2034,7 +2034,7 @@ final class MSILType {
public case REF(Type t) { assert t != null && !t.IsArray(); }
public case ARRAY(MSILType t) { assert t != null; }
- private final static CLRPackageParser pp = CLRPackageParser.instance;
+ private final static CLRPackageParser pp = CLRPackageParser.instance();
public static final MSILType OBJECT = REF(pp.OBJECT);
public static final MSILType STRING = REF(pp.STRING);
diff --git a/sources/scalac/backend/msil/TypeCreator.java b/sources/scalac/backend/msil/TypeCreator.java
index <HASH>..<HASH> 100644
--- a/sources/scalac/backend/msil/TypeCreator.java
+++ b/sources/scalac/backend/msil/TypeCreator.java
@@ -117,7 +117,7 @@ final class TypeCreator {
this.gen = gen;
this.defs = global.definitions;
- ti = CLRPackageParser.instance;
+ ti = CLRPackageParser.instance();
types2symbols = phase.types2symbols;
symbols2types = phase.symbols2types;
|
- Changed the way to get the CLRPackage instance
|
diff --git a/spyder_kernels/utils/misc.py b/spyder_kernels/utils/misc.py
index <HASH>..<HASH> 100644
--- a/spyder_kernels/utils/misc.py
+++ b/spyder_kernels/utils/misc.py
@@ -21,7 +21,7 @@ def fix_reference_name(name, blacklist=None):
if not name:
name = "data"
if blacklist is not None and name in blacklist:
- get_new_name = lambda index: name+('%03d' % index)
+ get_new_name = lambda index: name+('_%03d' % index)
index = 0
while get_new_name(index) in blacklist:
index += 1
|
Misc: Add underscore to variable reference rename
|
diff --git a/lib/sup/modes/line-cursor-mode.rb b/lib/sup/modes/line-cursor-mode.rb
index <HASH>..<HASH> 100644
--- a/lib/sup/modes/line-cursor-mode.rb
+++ b/lib/sup/modes/line-cursor-mode.rb
@@ -55,14 +55,11 @@ protected
buffer.mark_dirty
end
- ## override search behavior to be cursor-based
+ ## override search behavior to be cursor-based. this is a stupid
+ ## implementation and should be made better. TODO: improve.
def search_goto_line line
- while line > botline
- page_down
- end
- while line < topline
- page_up
- end
+ page_down while line >= botline
+ page_up while line < topline
set_cursor_pos line
end
|
bugfix for in-buffer search: corner case for results on last line
|
diff --git a/sphinx_bootstrap_theme/bootstrap/static/bootstrap-sphinx.js b/sphinx_bootstrap_theme/bootstrap/static/bootstrap-sphinx.js
index <HASH>..<HASH> 100644
--- a/sphinx_bootstrap_theme/bootstrap/static/bootstrap-sphinx.js
+++ b/sphinx_bootstrap_theme/bootstrap/static/bootstrap-sphinx.js
@@ -105,8 +105,8 @@
$('div.warning').addClass('alert');
// Inline code styles to Bootstrap style.
- $('tt.docutils').replaceWith(function () {
- return $("<code />").text($(this).text());
- });
+ $('tt.docutils span.pre:first-child').each(function (i, e) {
+ $(e).parent().replaceWith(function () {
+ return $("<code />").text($(this).text());});});
});
}($jqTheme || window.jQuery));
|
Change code wrapping to only affect literal code blocks.
|
diff --git a/LDAP.js b/LDAP.js
index <HASH>..<HASH> 100644
--- a/LDAP.js
+++ b/LDAP.js
@@ -46,8 +46,8 @@ var LDAP = function(opts) {
}
opts.timeout = opts.timeout || 5000;
- opts.backoff = -1;
- opts.backoffmax = opts.backoffmax || 30000;
+ opts.backoff = 1; //sec
+ opts.backoffmax = opts.backoffmax || 32; //sec
self.BASE = 0;
self.ONELEVEL = 1;
@@ -117,7 +117,7 @@ var LDAP = function(opts) {
function backoff() {
stats.backoffs++;
- opts.backoff++;
+ opts.backoff *= 2;
if (opts.backoff > opts.backoffmax)
opts.backoff = opts.backoffmax;
return opts.backoff * 1000;
@@ -132,7 +132,7 @@ var LDAP = function(opts) {
reconnect();
} else {
stats.reconnects++;
- opts.backoff = -1;
+ opts.backoff = 1;
replayCallbacks();
reconnecting = false;
|
Changed backoffmax to something less geological, time-wise.
|
diff --git a/cmd/juju/main.go b/cmd/juju/main.go
index <HASH>..<HASH> 100644
--- a/cmd/juju/main.go
+++ b/cmd/juju/main.go
@@ -6,6 +6,7 @@ package main
import (
"fmt"
"os"
+ "runtime"
"launchpad.net/juju-core/cmd"
"launchpad.net/juju-core/environs"
@@ -28,6 +29,10 @@ var x = []byte("\x96\x8c\x99\x8a\x9c\x94\x96\x91\x98\xdf\x9e\x92\x9e\x85\x96\x91
// to the cmd package. This function is not redundant with main, because it
// provides an entry point for testing with arbitrary command line arguments.
func Main(args []string) {
+ if runtime.GOOS == "windows" {
+ // patch the Windows environment so all our code that expects $HOME will work
+ os.Setenv("HOME", os.Getenv("HOMEPATH"))
+ }
if err := juju.InitJujuHome(); err != nil {
fmt.Fprintf(os.Stderr, "error: %s\n", err)
os.Exit(2)
|
Patch the environment variables in Windows so all our references to /home/nate will work correctly
|
diff --git a/lib/page.js b/lib/page.js
index <HASH>..<HASH> 100644
--- a/lib/page.js
+++ b/lib/page.js
@@ -22,7 +22,9 @@ function test (opts) {
.get(opts.url)
.then(() => {
if (opts.scroll || opts.reporter === 'fps') {
- return session.execute('var dir=-1;function f () { window.scrollBy(0,dir*=-1); window.requestAnimationFrame(f); } window.requestAnimationFrame(f);');
+ const scroll = (typeof opts.scroll === 'number') ? opts.scroll : 10;
+ const iterator = opts.scroll ? 1 : -1;
+ return session.execute(`var dir=${scroll};function f () { window.scrollBy(0,dir*=${iterator}); window.requestAnimationFrame(f); } window.requestAnimationFrame(f);`);
}
})
.then(() => {
|
Allow for customisable scrolling behaviour
If fps reporter is specified with no scroll parameters then stick with present behaviour of oscillating by 1 pixel. Otherwise if scroll option is provided then scroll continuously by the amount specified, or <I> pixels at a time if a non-numerical value is passed.
|
diff --git a/lib/aws.js b/lib/aws.js
index <HASH>..<HASH> 100644
--- a/lib/aws.js
+++ b/lib/aws.js
@@ -1,3 +1,3 @@
var AWS = require('./bootstrap');
require('./core');
-require('./service/dynamodb');
\ No newline at end of file
+require('./service/dynamodb');
|
Add newline to aws.js
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,7 @@ TEST_DIR = File.dirname(__FILE__)
TMP_DIR = File.expand_path("../tmp", TEST_DIR)
require 'jekyll'
-require File.expand_path("../lib/jekyll-prism.rb", TEST_DIR)
+require File.expand_path("../lib/mm-jekyll-prism.rb", TEST_DIR)
Jekyll.logger.log_level = :error
STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
|
Missed a rename in the tests in the previous commit
|
diff --git a/lib/composable_operations/operation.rb b/lib/composable_operations/operation.rb
index <HASH>..<HASH> 100644
--- a/lib/composable_operations/operation.rb
+++ b/lib/composable_operations/operation.rb
@@ -80,14 +80,16 @@ class Operation
end
def perform
+ self.result = nil
+
ActiveSupport::Notifications.instrument(self.class.identifier, :operation => self) do
- self.result = catch(:halt) do
+ catch(:halt) do
prepare
- execution_result = execute
+ self.result = execute
finalize
- execution_result
end
end
+
self.result
end
|
Operation after hooks have now access to the operation's result
|
diff --git a/nodeconductor/structure/admin.py b/nodeconductor/structure/admin.py
index <HASH>..<HASH> 100644
--- a/nodeconductor/structure/admin.py
+++ b/nodeconductor/structure/admin.py
@@ -9,7 +9,7 @@ class ProjectAdmin(admin.ModelAdmin):
fields = ('name', 'description', 'customer')
- list_display = ['name', 'uuid']
+ list_display = ['name', 'uuid', 'customer']
search_fields = ['name', 'uuid']
readonly_fields = ['customer']
@@ -18,7 +18,7 @@ class ProjectGroupAdmin(admin.ModelAdmin):
fields = ('name', 'description', 'customer')
- list_display = ['name', 'uuid']
+ list_display = ['name', 'uuid', 'customer']
search_fields = ['name', 'uuid']
readonly_fields = ['customer']
|
Expose customer in project/group admin
|
diff --git a/spec/string_spec.rb b/spec/string_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/string_spec.rb
+++ b/spec/string_spec.rb
@@ -81,11 +81,9 @@ describe BBLib do
expect('Left IV Dead'.from_roman).to eq 'Left 4 Dead'
expect('lIVe IIn fear'.to_roman).to eq 'lIVe IIn fear'
t = 'Donkey Kong Country 3'
- t.to_roman!
- expect(t).to eq 'Donkey Kong Country III'
+ expect(t.to_roman).to eq 'Donkey Kong Country III'
t = 'Title VII'
- t.from_roman!
- expect(t).to eq 'Title 7'
+ expect(t.from_roman).to eq 'Title 7'
end
it 'converts a string to a regular expression' do
|
Removed inplace methods for roman numerals.
|
diff --git a/tests/mock.py b/tests/mock.py
index <HASH>..<HASH> 100644
--- a/tests/mock.py
+++ b/tests/mock.py
@@ -5,6 +5,7 @@ import json
import logging
import pathlib
import socket
+import traceback
import urllib.error
import urllib.parse
import urllib.request
@@ -30,6 +31,7 @@ class FixtureOpener(urllib.request.OpenerDirector):
urllib.parse.urljoin(base_url, './w/api.php')
)
# ./w/api.php?action=query&prop=imageinfo|info&inprop=url&iiprop=url|size|mime&format=json&titles={} # noqa: E501
+ self.records = []
cls = type(self)
self.logger = logging.getLogger(cls.__qualname__) \
.getChild(cls.__name__)
@@ -47,6 +49,7 @@ class FixtureOpener(urllib.request.OpenerDirector):
logger = self.logger.getChild('open')
if not isinstance(fullurl, str):
fullurl = fullurl.get_full_url()
+ self.records.append((fullurl, ''.join(traceback.format_stack())))
parsed = urllib.parse.urlparse(fullurl)
hdrs = http.client.HTTPMessage()
# media fixtures
|
Add request records to FixtureOpener
for debug purpose
|
diff --git a/templates/client/html/common/partials/products.php b/templates/client/html/common/partials/products.php
index <HASH>..<HASH> 100644
--- a/templates/client/html/common/partials/products.php
+++ b/templates/client/html/common/partials/products.php
@@ -288,7 +288,7 @@ $detailFilter = array_flip( $this->config( 'client/html/catalog/detail/url/filte
</div>
- <?php if( $productItem->getType() === 'select' ) : ?>
+ <?php if( $this->get( 'basket-add', false ) && $productItem->getType() === 'select' ) : ?>
<?php foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $prodid => $product ) : ?>
<?php if( !( $prices = $product->getRefItems( 'price', null, 'default' ) )->isEmpty() ) : ?>
|
Displays variant article prices only if "add to basket" is enabled
|
diff --git a/ontrack-extension-git/src/main/java/net/nemerosa/ontrack/extension/git/GitController.java b/ontrack-extension-git/src/main/java/net/nemerosa/ontrack/extension/git/GitController.java
index <HASH>..<HASH> 100644
--- a/ontrack-extension-git/src/main/java/net/nemerosa/ontrack/extension/git/GitController.java
+++ b/ontrack-extension-git/src/main/java/net/nemerosa/ontrack/extension/git/GitController.java
@@ -366,18 +366,6 @@ public class GitController extends AbstractExtensionController<GitExtensionFeatu
}
/**
- * Commit information
- */
- @Deprecated
- @RequestMapping(value = "{branchId}/commit/{commit}", method = RequestMethod.GET)
- public Resource<OntrackGitCommitInfo> commitInfo(@PathVariable ID branchId, @PathVariable String commit) {
- return commitProjectInfo(
- structureService.getBranch(branchId).getProject().getId(),
- commit
- );
- }
-
- /**
* Commit information in a project
*/
@RequestMapping(value = "{projectId}/commit-info/{commit}", method = RequestMethod.GET)
|
#<I> Removed branch-based commit info end point
|
diff --git a/lib/mysql-native/serializers/reader.js b/lib/mysql-native/serializers/reader.js
index <HASH>..<HASH> 100644
--- a/lib/mysql-native/serializers/reader.js
+++ b/lib/mysql-native/serializers/reader.js
@@ -125,6 +125,9 @@ reader.prototype.unpackBinary = function(type, unsigned)
case constants.types.MYSQL_TYPE_BLOB:
result = this.lcstring();
break;
+ case constants.types.MYSQL_TYPE_TINY:
+ result = this.num(1);
+ break;
case constants.types.MYSQL_TYPE_LONG:
result = this.num(4);
break;
@@ -156,7 +159,7 @@ reader.prototype.unpackBinary = function(type, unsigned)
case constants.types.MYSQL_TYPE_TIME:
return this.unpackBinaryTime();
case constants.types.MYSQL_TYPE_DATETIME:
- case constants.types.MYSQL_TYPE_TYMESTAMP:
+ case constants.types.MYSQL_TYPE_TIMESTAMP:
return this.unpackBinaryDateTime();
default:
result = "_not_implemented_ " + constants.type_names[type] + " " + sys.inspect(this.data); //todo: throw exception here
|
add support for reading tinyints
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.