diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/materials/DepthCopyMaterial.js b/src/materials/DepthCopyMaterial.js
index <HASH>..<HASH> 100644
--- a/src/materials/DepthCopyMaterial.js
+++ b/src/materials/DepthCopyMaterial.js
@@ -111,6 +111,19 @@ export class DepthCopyMaterial extends ShaderMaterial {
}
/**
+ * Sets the screen position of the texel to copy.
+ *
+ * @param {Number} x - The X-coordinate.
+ * @param {Number} y - The X-coordinate.
+ */
+
+ setScreenPosition(x, y) {
+
+ this.uniforms.screenPosition.value.set(x, y);
+
+ }
+
+ /**
* Returns the depth copy mode.
*
* @return {DepthCopyMode} The depth copy mode.
|
Add accessors for configurable uniforms
Added setDepthBuffer() and setScreenPosition().
|
diff --git a/datasette/views/table.py b/datasette/views/table.py
index <HASH>..<HASH> 100644
--- a/datasette/views/table.py
+++ b/datasette/views/table.py
@@ -200,11 +200,7 @@ class TableView(RowTableShared):
"SELECT count(*) from sqlite_master WHERE type = 'view' and name=:n",
{"n": table},
)
- )[
- 0
- ][
- 0
- ]
+ )[0][0]
)
view_definition = None
table_definition = None
@@ -215,11 +211,7 @@ class TableView(RowTableShared):
'select sql from sqlite_master where name = :n and type="view"',
{"n": table},
)
- )[
- 0
- ][
- 0
- ]
+ )[0][0]
else:
table_definition_rows = list(
await self.execute(
|
Undid some slightly weird code formatting by 'black'
|
diff --git a/phat-gui/src/main/java/phat/gui/logging/PrettyLogViewerPanel.java b/phat-gui/src/main/java/phat/gui/logging/PrettyLogViewerPanel.java
index <HASH>..<HASH> 100644
--- a/phat-gui/src/main/java/phat/gui/logging/PrettyLogViewerPanel.java
+++ b/phat-gui/src/main/java/phat/gui/logging/PrettyLogViewerPanel.java
@@ -76,6 +76,8 @@ public class PrettyLogViewerPanel extends JPanel {
for (int k = arg0.getFirstRow(); k <= arg0.getLastRow(); k++) {
String agent = tableModel.getValueAt(k, 2).toString();
String simtime = tableModel.getValueAt(k, 1).toString();
+ //removes the date from simtime string
+ simtime = simtime.split("-")[0];
String action = tableModel.getValueAt(k, 4).toString();
String type = tableModel.getValueAt(k, 5).toString();
String description = "";
|
Sim date is no longer showed on action preview
|
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index <HASH>..<HASH> 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -219,7 +219,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
protected function tearDown()
{
$conn = static::$_sharedConn;
- $platform = $this->_em->getConnection()->getDatabasePlatform();
+ $platform = $conn->getDatabasePlatform();
$this->_sqlLoggerStack->enabled = false;
|
Fixed identifier quoting in functional tests.
|
diff --git a/scenarios/kubernetes_e2e.py b/scenarios/kubernetes_e2e.py
index <HASH>..<HASH> 100755
--- a/scenarios/kubernetes_e2e.py
+++ b/scenarios/kubernetes_e2e.py
@@ -329,7 +329,7 @@ if __name__ == '__main__':
PARSER.add_argument(
'--soak-test', action='store_true', help='If the test is a soak test job')
PARSER.add_argument(
- '--tag', default='v20170225-b97ce6de', help='Use a specific kubekins-e2e tag if set')
+ '--tag', default='v20170227-4ae05be9', help='Use a specific kubekins-e2e tag if set')
PARSER.add_argument(
'--test', default='true', help='If we need to set --test in e2e.go')
PARSER.add_argument(
|
Update kubekins to <I>-4ae<I>be9
|
diff --git a/autopep8.py b/autopep8.py
index <HASH>..<HASH> 100755
--- a/autopep8.py
+++ b/autopep8.py
@@ -2248,7 +2248,9 @@ def is_python_file(filename):
def main():
"""Tool main."""
# Exit on broken pipe.
- signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+ if sys.platform != 'win32':
+ signal.signal(signal.SIGPIPE, signal.SIG_DFL)
try:
options, args = parse_args(sys.argv[1:])
|
SIGPIPE is not available on Windows
|
diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js
index <HASH>..<HASH> 100644
--- a/src/ol/renderer/canvas/VectorLayer.js
+++ b/src/ol/renderer/canvas/VectorLayer.js
@@ -224,7 +224,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
const multiWorld = vectorSource.getWrapX() && projection.canWrapX();
const worldWidth = multiWorld ? getWidth(projectionExtent) : null;
const endWorld = multiWorld
- ? Math.ceil((extent[2] + projectionExtent[2]) / worldWidth)
+ ? Math.ceil((extent[2] - projectionExtent[2]) / worldWidth) + 1
: 1;
let world = multiWorld
? Math.floor((extent[0] - projectionExtent[0]) / worldWidth)
|
Fix end world calculation if projection is not symmetric
|
diff --git a/volume/delete.go b/volume/delete.go
index <HASH>..<HASH> 100644
--- a/volume/delete.go
+++ b/volume/delete.go
@@ -59,7 +59,9 @@ func (p *nfsProvisioner) ganeshaUnexport(volume *v1.PersistentVolume) error {
return fmt.Errorf("PV doesn't have an annotation %s, can't remove the export from the server", annExportId)
}
exportId, _ := strconv.ParseUint(ann, 10, 16)
+ p.mapMutex.Lock()
delete(p.exportIds, uint16(exportId))
+ p.mapMutex.Unlock()
// Call RemoveExport using dbus
conn, err := dbus.SystemBus()
@@ -90,7 +92,9 @@ func (p *nfsProvisioner) kernelUnexport(volume *v1.PersistentVolume) error {
if ann, ok := volume.Annotations[annExportId]; ok {
// If PV doesn't have this annotation it's no big deal for knfs
exportId, _ := strconv.ParseUint(ann, 10, 16)
+ p.mapMutex.Lock()
delete(p.exportIds, uint16(exportId))
+ p.mapMutex.Unlock()
}
line, ok := volume.Annotations[annLine]
|
Lock deletion from map just in case...
|
diff --git a/boolean/boolean.py b/boolean/boolean.py
index <HASH>..<HASH> 100644
--- a/boolean/boolean.py
+++ b/boolean/boolean.py
@@ -507,7 +507,7 @@ class Expression(object):
Include recursively subexpressions symbols.
This includes duplicates.
"""
- return [s for s in self.literals if isinstance(s, Symbol)]
+ return [s for s in self.get_literals() if isinstance(s, Symbol)]
@property
def symbols(self,):
|
Ensure that symbols are returned in a stable order.
|
diff --git a/src/main/java/org/iq80/leveldb/table/TableBuilder.java b/src/main/java/org/iq80/leveldb/table/TableBuilder.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/iq80/leveldb/table/TableBuilder.java
+++ b/src/main/java/org/iq80/leveldb/table/TableBuilder.java
@@ -76,7 +76,7 @@ public class TableBuilder
public long getFileSize()
throws IOException
{
- return fileChannel.position();
+ return fileChannel.position() + dataBlockBuilder.currentSizeEstimate();
}
public void add(BlockEntry blockEntry)
|
Include unwritten block in TableBuilder.getFileSize() estimate
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -25,6 +25,7 @@ exports.register = function(plugin, options, next) {
host: options.host || 'localhost',
dialect: options.dialect || 'mysql',
port: options.port || 3306,
+ storage: options.storage || '',
define: options.defaults || {}
});
|
Added storage option in object passed to Sequelize
Added storage option in object passed to Sequelize for the sqlite dialect
|
diff --git a/pycbc/filter/matchedfilter.py b/pycbc/filter/matchedfilter.py
index <HASH>..<HASH> 100644
--- a/pycbc/filter/matchedfilter.py
+++ b/pycbc/filter/matchedfilter.py
@@ -169,6 +169,26 @@ def sigma(htilde, psd = None, low_frequency_cutoff=None,
return sqrt(sigmasq(htilde, psd, low_frequency_cutoff, high_frequency_cutoff))
def get_cutoff_indices(flow, fhigh, df, N):
+ """
+ Gets the indices of a frequency series at which to stop an overlap calculation.
+
+ Parameters
+ ----------
+ flow: float
+ The frequency (in Hz) of the lower index.
+ fhigh: float
+ The frequency (in Hz) of the upper index.
+ df: float
+ The frequency step (in Hz) of the frequency series.
+ N: int
+ The number of points in the **time** series. Can be odd
+ or even.
+
+ Returns
+ -------
+ kmin: int
+ kmax: int
+ """
if flow:
kmin = int(flow / df)
else:
@@ -176,7 +196,9 @@ def get_cutoff_indices(flow, fhigh, df, N):
if fhigh:
kmax = int(fhigh / df )
else:
- kmax = N/2 + 1
+ # int() truncates towards 0, so this is
+ # equivalent to the floor of the float
+ kmax = int((N + 1)/2.)
return kmin,kmax
|
Apply matchedfilter nyquist bug fix from Collin as reported in <URL>
|
diff --git a/lib/slingshot/results/item.rb b/lib/slingshot/results/item.rb
index <HASH>..<HASH> 100644
--- a/lib/slingshot/results/item.rb
+++ b/lib/slingshot/results/item.rb
@@ -7,7 +7,7 @@ module Slingshot
# and leaving everything else alone.
#
def initialize(args={})
- if args.is_a? Hash
+ if args.respond_to?(:each_pair)
args.each_pair do |key, value|
self[key.to_sym] = value.is_a?(Hash) ? self.class.new(value) : value
end
|
[REFACTORING] Use message based type testing in Results::Item
|
diff --git a/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php b/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
+++ b/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
@@ -368,7 +368,29 @@ class SqlServerGrammar extends Grammar
*/
public function supportsSavepoints()
{
- return false;
+ return true;
+ }
+
+ /**
+ * Compile the SQL statement to define a savepoint.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function compileSavepoint($name)
+ {
+ return 'SAVE TRANSACTION '.$name;
+ }
+
+ /**
+ * Compile the SQL statement to execute a savepoint rollback.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function compileSavepointRollBack($name)
+ {
+ return 'ROLLBACK TRANSACTION '.$name;
}
/**
|
Added nested transactions support for SqlServer (#<I>)
|
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index <HASH>..<HASH> 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -468,7 +468,7 @@ function quiz_print_question($number, $questionid, $grade, $courseid,
foreach ($answerids as $key => $answerid) {
$answer = $answers[$answerid];
- $qnum = $key + 1;
+ $qnumchar = chr(ord('a') + $key);
if (empty($feedback) or empty($response[$answerid])) {
$checked = "";
@@ -483,9 +483,9 @@ function quiz_print_question($number, $questionid, $grade, $courseid,
}
echo "</TD>";
if (empty($feedback) or empty($correct[$answer->id])) {
- echo "<TD valign=top>$qnum. $answer->answer</TD>";
+ echo "<TD valign=top>$qnumchar. $answer->answer</TD>";
} else {
- echo "<TD valign=top CLASS=highlight>$qnum. $answer->answer</TD>";
+ echo "<TD valign=top CLASS=highlight>$qnumchar. $answer->answer</TD>";
}
if (!empty($feedback)) {
echo "<TD valign=top> ";
|
Change MC answers to letters a, b, c etc ...
|
diff --git a/glue/ligolw/dbtables.py b/glue/ligolw/dbtables.py
index <HASH>..<HASH> 100644
--- a/glue/ligolw/dbtables.py
+++ b/glue/ligolw/dbtables.py
@@ -494,9 +494,9 @@ class SearchSummaryTable(DBTable):
for row in self:
if process_ids is None or row.process_id in process_ids:
if "," in row.ifos:
- ifos = row.ifos.split(",")
+ ifos = map(str.strip, row.ifos.split(","))
elif "+" in row.ifos:
- ifos = row.ifos.split("+")
+ ifos = map(str.strip, row.ifos.split("+"))
else:
ifos = [row.ifos]
seglists |= segments.segmentlistdict([(ifo, segments.segmentlist([row.get_out()])) for ifo in ifos])
|
In SearchSummaryTable.get_out_segmentlistdict(), strip white space from the
start and stop of comma- and plus-delimited instrument names.
|
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
index <HASH>..<HASH> 100755
--- a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
+++ b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
@@ -145,13 +145,15 @@ public class OStorageRemote extends OStorageAbstract implements OStorageProxy {
do {
OChannelBinaryAsynchClient network = null;
String serverUrl = getNextAvailableServerURL(false, session);
- try {
- network = getNetwork(serverUrl);
- } catch (OException e) {
- serverUrl = useNewServerURL(serverUrl);
- if (serverUrl == null)
- throw e;
- }
+ do {
+ try {
+ network = getNetwork(serverUrl);
+ } catch (OException e) {
+ serverUrl = useNewServerURL(serverUrl);
+ if (serverUrl == null)
+ throw e;
+ }
+ } while (network == null);
try {
// In case i do not have a token or i'm switching between server i've to execute a open operation.
|
fixed retry in case of an offline server
|
diff --git a/spec/ethon/easies/http/action_spec.rb b/spec/ethon/easies/http/action_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/ethon/easies/http/action_spec.rb
+++ b/spec/ethon/easies/http/action_spec.rb
@@ -4,8 +4,22 @@ describe Ethon::Easies::Http::Action do
let(:easy) { Ethon::Easy.new }
describe ".reset" do
- let(:action) { Ethon::Easies::Http::Action }
- before { action.reset(easy) }
+ before do
+ easy.url = "abc"
+ easy.httpget = 1
+ easy.httppost = 1
+ easy.upload = 1
+ easy.nobody = 1
+ easy.customrequest = 1
+ easy.postfieldsize = 1
+ easy.copypostfields = 1
+ easy.infilesize = 1
+ described_class.reset(easy)
+ end
+
+ it "unsets url" do
+ easy.url.should be_nil
+ end
it "unsets httpget" do
easy.httpget.should be_nil
@@ -26,5 +40,17 @@ describe Ethon::Easies::Http::Action do
it "unsets custom_request" do
easy.customrequest.should be_nil
end
+
+ it "unsets postfieldsize" do
+ easy.postfieldsize.should be_nil
+ end
+
+ it "unsets copypostfields" do
+ easy.copypostfields.should be_nil
+ end
+
+ it "unsets infilesize" do
+ easy.infilesize.should be_nil
+ end
end
end
|
Add more specs for Action.reset.
|
diff --git a/BackofficeBundle/Resources/public/js/backboneRouter.js b/BackofficeBundle/Resources/public/js/backboneRouter.js
index <HASH>..<HASH> 100644
--- a/BackofficeBundle/Resources/public/js/backboneRouter.js
+++ b/BackofficeBundle/Resources/public/js/backboneRouter.js
@@ -103,7 +103,7 @@ var OrchestraBORouter = Backbone.Router.extend({
mediaEdit: function(folderId, mediaId)
{
- this.initDisplayRouteChanges();
+ this.initDisplayRouteChanges('#' + folderId);
$.ajax({
url: 'http://openorchestra.dev/app_dev.php/api/media/' + mediaId,
@@ -221,7 +221,7 @@ var OrchestraBORouter = Backbone.Router.extend({
return route;
},
-
+
addParametersToRoute: function(options)
{
var Router = this,
|
[ci skip] Fix menu and poucet on F5
|
diff --git a/lib/mpd_client.rb b/lib/mpd_client.rb
index <HASH>..<HASH> 100644
--- a/lib/mpd_client.rb
+++ b/lib/mpd_client.rb
@@ -53,7 +53,6 @@ module MPD
'deleteid' => 'fetch_nothing',
'move' => 'fetch_nothing',
'moveid' => 'fetch_nothing',
- 'playlist' => 'fetch_playlist',
'playlistfind' => 'fetch_songs',
'playlistid' => 'fetch_songs',
'playlistinfo' => 'fetch_songs',
@@ -321,22 +320,22 @@ module MPD
line
end
- def read_pair(separator)
+ def read_pair
line = read_line
return if line.nil?
- line.split(separator, 2)
+ line.split(': ', 2)
end
- def read_pairs(separator = ': ')
+ def read_pairs
result = []
- pair = read_pair(separator)
+ pair = read_pair
while pair
result << pair
- pair = read_pair(separator)
+ pair = read_pair
end
result
@@ -475,17 +474,6 @@ module MPD
fetch_objects(['playlist'])
end
- def fetch_playlist
- result = []
-
- read_pairs(':').each do |_key, value|
- value = value.chomp.force_encoding('utf-8')
- result << value
- end
-
- result
- end
-
def fetch_stickers
result = []
|
remove playlist command, instead use playlistinfo
|
diff --git a/test/unquote-properties-test.js b/test/unquote-properties-test.js
index <HASH>..<HASH> 100644
--- a/test/unquote-properties-test.js
+++ b/test/unquote-properties-test.js
@@ -11,4 +11,7 @@ var x = {
'class': 9,
1: 10,
'2': 11,
+ [Math.random()]() { return 'oh no'; },
+ [Math.random()]: 13,
+ ['quoted computed prop']: 14,
};
diff --git a/test/unquote-properties-test.output.js b/test/unquote-properties-test.output.js
index <HASH>..<HASH> 100644
--- a/test/unquote-properties-test.output.js
+++ b/test/unquote-properties-test.output.js
@@ -11,4 +11,7 @@ var x = {
class: 9,
1: 10,
2: 11,
+ [Math.random()]() { return 'oh no'; },
+ [Math.random()]: 13,
+ ['quoted computed prop']: 14,
};
|
Add computed property test cases for unquote-properties transform.
|
diff --git a/src/FontAwesome.php b/src/FontAwesome.php
index <HASH>..<HASH> 100755
--- a/src/FontAwesome.php
+++ b/src/FontAwesome.php
@@ -156,7 +156,7 @@ class FontAwesome
* @return $this
* @throws InvalidArgumentException
*/
- public function attr($attr, $val)
+ public function addAttr($attr, $val)
{
if (is_string($attr) == false || is_string($val) === false) {
throw new InvalidArgumentException();
@@ -175,7 +175,7 @@ class FontAwesome
* @return $this
* @throws InvalidArgumentException
*/
- public function attrs(array $attrs)
+ public function addAttrs(array $attrs)
{
foreach ($attrs as $attr => $val) {
$this->attr($attr, $val);
|
Changing method names to include "add"
|
diff --git a/lib/SDPManagerUnified.js b/lib/SDPManagerUnified.js
index <HASH>..<HASH> 100644
--- a/lib/SDPManagerUnified.js
+++ b/lib/SDPManagerUnified.js
@@ -339,18 +339,22 @@ class SDPManagerUnified extends SDPManager
};
else
//Update media info
- transceiver.remote = mediaInfo;
+ transceiver.remote.info = mediaInfo;
//Next transceiver
i++;
+ //If we had a remote track they are different
+ if (transceiver.remote.track && transceiver.remote.track!=track)
+ {
+ //Stop it
+ transceiver.remote.track.stop();
+ //Delete it from transceiver
+ delete (transceiver.remote.track);
+ }
//Check new direction for remote stuff
switch(mediaInfo.getDirection())
{
case Direction.SENDRECV:
case Direction.SENDONLY:
- //If we had one nd they are different
- if (transceiver.remote.track && transceiver.remote.track!=track)
- //Stop it
- transceiver.remote.track.stop();
//If we don't have stream
if (!stream)
{
|
Tentative fix for remote track removal
|
diff --git a/h2o-persist-hdfs/src/main/java/water/persist/PersistHdfs.java b/h2o-persist-hdfs/src/main/java/water/persist/PersistHdfs.java
index <HASH>..<HASH> 100644
--- a/h2o-persist-hdfs/src/main/java/water/persist/PersistHdfs.java
+++ b/h2o-persist-hdfs/src/main/java/water/persist/PersistHdfs.java
@@ -295,10 +295,9 @@ public final class PersistHdfs extends Persist {
}
private static void addFolder(FileSystem fs, Path p, ArrayList<String> keys, ArrayList<String> failed) {
+ if (fs == null) return;
+ Futures futures = new Futures();
try {
- if( fs == null ) return;
-
- Futures futures = new Futures();
for( FileStatus file : fs.listStatus(p, HIDDEN_FILE_FILTER) ) {
Path pfs = file.getPath();
if(file.isDirectory()) {
@@ -312,6 +311,8 @@ public final class PersistHdfs extends Persist {
} catch( Exception e ) {
Log.err(e);
failed.add(p.toString());
+ } finally {
+ futures.blockForPending();
}
}
|
PUBDEV-<I>: Fix a race condition in Hdfs file import
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -21,7 +21,7 @@ if (pathlib.existsSync('server/rpc/middleware')) {
" /server/rpc/actions to /server/rpc\n\n" +
"so that websocket middleware can be used by other websocket responders (including forthcoming models).\n" +
"Please make this change to your existing project now then restart the server. Pasting this line into a UNIX-based shell should do the trick:\n\n" +
- " mv server/rpc/middleware server && mv server/rpc/actions/* server/rpc/ && rm -d server/rpc/actions\n" + bar);
+ " mv server/rpc/middleware server && mv server/rpc/actions/* server/rpc/ && rm -fr server/rpc/actions\n" + bar);
throw new Error("Please paste the line above into the shell then restart the server");
}
|
prevents command failing on osx because of .DS_Store
|
diff --git a/lib/pretty_diff/chunk.rb b/lib/pretty_diff/chunk.rb
index <HASH>..<HASH> 100644
--- a/lib/pretty_diff/chunk.rb
+++ b/lib/pretty_diff/chunk.rb
@@ -21,7 +21,14 @@ module PrettyDiff
def find_lines
[].tap do |lines|
- wdiff(contents.split(/\r?\n|\r/)).each do |line_str|
+ plain_lines = contents.split(/\r?\n|\r/)
+ wdiff(contents.split(/\r?\n|\r/)).each_with_index do |line_str, idx|
+ begin
+ line_str =~ //
+ rescue ArgumentError
+ line_str = plain_lines[idx]
+ end
+
line = Line.new(self, line_str)
next if line.ignored?
lines << line
|
Experimental fix for per-word diffing that sometimes botches string encoding
|
diff --git a/sprd/entity/SpecialTextConfiguration.js b/sprd/entity/SpecialTextConfiguration.js
index <HASH>..<HASH> 100644
--- a/sprd/entity/SpecialTextConfiguration.js
+++ b/sprd/entity/SpecialTextConfiguration.js
@@ -14,7 +14,7 @@ define(['sprd/entity/DesignConfigurationBase', "sprd/util/ProductUtil", "js/core
align: "center",
initialized: false,
commission: null,
-
+ alignmentMatters: null,
renderedText: null,
renderedFontId: null,
renderedAlign: null,
|
DEV-<I> made the conversion of regular text to fancy text to propagate and conserve the alignmentMatters flag
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ requirements = [
'dill>0.2',
'sphinx',
'cython',
- 'ipython==4.0.0',
+ 'ipython>=4.0.0',
'ipyparallel',
'ipykernel>=4.1',
'jupyter',
|
ipython <I> seems ok
|
diff --git a/modules/directives/date/date.js b/modules/directives/date/date.js
index <HASH>..<HASH> 100644
--- a/modules/directives/date/date.js
+++ b/modules/directives/date/date.js
@@ -37,7 +37,9 @@ angular.module('ui.directives')
var userHandler = opts.onSelect;
opts.onSelect = function (value, picker) {
updateModel();
- return userHandler(value, picker);
+ scope.$apply(function() {
+ userHandler(value, picker);
+ });
};
} else {
// No onSelect already specified so just update the model
|
Fix missing scope.$apply() for user onSelect event
|
diff --git a/graphics/dotplot.py b/graphics/dotplot.py
index <HASH>..<HASH> 100755
--- a/graphics/dotplot.py
+++ b/graphics/dotplot.py
@@ -31,7 +31,7 @@ from jcvi.compara.synteny import AnchorFile, batch_scan, check_beds
from jcvi.utils.cbook import seqid_parse, thousands
from jcvi.apps.base import OptionParser
from jcvi.graphics.base import plt, Rectangle, cm, set_human_axis, savefig, \
- draw_cmap, TextHandler
+ draw_cmap, TextHandler, latex
class Palette (dict):
@@ -197,14 +197,14 @@ def dotplot(anchorfile, qbed, sbed, fig, root, ax, vmin=0, vmax=1,
for label, pos, fontsize in xchr_labels:
pos = .1 + pos * .8 / xsize
if fontsize >= minfont:
- root.text(pos, .91, label, size=fontsize,
+ root.text(pos, .91, latex(label), size=fontsize,
ha="center", va="bottom", rotation=45, color="grey")
# remember y labels are inverted
for label, pos, fontsize in ychr_labels:
pos = .9 - pos * .8 / ysize
if fontsize >= minfont:
- root.text(.91, pos, label, size=fontsize,
+ root.text(.91, pos, latex(label), size=fontsize,
va="center", color="grey")
# create a diagonal to separate mirror image for self comparison
|
make sure the labels don't crash the dotplot PDF
|
diff --git a/media/boom/js/boom.page.js b/media/boom/js/boom.page.js
index <HASH>..<HASH> 100755
--- a/media/boom/js/boom.page.js
+++ b/media/boom/js/boom.page.js
@@ -569,6 +569,13 @@ $.extend($.boom.page, {
$this
.attr( 'tabindex', '0' )
.unbind('click mouseenter mouseleave')
+ .on( 'keydown', function( event ){
+ switch( event.which ) {
+ case 13:
+ $this.click();
+ break;
+ }
+ })
.one( 'click', function(event){
//event.target = this;
|
open the chunk editor when enter is pressed
|
diff --git a/backend/__8bit.py b/backend/__8bit.py
index <HASH>..<HASH> 100644
--- a/backend/__8bit.py
+++ b/backend/__8bit.py
@@ -165,6 +165,9 @@ def _add8(ins):
output.append('push af')
return output
+ if op2[0] == '_': # stack optimization
+ op1, op2 = op2, op1
+
output = _8bit_oper(op1, op2)
output.append('add a, h')
output.append('push af')
|
Optimization: ADD8
Optimized, so it rearranges the stack when the 2nd
operand is an identifier.
|
diff --git a/lib/health_graph/models/user.rb b/lib/health_graph/models/user.rb
index <HASH>..<HASH> 100644
--- a/lib/health_graph/models/user.rb
+++ b/lib/health_graph/models/user.rb
@@ -23,7 +23,7 @@ module HealthGraph
HealthGraph::SleepFeed.new self.access_token, self.body["sleep"]
end
- def fitness_activities params
+ def fitness_activities params = {}
HealthGraph::FitnessActivitiesFeed.new self.access_token, self.body["fitness_activities"], params
end
|
default params on fitness_activities fetch
|
diff --git a/lib/graphql/client.rb b/lib/graphql/client.rb
index <HASH>..<HASH> 100644
--- a/lib/graphql/client.rb
+++ b/lib/graphql/client.rb
@@ -48,8 +48,6 @@ module GraphQL
case schema
when GraphQL::Schema
schema
- when GraphQL::Query::Result
- load_schema(schema.to_h)
when Hash
GraphQL::Schema::Loader.load(schema)
when String
@@ -59,7 +57,13 @@ module GraphQL
load_schema(JSON.parse(schema))
end
else
- load_schema(dump_schema(schema)) if schema.respond_to?(:execute)
+ if schema.respond_to?(:execute)
+ load_schema(dump_schema(schema))
+ elsif schema.respond_to?(:to_h)
+ load_schema(schema.to_h)
+ else
+ nil
+ end
end
end
|
Avoid constant reference to support old graphql versions
|
diff --git a/providers/providers_manager.go b/providers/providers_manager.go
index <HASH>..<HASH> 100644
--- a/providers/providers_manager.go
+++ b/providers/providers_manager.go
@@ -102,17 +102,17 @@ type getProv struct {
// NewProviderManager constructor
func NewProviderManager(ctx context.Context, local peer.ID, dstore ds.Batching, opts ...Option) (*ProviderManager, error) {
- var options options
- if err := options.apply(append([]Option{defaults}, opts...)...); err != nil {
+ var cfg options
+ if err := cfg.apply(append([]Option{defaults}, opts...)...); err != nil {
return nil, err
}
pm := new(ProviderManager)
pm.getprovs = make(chan *getProv)
pm.newprovs = make(chan *addProv)
pm.dstore = autobatch.NewAutoBatching(dstore, batchBufferSize)
- pm.cache = options.cache
+ pm.cache = cfg.cache
pm.proc = goprocessctx.WithContext(ctx)
- pm.cleanupInterval = options.cleanupInterval
+ pm.cleanupInterval = cfg.cleanupInterval
pm.proc.Go(pm.run)
return pm, nil
}
|
refactor: rename to cfg
|
diff --git a/test/asserts.js b/test/asserts.js
index <HASH>..<HASH> 100644
--- a/test/asserts.js
+++ b/test/asserts.js
@@ -6,7 +6,7 @@ var _ = require('lodash-node')
var asserts = {
assertTrue: function (value, message) {
- if (!value) {
+ if (value !== true) {
throw new AssertionError(message, {}, asserts.assertTrue);
}
},
@@ -17,7 +17,7 @@ var asserts = {
}
},
assertFalse: function (value, message) {
- if (value) {
+ if (value !== false) {
throw new AssertionError(message, {}, asserts.assertFalse);
}
},
|
Primitive asserts test more specific
|
diff --git a/lib/i18n/tasks/scanners/ruby_ast_scanner.rb b/lib/i18n/tasks/scanners/ruby_ast_scanner.rb
index <HASH>..<HASH> 100644
--- a/lib/i18n/tasks/scanners/ruby_ast_scanner.rb
+++ b/lib/i18n/tasks/scanners/ruby_ast_scanner.rb
@@ -40,7 +40,7 @@ module I18n::Tasks::Scanners
@parser.parse(make_buffer(path, comment.text.sub(MAGIC_COMMENT_PREFIX, '').split(/\s+(?=t)/).join('; ')))
) do |send_node, _method_name|
# method_name is not available at this stage
- send_node_to_key_occurrence(send_node, nil, location: associated_node || comment)
+ send_node_to_key_occurrence(send_node, nil, location: associated_node || comment.location)
end
end
rescue Exception => e
|
AST Scanner: fix magic comment location reporting
|
diff --git a/tests/QueryWhereTests.php b/tests/QueryWhereTests.php
index <HASH>..<HASH> 100644
--- a/tests/QueryWhereTests.php
+++ b/tests/QueryWhereTests.php
@@ -83,7 +83,8 @@ class QueryWhereTests extends PHPUnit_Framework_TestCase
public function testOrWhere()
{
$this->query->where('name', 'John')
- ->orWhere('name', 'Steve');
+ ->orWhere('name', 'Steve')
+ ->orWhere(array('name' => 'Jack', 'surname' => 'Johnes'));
$expected = array(
'$or' => array(
@@ -96,6 +97,16 @@ class QueryWhereTests extends PHPUnit_Framework_TestCase
'$and' => array(
array('name' => 'Steve'),
)
+ ),
+ array(
+ '$and' => array(
+ array('name' => 'Jack'),
+ )
+ ),
+ array(
+ '$and' => array(
+ array('surname' => 'Johnes'),
+ )
)
)
);
|
Added some tests for where clauses supplied as arrays
|
diff --git a/lib/mongodb/gridfs/gridstore.js b/lib/mongodb/gridfs/gridstore.js
index <HASH>..<HASH> 100644
--- a/lib/mongodb/gridfs/gridstore.js
+++ b/lib/mongodb/gridfs/gridstore.js
@@ -112,7 +112,7 @@ GridStore.prototype.write = function(string, close, callback) {
var previousChunkNumber = self.currentChunk.chunkNumber;
var leftOverDataSize = self.chunkSize - self.currentChunk.position;
var previousChunkData = string.substr(0, leftOverDataSize);
- var leftOverData = string.substr(leftOverData, (string.length - leftOverDataSize));
+ var leftOverData = string.substr(leftOverDataSize, (string.length - leftOverDataSize));
// Let's finish the current chunk and then call write again for the remaining data
self.currentChunk.write(previousChunkData, function(err, chunk) {
chunk.save(function(err, result) {
|
Fixed bug with multiple writes of the first chunk
|
diff --git a/test/test_reader.py b/test/test_reader.py
index <HASH>..<HASH> 100644
--- a/test/test_reader.py
+++ b/test/test_reader.py
@@ -99,3 +99,26 @@ def test_type(tmp_path):
lines = list(reader.FortranReader(filename, docmark="!"))
assert lines == expected
+
+
+def test_unknown_include(tmp_path):
+ """Check that `include "file.h"` ignores unknown files"""
+
+ data = """\
+ program test
+ include "file.h"
+ end program test
+ """
+
+ expected = [
+ "program test",
+ 'include "file.h"',
+ "end program test",
+ ]
+
+ filename = tmp_path / "test.f90"
+ with open(filename, "w") as f:
+ f.write(data)
+
+ lines = list(reader.FortranReader(filename, docmark="!"))
+ assert lines == expected
|
Add unit test for ignoring unknown files in `include`
|
diff --git a/pyiso.py b/pyiso.py
index <HASH>..<HASH> 100644
--- a/pyiso.py
+++ b/pyiso.py
@@ -1629,9 +1629,6 @@ class PyIso(object):
if not self.initialized:
raise Exception("This object is not yet initialized; call either open() or new() to create an ISO")
- if self.pvd is None:
- raise Exception("This object does not have a Primary Volume Descriptor yet")
-
if not overwrite and os.path.exists(outpath):
raise Exception("Output file already exists")
|
Remove a redundant check from write()
|
diff --git a/master/buildbot/scripts/base.py b/master/buildbot/scripts/base.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/scripts/base.py
+++ b/master/buildbot/scripts/base.py
@@ -229,7 +229,7 @@ class SubcommandOptions(usage.Options):
raise
break
- for k in localDict.keys():
+ for k in list(localDict.keys()): # pylint: disable=consider-iterating-dictionary
if k.startswith("__"):
del localDict[k]
return localDict
|
pylint: disable warning
|
diff --git a/beta/beta.js b/beta/beta.js
index <HASH>..<HASH> 100644
--- a/beta/beta.js
+++ b/beta/beta.js
@@ -1,3 +1,7 @@
+/**
+ * Documentation is not available as this is only in beta and it may change at any time.
+ */
+
var irc = require('twitch-irc');
var client = new irc.client({
|
Added header to the beta example.
|
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/engine/QueryEngine.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/engine/QueryEngine.java
index <HASH>..<HASH> 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/engine/QueryEngine.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/engine/QueryEngine.java
@@ -102,7 +102,7 @@ public class QueryEngine {
} else {
error = new QueryError(query, cause);
}
- LOG.error("Running query {} failed: {}", query.id(), cause);
+ LOG.debug("Running query {} failed: {}", query.id(), cause);
searchJob.addError(error);
return QueryResult.failedQueryWithError(query, error);
}
|
Degrading query errors to `debug` instead of `error`.
These can be related to invalid queries posted against the API, so they
are not a general indicator of server malfunctioning.
|
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index <HASH>..<HASH> 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -86,7 +86,10 @@ function reload_user_preferences() {
foreach ($preferences as $preference) {
$USER->preference[$preference->name] = $preference->value;
}
- }
+ } else {
+ //return empty preference array to hold new values
+ $USER->preference = array();
+ }
}
function set_user_preference($name, $value, $user=NULL) {
@@ -388,7 +391,7 @@ function require_login($courseid=0, $autologinguest=true) {
// check whether the user should be changing password
reload_user_preferences();
- if ($USER->preference['auth_forcepasswordchange']){
+ if (isset($USER->preference['auth_forcepasswordchange'])){
if (is_internal_auth() || $CFG->{'auth_'.$USER->auth.'_stdchangepassword'}){
redirect("$CFG->wwwroot/login/change_password.php");
} elseif($CFG->changepassword) {
|
To fix problems with auth_forcepasswordchange
|
diff --git a/elasticsearch-dsl/test/integration/search_aggregations_test.rb b/elasticsearch-dsl/test/integration/search_aggregations_test.rb
index <HASH>..<HASH> 100644
--- a/elasticsearch-dsl/test/integration/search_aggregations_test.rb
+++ b/elasticsearch-dsl/test/integration/search_aggregations_test.rb
@@ -186,10 +186,10 @@ module Elasticsearch
response = @client.search index: 'test', body: search {
aggregation :clicks_for_one do
scripted_metric do
- init_script "params._agg.transactions = []"
- map_script "if (doc['tags'].value.contains('one')) { params._agg.transactions.add(doc['clicks'].value) }"
- combine_script "double sum = 0; for (t in params._agg.transactions) { sum += t } return sum"
- reduce_script "double sum = 0; for (a in params._aggs) { sum += a } return sum"
+ init_script "state._agg.transactions = []"
+ map_script "if (doc['tags'].value.contains('one')) { state._agg.transactions.add(doc['clicks'].value) }"
+ combine_script "double sum = 0; for (t in state._agg.transactions) { sum += t } return sum"
+ reduce_script "double sum = 0; for (a in state._aggs) { sum += a } return sum"
end
end
}.to_hash
|
[DSL] Update agg scripted metric test for deprecation in ES issue #<I>
|
diff --git a/settings/cache.settings.php b/settings/cache.settings.php
index <HASH>..<HASH> 100644
--- a/settings/cache.settings.php
+++ b/settings/cache.settings.php
@@ -5,10 +5,6 @@
* Contains caching configuration.
*/
-if ($is_ah_env) {
- switch ($ah_env) {
- case 'prod':
- $config['system.logging']['error_level'] = 'hide';
- break;
- }
+if ($is_prod_env || $is_stage_env) {
+ $config['system.logging']['error_level'] = 'hide';
}
|
Make caching configuration hosting provider agnostic. (#<I>)
|
diff --git a/speech-to-text/v1.js b/speech-to-text/v1.js
index <HASH>..<HASH> 100644
--- a/speech-to-text/v1.js
+++ b/speech-to-text/v1.js
@@ -455,7 +455,7 @@ SpeechToTextV1.prototype.createCustomization = function(params, callback) {
```
*
* @param {Object} params The parameters
- * @param {String} [params.language] optional filter. Currently only en-US is supported.
+ * @param {String} [params.language] optional filter.
* @param {Function} callback
*/
SpeechToTextV1.prototype.getCustomizations = function(params, callback) {
diff --git a/text-to-speech/v1.js b/text-to-speech/v1.js
index <HASH>..<HASH> 100644
--- a/text-to-speech/v1.js
+++ b/text-to-speech/v1.js
@@ -146,7 +146,7 @@ TextToSpeechV1.prototype.pronunciation = function(params, callback) {
*
* @param {Object} params
* @param {String} params.name
- * @param {String} [params.language=en-US] - Currently only en-US is supported
+ * @param {String} [params.language=en-US]
* @param {String} [params.description]
* @param {Function} callback
*/
|
removing outdated en-us only comments
|
diff --git a/src/Services/QueuedJobService.php b/src/Services/QueuedJobService.php
index <HASH>..<HASH> 100644
--- a/src/Services/QueuedJobService.php
+++ b/src/Services/QueuedJobService.php
@@ -713,7 +713,7 @@ class QueuedJobService
*/
protected function markStarted()
{
- if ($this->startedAt) {
+ if (!$this->startedAt) {
$this->startedAt = DBDatetime::now()->Format('U');
}
}
|
Fix markStarted not calculating timeout correctly
|
diff --git a/src/ORM/Association.php b/src/ORM/Association.php
index <HASH>..<HASH> 100644
--- a/src/ORM/Association.php
+++ b/src/ORM/Association.php
@@ -21,7 +21,6 @@ use Cake\Datasource\ResultSetDecorator;
use Cake\ORM\Locator\LocatorAwareTrait;
use Cake\ORM\Query;
use Cake\ORM\Table;
-use Cake\ORM\TableRegistry;
use Cake\Utility\Inflector;
use InvalidArgumentException;
use RuntimeException;
|
Remove unnessesary TableRegistry use statement.
|
diff --git a/src/terra/Command/Environment/EnvironmentProxyEnable.php b/src/terra/Command/Environment/EnvironmentProxyEnable.php
index <HASH>..<HASH> 100644
--- a/src/terra/Command/Environment/EnvironmentProxyEnable.php
+++ b/src/terra/Command/Environment/EnvironmentProxyEnable.php
@@ -20,7 +20,7 @@ class EnvironmentProxyEnable extends Command
protected function execute(InputInterface $input, OutputInterface $output)
{
$output->writeln('Hello Terra!');
- $cmd = 'docker run -d -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock:ro jwilder/nginx-proxy';
+ $cmd = 'docker run -d -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock:ro --security-opt label:disable jwilder/nginx-proxy';
$process = new Process($cmd);
$process->setTimeout(null);
|
Fixing URL proxy being blocked when using SELinux by adding a label to skip security.
|
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LiteralInterpreter.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LiteralInterpreter.java
index <HASH>..<HASH> 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/LiteralInterpreter.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/LiteralInterpreter.java
@@ -103,10 +103,10 @@ public final class LiteralInterpreter
if (value.isNaN()) {
return new FunctionCall(new QualifiedName("nan"), ImmutableList.<Expression>of());
}
- else if (value == Double.NEGATIVE_INFINITY) {
+ else if (value.equals(Double.NEGATIVE_INFINITY)) {
return new NegativeExpression(new FunctionCall(new QualifiedName("infinity"), ImmutableList.<Expression>of()));
}
- else if (value == Double.POSITIVE_INFINITY) {
+ else if (value.equals(Double.POSITIVE_INFINITY)) {
return new FunctionCall(new QualifiedName("infinity"), ImmutableList.<Expression>of());
}
else {
|
Use equals instead of == for Doubles in LiteralInterpreter
|
diff --git a/src/DefaultNode.php b/src/DefaultNode.php
index <HASH>..<HASH> 100644
--- a/src/DefaultNode.php
+++ b/src/DefaultNode.php
@@ -7,6 +7,7 @@ use NoTee\Exceptions\PathOutdatedException;
class DefaultNode implements Fertile, Node
{
+ public static $validateAttributeNames = true;
protected $tagName;
protected $attributes;
@@ -94,7 +95,7 @@ class DefaultNode implements Fertile, Node
private static function validateAttribute($key, $value)
{
- if(!static::isValidAttributeName($key)){
+ if(static::$validateAttributeNames && !static::isValidAttributeName($key)){
throw new \InvalidArgumentException("invalid attribute name $key");
}
if(in_array($key, static::$urlAttributes)) {
|
added switch for attribute name check for performance reasons
|
diff --git a/client/lib/abtest/active-tests.js b/client/lib/abtest/active-tests.js
index <HASH>..<HASH> 100644
--- a/client/lib/abtest/active-tests.js
+++ b/client/lib/abtest/active-tests.js
@@ -99,10 +99,10 @@ export default {
allowExistingUsers: true,
},
verticalSuggestedThemes: {
- datestamp: '20191011',
+ datestamp: '20191029',
variations: {
- control: 100,
- test: 0,
+ control: 90,
+ test: 10,
},
defaultVariation: 'control',
allowExistingUsers: true,
|
Enable vertical-suggested themes ab test (#<I>)
|
diff --git a/src/main/java/org/mockito/internal/exceptions/Reporter.java b/src/main/java/org/mockito/internal/exceptions/Reporter.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/mockito/internal/exceptions/Reporter.java
+++ b/src/main/java/org/mockito/internal/exceptions/Reporter.java
@@ -870,8 +870,8 @@ public class Reporter {
"Typically, stubbing argument mismatch indicates user mistake when writing tests.",
"In order to streamline debugging tests Mockito fails early in this scenario.",
"However, there are legit scenarios when this exception generates false negative signal:",
- " - stubbing the same method multiple times using 'given' or 'when' syntax",
- " Please use willReturn/doReturn API for stubbing",
+ " - stubbing the same method multiple times using 'given().will()' or 'when().then()' API",
+ " Please usew 'will().given()' or 'doReturn().when()' API for stubbing",
" - stubbed method is intentionally invoked with different arguments by code under test",
" Please use 'default' or 'silent' JUnit Rule.",
"For more information see javadoc for PotentialStubbingProblem class."));
|
Updated the exception message for clarity.
|
diff --git a/Service/EncryptionService.php b/Service/EncryptionService.php
index <HASH>..<HASH> 100644
--- a/Service/EncryptionService.php
+++ b/Service/EncryptionService.php
@@ -399,10 +399,12 @@ class EncryptionService
if ($keyData) {
$encryptedContent = $fileEntity->getContent();
- $encType = CryptographyProviderInterface::FILE_ENCRYPTION;
- $decryptedContent = $this->cryptographyProvider->decrypt($encryptedContent, $keyData, $encType);
+ if ($encryptedContent) {
+ $encType = CryptographyProviderInterface::FILE_ENCRYPTION;
+ $decryptedContent = $this->cryptographyProvider->decrypt($encryptedContent, $keyData, $encType);
- $fileEntity->setContent($decryptedContent);
+ $fileEntity->setContent($decryptedContent);
+ }
}
}
|
Check for the existence of the file before decrypting it
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -83,9 +83,11 @@ gulp.task('serve', 'starts a local webserver (--port specifies bound port)',
const server = gls.static(paths.dist.dir, port);
server.start();
gulp.watch([paths.dist.html], function(file) {
- /* eslint-disable */
- server.notify.apply(server, [file]);
- /* eslint-enable */
+ setTimeout(function() {
+ /* eslint-disable */
+ server.notify.apply(server, [file]);
+ /* eslint-enable */
+ }, 500);
});
});
|
Fix live-reload (#<I>)
Delay live reload for <I>ms after a file is changed to
make sure that all changes have been written to the file.
Fixes #<I>
|
diff --git a/tasks/test.js b/tasks/test.js
index <HASH>..<HASH> 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -56,7 +56,7 @@ module.exports = function(grunt) {
cmd: node, args: ['test/e2e/angular-scenario/server.js']
}, function() {});
}
-
+
grunt.log.writeln('Running ' + cmd + args.join(' '));
var child;
if (process.platform === 'win32') {
@@ -94,7 +94,8 @@ module.exports = function(grunt) {
// CLIENT unit tests
else if (this.target === 'client') {
- exec(which('testacular'), ['start', this.data, '--single-run', '--no-auto-watch', '--reporters=dots',
+ var cmd = path.join(__dirname, '..', 'bin', 'testacular');
+ exec(cmd, ['start', this.data, '--single-run', '--no-auto-watch', '--reporters=dots',
'--browsers=' + BROWSERS], 'Client unit tests failed.');
}
});
|
[fix] Depend only on itself not a global install of testacular for client tests.
This closes #<I>.
|
diff --git a/libkbfs/bcache.go b/libkbfs/bcache.go
index <HASH>..<HASH> 100644
--- a/libkbfs/bcache.go
+++ b/libkbfs/bcache.go
@@ -243,6 +243,11 @@ func (b *BlockCacheStandard) makeRoomForSize(size uint64, lifetime BlockCacheLif
func (b *BlockCacheStandard) PutWithPrefetch(
ptr BlockPointer, tlf tlf.ID, block Block, lifetime BlockCacheLifetime,
prefetchStatus PrefetchStatus) (err error) {
+ // We first check if the block shouldn't be cached, since CommonBlocks can
+ // take this path.
+ if lifetime == NoCacheEntry {
+ return nil
+ }
// Just in case we tried to cache a block type that shouldn't be cached,
// return an error. This is an insurance check. That said, this got rid of
// a flake in TestSBSConflicts, so we should still look for the underlying
@@ -259,9 +264,6 @@ func (b *BlockCacheStandard) PutWithPrefetch(
var wasInCache bool
switch lifetime {
- case NoCacheEntry:
- return nil
-
case TransientEntry:
// If it's the right type of block, store the hash -> ID mapping.
if fBlock, isFileBlock := block.(*FileBlock); b.ids != nil &&
|
bcache: Check for NoCacheEntry lifetime before checking for block types.
|
diff --git a/etc/eslint/rules/index.js b/etc/eslint/rules/index.js
index <HASH>..<HASH> 100644
--- a/etc/eslint/rules/index.js
+++ b/etc/eslint/rules/index.js
@@ -20,7 +20,8 @@ var rules = merge(
require( './variables.js' ),
require( './nodejs.js' ),
require( './style.js' ),
- require( './es2015.js' )
+ require( './es2015.js' ),
+ require( './stdlib.js')
);
|
Add stdlib rule configurations to index file
|
diff --git a/Services/TimetableManager.php b/Services/TimetableManager.php
index <HASH>..<HASH> 100644
--- a/Services/TimetableManager.php
+++ b/Services/TimetableManager.php
@@ -32,10 +32,11 @@ class TimetableManager
private function initAdditionalData($externalRouteId, $externalCoverageId)
{
$data = $this->navitia->getRouteData($externalRouteId, $externalCoverageId);
+ $embedded_type = $data->direction->embedded_type;
$lineConfig = $this->timetable->getLineConfig();
$this->lineManager->initTwigPath($lineConfig);
- $this->timetable->setTitle($data->direction->stop_point->name);
+ $this->timetable->setTitle($data->direction->$embedded_type->name);
}
/*
|
Request for direction title in layouts updated. (now we use embedded_type)
|
diff --git a/src/Framework/BaseWebApplication.php b/src/Framework/BaseWebApplication.php
index <HASH>..<HASH> 100644
--- a/src/Framework/BaseWebApplication.php
+++ b/src/Framework/BaseWebApplication.php
@@ -54,7 +54,7 @@ abstract class BaseWebApplication extends BaseConsoleApplication implements Fram
$this->debugBar['time']->stopMeasure('setup');
}
- private $debugBar;
+ protected $debugBar;
public function configureDebugBar()
{
@@ -176,7 +176,7 @@ abstract class BaseWebApplication extends BaseConsoleApplication implements Fram
$this->configureSpaceAndPermissionRoutes();
}
- private function configureSpaceAndPermissionRoutes()
+ protected function configureSpaceAndPermissionRoutes()
{
if (isset($this['spaceRepository'])) {
$loader = new YamlFileLoader(new FileLocator([__DIR__.'/..']));
@@ -188,7 +188,7 @@ abstract class BaseWebApplication extends BaseConsoleApplication implements Fram
}
}
- private function configureTemplateEngine()
+ protected function configureTemplateEngine()
{
$this['twig.loader.filesystem']->addPath(
$this->getThemePath(true),
|
Make BaseWebApplication methods protected vs private
|
diff --git a/src/main/java/org/getopentest/base/TestActor.java b/src/main/java/org/getopentest/base/TestActor.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/getopentest/base/TestActor.java
+++ b/src/main/java/org/getopentest/base/TestActor.java
@@ -1354,6 +1354,8 @@ public class TestActor extends Observable implements ITestActor {
description = actionDef.action.trim();
} else if (actionDef.script != null) {
description = ScriptAction.class.getName();
+ } else if (actionDef.macro != null) {
+ description = actionDef.macro.trim();
} else {
description = "(No description provided)";
}
@@ -1951,7 +1953,7 @@ public class TestActor extends Observable implements ITestActor {
boolean scriptWasAlreadyIncluded = includedScripts.stream()
.parallel().anyMatch(normalizedPartialPath::equalsIgnoreCase);
-
+
if (scriptWasAlreadyIncluded) {
Logger.trace(String.format(
"Skipping inclusion of script file \"%s\" since it was already "
|
fix(TestActor): provide proper description for macros in test results
|
diff --git a/src/angular-leaflet-directive.js b/src/angular-leaflet-directive.js
index <HASH>..<HASH> 100644
--- a/src/angular-leaflet-directive.js
+++ b/src/angular-leaflet-directive.js
@@ -67,6 +67,8 @@ leafletDirective.directive("leaflet", ["$http", "$log", "$parse", function ($htt
setupMarkers();
setupPaths();
+ // use of leafletDirectiveSetMap event is not encouraged. only use
+ // it when there is no easy way to bind data to the directive
$scope.$on('leafletDirectiveSetMap', function(event, message) {
var meth = message.shift();
map[meth].apply(map, message);
|
add comment in source for setmap event
|
diff --git a/lib/commands/general.js b/lib/commands/general.js
index <HASH>..<HASH> 100644
--- a/lib/commands/general.js
+++ b/lib/commands/general.js
@@ -178,7 +178,12 @@ commands.keys = async function (keys) {
await this.setValue(keys, el.ELEMENT);
};
-commands.setUrl = iosCommands.general.setUrl;
+commands.setUrl = async function (url) {
+ if (!this.isWebContext()) {
+ return await this.proxyCommand('/url', 'POST', {url});
+ }
+ return await iosCommands.general.setUrl.call(this, url);
+};
export { commands };
export default commands;
|
Fix url opening on real devices (#<I>)
* Fix url opening on real devices
* Fix method call
|
diff --git a/lib/barby/barcode/code_25.rb b/lib/barby/barcode/code_25.rb
index <HASH>..<HASH> 100644
--- a/lib/barby/barcode/code_25.rb
+++ b/lib/barby/barcode/code_25.rb
@@ -97,6 +97,10 @@ module Barby
end
end
+ def encoding_for_bars_without_end_space(*a)
+ encoding_for_bars(*a).gsub(/0+$/, '')
+ end
+
#Mod10
def checksum
@@ -149,8 +153,7 @@ module Barby
end
def stop_encoding
- #Removes trailing space generated by encoding_for_bars
- encoding_for_bars(STOP_ENCODING).gsub(/0+$/, '')
+ encoding_for_bars_without_end_space(STOP_ENCODING)
end
diff --git a/lib/barby/barcode/code_25_iata.rb b/lib/barby/barcode/code_25_iata.rb
index <HASH>..<HASH> 100644
--- a/lib/barby/barcode/code_25_iata.rb
+++ b/lib/barby/barcode/code_25_iata.rb
@@ -15,7 +15,7 @@ module Barby
end
def stop_encoding
- encoding_for_bars(STOP_ENCODING)
+ encoding_for_bars_without_end_space(STOP_ENCODING)
end
end
|
Fix stop_encoding for IATA 2 of 5
|
diff --git a/query.go b/query.go
index <HASH>..<HASH> 100644
--- a/query.go
+++ b/query.go
@@ -83,8 +83,8 @@ type Selector struct {
//
// By Options
//
-// The BySearch (default) option enables querying for elements with a CSS or
-// XPath selector, wrapping DOM.performSearch.
+// The BySearch (default) option enables querying for elements by plain text,
+// CSS selector or XPath query, wrapping DOM.performSearch.
//
// The ByID option enables querying for a single element with the matching CSS
// ID, wrapping DOM.querySelector. ByID is similar to calling
@@ -304,7 +304,7 @@ func ByID(s *Selector) {
}
// BySearch is an element query option to select elements by the DOM.performSearch
-// command. Works with both CSS and XPath queries.
+// command. It matches nodes by plain text, CSS selector or XPath query.
func BySearch(s *Selector) {
ByFunc(func(ctx context.Context, n *cdp.Node) ([]cdp.NodeID, error) {
id, count, err := dom.PerformSearch(s.selAsString()).Do(ctx)
|
Document that BySearch matches by plain text too
|
diff --git a/lib/rack/app/params.rb b/lib/rack/app/params.rb
index <HASH>..<HASH> 100644
--- a/lib/rack/app/params.rb
+++ b/lib/rack/app/params.rb
@@ -49,13 +49,9 @@ class Rack::App::Params
::Rack::Utils.parse_nested_query(query_string).merge!(params_that_presented_multiple_times)
end
- ARRAY_FORM = /^\w+\[\]$/
- HASH_FORM = /^\w+(\[\w+\])+$/
def params_that_presented_multiple_times
cgi_params = CGI.parse(query_string)
- cgi_params.reject! { |_k, v| v.length == 1 }
- cgi_params.reject! { |k, _v| k =~ ARRAY_FORM }
- cgi_params.reject! { |k, _v| k =~ HASH_FORM }
+ cgi_params.reject! { |k, v| v.length == 1 && k !~ /^\w+$/ }
cgi_params.reduce({}) do |result, (key, value)|
result[key] = formatted_value(key, value)
result
|
refactor: use explicit use case search instead of define everything that can't be for legacy array form based query string parsing support
|
diff --git a/system/core/Controller.php b/system/core/Controller.php
index <HASH>..<HASH> 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -1261,7 +1261,7 @@ abstract class Controller
}
/**
- * Controls access to retricted areas
+ * Controls access to restricted areas
*/
protected function controlAccessRestrictedArea()
{
@@ -1325,7 +1325,7 @@ abstract class Controller
}
/**
- * Restrict access to only superadmin (UID 1)
+ * Restrict access to only super-admin (UID 1)
*/
protected function controlAccessSuperAdmin()
{
@@ -1590,7 +1590,8 @@ abstract class Controller
'head' => 'layout/head',
'body' => 'layout/body',
'layout' => 'layout/layout',
- 'region_content' => 'layout/region_content'
+ 'region_content' => 'layout/region_content',
+ 'region_bottom' => 'layout/region_bottom'
);
}
|
Add missed template for buttom region
|
diff --git a/lib/Subscription.php b/lib/Subscription.php
index <HASH>..<HASH> 100644
--- a/lib/Subscription.php
+++ b/lib/Subscription.php
@@ -54,11 +54,13 @@ class Subscription extends ApiResource
*
* @link https://stripe.com/docs/api#subscription_object-status
*/
- const STATUS_ACTIVE = 'active';
- const STATUS_CANCELED = 'canceled';
- const STATUS_PAST_DUE = 'past_due';
- const STATUS_TRIALING = 'trialing';
- const STATUS_UNPAID = 'unpaid';
+ const STATUS_ACTIVE = 'active';
+ const STATUS_CANCELED = 'canceled';
+ const STATUS_PAST_DUE = 'past_due';
+ const STATUS_TRIALING = 'trialing';
+ const STATUS_UNPAID = 'unpaid';
+ const STATUS_INCOMPLETE = 'incomplete';
+ const STATUS_INCOMPLETE_EXPIRED = 'incomplete_expired';
public static function getSavedNestedResources()
{
|
Added subscription status constants for "incomplete" and "incomplete_expired".
|
diff --git a/src/App.php b/src/App.php
index <HASH>..<HASH> 100644
--- a/src/App.php
+++ b/src/App.php
@@ -16,7 +16,7 @@ class App
// @var array|false Location where to load JS/CSS files
public $cdn = [
- 'atk' => 'https://cdn.rawgit.com/atk4/ui/1.4.0/public',
+ 'atk' => 'https://cdn.rawgit.com/atk4/ui/1.4.1/public',
'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1',
'serialize-object' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-serialize-object/2.5.0',
'semantic-ui' => 'https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10',
@@ -24,7 +24,7 @@ class App
];
// @var string Version of Agile UI
- public $version = '1.4.0';
+ public $version = '1.4.1';
// @var string Name of application
public $title = 'Agile UI - Untitled Application';
|
Updated CDN and $version in App.php to <I>
|
diff --git a/test/test_rake_thread_pool.rb b/test/test_rake_thread_pool.rb
index <HASH>..<HASH> 100644
--- a/test/test_rake_thread_pool.rb
+++ b/test/test_rake_thread_pool.rb
@@ -1,6 +1,5 @@
require File.expand_path('../helper', __FILE__)
require 'rake/thread_pool'
-require 'test/unit/assertions'
class TestRakeTestThreadPool < Rake::TestCase
include Rake
|
Remove bogus require
test/unit/assertions was never used by this file
|
diff --git a/test/marc_extractor_test.rb b/test/marc_extractor_test.rb
index <HASH>..<HASH> 100644
--- a/test/marc_extractor_test.rb
+++ b/test/marc_extractor_test.rb
@@ -328,6 +328,19 @@ describe "Traject::MarcExtractor" do
values = extractor.extract(@record)
assert_equal ["27", "2710"], values
end
+
+ it "associates indicators properly with repeated tags" do
+ @record = MARC::Record.new
+ @record.append MARC::DataField.new("100", '1', ' ', ['a', '100a first indicator 1'], ['b', 'should not include 100|1|b'])
+ @record.append MARC::DataField.new("100", '2', ' ', ['b', '100b first indicator 2'], ['a', 'should not include 100|2|a'])
+
+ extractor = Traject::MarcExtractor.new("100|1*|a:100|2*|b")
+
+ values = extractor.extract(@record)
+
+ assert_equal ['100a first indicator 1', '100b first indicator 2'], values
+ end
+
end
|
MarcExtractor, test indicators on repeated tags in spec
|
diff --git a/textx/commands/console.py b/textx/commands/console.py
index <HASH>..<HASH> 100644
--- a/textx/commands/console.py
+++ b/textx/commands/console.py
@@ -21,10 +21,12 @@ def textx():
self.print_help()
sys.exit(2)
- parser = MyParser(description="textX checker and visualizer")
- parser.add_argument('cmd', help="Command - 'check' or 'visualize'")
- parser.add_argument('metamodel', help="Meta-model file name")
- parser.add_argument('model', help="Model file name", nargs="?")
+ parser = MyParser(description='textX checker and visualizer')
+ parser.add_argument('cmd', help='Command - "check" or "visualize"')
+ parser.add_argument('metamodel', help='Meta-model file name')
+ parser.add_argument('model', help='Model file name', nargs='?')
+ parser.add_argument('-ci', help='case-insensitive parsing',
+ action='store_true')
args = parser.parse_args()
@@ -34,7 +36,7 @@ def textx():
sys.exit(1)
try:
- metamodel = metamodel_from_file(args.metamodel)
+ metamodel = metamodel_from_file(args.metamodel, ignore_case=args.ci)
print("Meta-model OK.")
except TextXError as e:
print("Error in meta-model file.")
|
Case-insensitive option switch added to textx command.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -93,7 +93,7 @@ function startPlaylist(playlist, amount, callback) {
osascript(stringify(lib.play.method).replace(/{{playlist}}/, playlist), function (err) {
var result;
if (err === null) {
- result = callback(logSymbols.success + ' Playing ' + amount + ' song(s) ♪♬');
+ result = callback(logSymbols.success + ' Playing ' + amount + ' song' + ( amount > 1 ? 's' : '') + ' ♪♬');
} else {
result = callback(logSymbols.error + ' ' + chalk.red(err));
}
|
Implemented plural of `song`
Closes #8
|
diff --git a/js/angular/components/iconic/iconic.js b/js/angular/components/iconic/iconic.js
index <HASH>..<HASH> 100644
--- a/js/angular/components/iconic/iconic.js
+++ b/js/angular/components/iconic/iconic.js
@@ -26,6 +26,9 @@
function zfIconic(iconic) {
var directive = {
restrict: 'A',
+ scope: {
+ dynSrc: '=?'
+ },
link: link
};
@@ -33,7 +36,12 @@
function link(scope, element, attrs, controller) {
var ico = iconic.getAccess();
- attrs.$set('data-src', attrs.src);
+ if(scope.dynSrc) {
+ attrs.$set('data-src', scope.dynSrc);
+ } else {
+ // To support expressions on data-src
+ attrs.$set('data-src', attrs.src);
+ }
ico.inject(element[0]);
}
}
|
Added back dynSrc option
|
diff --git a/test_parameters/test_unit/__init__.py b/test_parameters/test_unit/__init__.py
index <HASH>..<HASH> 100644
--- a/test_parameters/test_unit/__init__.py
+++ b/test_parameters/test_unit/__init__.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+#
# Copyright (C) 2013 by Alex Brandt <alunduil@alunduil.com>
#
# parameters is freely distributable under the terms of an MIT-style license.
|
Add UTF-8 coding to unit test file.
Python2 deosn't default to UTF-8 so we need to explicitly declare it.
|
diff --git a/guake/main.py b/guake/main.py
index <HASH>..<HASH> 100644
--- a/guake/main.py
+++ b/guake/main.py
@@ -42,7 +42,11 @@ from optparse import OptionParser
log = logging.getLogger(__name__)
# Force use X11 backend under wayland before any import of GDK through dependencies
+# This could fix weird problems under Wayland
+# But if user set GUAKE_ENABLE_WAYLAND=1, then force use Wayland backend
os.environ["GDK_BACKEND"] = "x11"
+if os.environ["GUAKE_ENABLE_WAYLAND"] == 1:
+ os.environ["GDK_BACKEND"] = "wayland"
from guake.globals import NAME
from guake.globals import bindtextdomain
diff --git a/guake/terminal.py b/guake/terminal.py
index <HASH>..<HASH> 100644
--- a/guake/terminal.py
+++ b/guake/terminal.py
@@ -121,6 +121,8 @@ class GuakeTerminal(Vte.Terminal):
self.setup_drag_and_drop()
+ # GDK_BACKEND is ingnored
+ # Set GUAKE_ENABLE_WAYLAND=1 to use Wayland backend
self.ENVV_EXCLUDE_LIST = ["GDK_BACKEND"]
self.envv = [f"{i}={os.environ[i]}" for i in os.environ if i not in self.ENVV_EXCLUDE_LIST]
self.envv.append(f"GUAKE_TAB_UUID={self.uuid}")
|
Add `GUAKE_ENABLE_WAYLAND` environment variable
|
diff --git a/clean_file_locks.py b/clean_file_locks.py
index <HASH>..<HASH> 100755
--- a/clean_file_locks.py
+++ b/clean_file_locks.py
@@ -26,7 +26,7 @@ import logging
import optparse
from nova import flags
-from nova import log
+from nova.openstack.common import log
from nova import utils
|
Switch to common logging.
I only just moved logging from nova to common, so behavior should remain the same.
Change-Id: I1d<I>ca<I>f9d<I>bb<I>d<I>be2f9a<I>fb
|
diff --git a/lib/virtualfs/version.rb b/lib/virtualfs/version.rb
index <HASH>..<HASH> 100644
--- a/lib/virtualfs/version.rb
+++ b/lib/virtualfs/version.rb
@@ -1,3 +1,3 @@
module VirtualFS
- VERSION = "0.0.2"
+ VERSION = "0.1.0"
end
|
Bumped version to <I>.
|
diff --git a/src/plugin/handler.js b/src/plugin/handler.js
index <HASH>..<HASH> 100644
--- a/src/plugin/handler.js
+++ b/src/plugin/handler.js
@@ -54,13 +54,8 @@ Handler.prototype.configure = function(options) {
};
-Handler.prototype.canExecute = function(data) {
- return this.matchers.canExecute(data);
-};
-
-
Handler.prototype.run = function(data, cancel) {
- if (!this.canExecute(data)) {
+ if (!this.matchers.canExecute(data)) {
return Promise.resolve(data);
}
diff --git a/src/plugin/plugin.js b/src/plugin/plugin.js
index <HASH>..<HASH> 100644
--- a/src/plugin/plugin.js
+++ b/src/plugin/plugin.js
@@ -102,9 +102,6 @@ Plugin.prototype.run = function(serviceName, data) {
.map(function(id) {
return plugin.context.getHandler(id);
})
- .filter(function(handler) {
- return handler.canExecute(data);
- })
.reduce(function(current, handler) {
return current
.then(canRun)
|
removed "handler.canExecute" to deferred that logic to be processed in the "handler.run" method
|
diff --git a/test/types/yumrepo.rb b/test/types/yumrepo.rb
index <HASH>..<HASH> 100644
--- a/test/types/yumrepo.rb
+++ b/test/types/yumrepo.rb
@@ -63,6 +63,21 @@ class TestYumRepo < Test::Unit::TestCase
assert_equal(CREATE_EXP, text)
end
+ # Delete mirrorlist by setting it to :absent and enable baseurl
+ def test_absent
+ copy_datafiles
+ baseurl = 'http://example.com/'
+ devel = make_repo("development",
+ { :mirrorlist => 'absent',
+ :baseurl => baseurl })
+ devel.retrieve
+ assert_apply(devel)
+ inifile = Puppet.type(:yumrepo).read()
+ sec = inifile["development"]
+ assert_nil(sec["mirrorlist"])
+ assert_equal(baseurl, sec["baseurl"])
+ end
+
def make_repo(name, hash={})
hash[:name] = name
Puppet.type(:yumrepo).create(hash)
|
Test that setting a state to 'absent' really deletes it from the config
git-svn-id: <URL>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
setup(
name = 'parsec',
- version = '3.9',
+ version = '3.10',
description = 'parser combinator.',
long_description = 'A universal Python parser combinator library inspired by Parsec library of Haskell.',
author = 'He Tao',
|
Upgrade version to <I>.
|
diff --git a/system/src/Grav/Framework/Form/Interfaces/FormInterface.php b/system/src/Grav/Framework/Form/Interfaces/FormInterface.php
index <HASH>..<HASH> 100644
--- a/system/src/Grav/Framework/Form/Interfaces/FormInterface.php
+++ b/system/src/Grav/Framework/Form/Interfaces/FormInterface.php
@@ -18,7 +18,7 @@ use Psr\Http\Message\UploadedFileInterface;
* Interface FormInterface
* @package Grav\Framework\Form
*/
-interface FormInterface
+interface FormInterface extends \Serializable
{
/**
* Get HTML id="..." attribute.
|
Regression: Fix serialize issues with forms
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@ setup(
version=version,
description="Python bindings for the docker credentials store API",
url='https://github.com/shin-/docker-pycreds/',
+ license='Apache License 2.0',
packages=[
'dockerpycreds',
],
|
Update setup.py
add missing license to setup.py
|
diff --git a/session.go b/session.go
index <HASH>..<HASH> 100644
--- a/session.go
+++ b/session.go
@@ -775,6 +775,7 @@ func (s *session) scheduleSending() {
func (s *session) tryQueueingUndecryptablePacket(p *receivedPacket) {
if s.handshakeComplete {
+ utils.Debugf("Received undecryptable packet from %s after the handshake: %#v, %d bytes data", p.remoteAddr.String(), p.publicHeader, len(p.data))
return
}
if len(s.undecryptablePackets)+1 > protocol.MaxUndecryptablePackets {
diff --git a/session_test.go b/session_test.go
index <HASH>..<HASH> 100644
--- a/session_test.go
+++ b/session_test.go
@@ -1290,7 +1290,11 @@ var _ = Describe("Session", func() {
hdr := &PublicHeader{
PacketNumber: protocol.PacketNumber(i + 1),
}
- sess.handlePacket(&receivedPacket{publicHeader: hdr, data: []byte("foobar")})
+ sess.handlePacket(&receivedPacket{
+ publicHeader: hdr,
+ remoteAddr: &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 1234},
+ data: []byte("foobar"),
+ })
}
}
|
log undecrytable packets after the handshake
|
diff --git a/db/migrate/20150605151945_create_pd_regime_bags.rb b/db/migrate/20150605151945_create_pd_regime_bags.rb
index <HASH>..<HASH> 100644
--- a/db/migrate/20150605151945_create_pd_regime_bags.rb
+++ b/db/migrate/20150605151945_create_pd_regime_bags.rb
@@ -2,8 +2,8 @@ class CreatePDRegimeBags < ActiveRecord::Migration
def change
create_table :pd_regime_bags do |t|
t.integer :pd_regime_id
- t.integer :bag_type_id
- t.integer :volume
+ t.integer :bag_type_id, null: false
+ t.integer :volume, null: false
t.integer :per_week
t.boolean :monday
t.boolean :tuesday
|
Added null: false to pd_regime_bags migration required fields.
|
diff --git a/lib/aerospike/query/filter.rb b/lib/aerospike/query/filter.rb
index <HASH>..<HASH> 100644
--- a/lib/aerospike/query/filter.rb
+++ b/lib/aerospike/query/filter.rb
@@ -53,6 +53,14 @@ module Aerospike
offset
end
+ #
+ # Show the filter as String. This is util to show filters in logs.
+ #
+ def to_s
+ return "#{@name} = #{@begin}" if @begin == @end
+ "#{@name} = #{@begin} - #{@end}"
+ end
+
private
def initialize(bin_name, begin_value, end_value)
|
Added to_s method to filters to display it in a log
|
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -336,7 +336,7 @@ module ActionDispatch
end
path = request_encoder.append_format_to location.path
path = location.query ? "#{path}?#{location.query}" : path
- elsif !as.nil?
+ elsif as
location = URI.parse(path)
path = request_encoder.append_format_to location.path
path = location.query ? "#{path}?#{location.query}" : path
|
Simplify `as` passed check.
`if !var.nil?` is the same as just `if var`
|
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -21,6 +21,7 @@ require_relative "../../chef"
require_relative "../application"
require_relative "../client"
require_relative "../config"
+require_relative "../config_fetcher"
require_relative "../log"
require "fileutils" unless defined?(FileUtils)
require "tempfile" unless defined?(Tempfile)
|
Fixed broken chef-apply with -j
that causes a `NameError: uninitialized constant Chef::ConfigFetcher`.
|
diff --git a/packages/neos-ui-ckeditor5-bindings/src/ckEditorApi.js b/packages/neos-ui-ckeditor5-bindings/src/ckEditorApi.js
index <HASH>..<HASH> 100644
--- a/packages/neos-ui-ckeditor5-bindings/src/ckEditorApi.js
+++ b/packages/neos-ui-ckeditor5-bindings/src/ckEditorApi.js
@@ -3,6 +3,11 @@ import DecoupledEditor from '@ckeditor/ckeditor5-editor-decoupled/src/decouplede
// We remove opening and closing span tags that are produced by the inlineMode plugin
const cleanupContentBeforeCommit = content => {
+ // TODO: remove when this is fixed: https://github.com/ckeditor/ckeditor5/issues/401
+ if (content.match(/<([a-z][a-z0-9]*)\b[^>]*> <\/\1>/)) {
+ return '';
+ }
+
if (content.match(/^<span>/) && content.match(/<\/span>$/)) {
return content
.replace(/^<span>/, '')
|
BUGFIX: prevent on empty content from CKE5
|
diff --git a/lib/dpl/provider/modulus.rb b/lib/dpl/provider/modulus.rb
index <HASH>..<HASH> 100644
--- a/lib/dpl/provider/modulus.rb
+++ b/lib/dpl/provider/modulus.rb
@@ -16,7 +16,7 @@ module DPL
end
def push_app
- context.shell "MODULUS_TOKEN=#{option(:api_key)} modulus deploy -p #{option(:project_name)}"
+ context.shell "env MODULUS_TOKEN=#{option(:api_key)} modulus deploy -p #{option(:project_name)}"
end
end
end
diff --git a/spec/provider/modulus_spec.rb b/spec/provider/modulus_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/provider/modulus_spec.rb
+++ b/spec/provider/modulus_spec.rb
@@ -22,7 +22,7 @@ describe DPL::Provider::Modulus do
describe "#push_app" do
it 'should include the api key and project name specified' do
- expect(provider.context).to receive(:shell).with("MODULUS_TOKEN=test-token modulus deploy -p test-project")
+ expect(provider.context).to receive(:shell).with("env MODULUS_TOKEN=test-token modulus deploy -p test-project")
provider.push_app
end
end
|
Fixes #<I> Modulus deploys failing without error
The command was not setting the ENV variable for MODULUS_TOKEN and was
failing with an exit status of <I>.
|
diff --git a/lib/rack/test.rb b/lib/rack/test.rb
index <HASH>..<HASH> 100644
--- a/lib/rack/test.rb
+++ b/lib/rack/test.rb
@@ -27,6 +27,8 @@ module Rack
end
def request(uri, env = {})
+ env["REQUEST_METHOD"] ||= "GET"
+
@last_request = Rack::Request.new(env)
@last_response = Rack::Response.new(@app.call(env))
diff --git a/spec/test_spec.rb b/spec/test_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/test_spec.rb
+++ b/spec/test_spec.rb
@@ -14,8 +14,9 @@ describe Rack::Test::Session do
end
describe "#request" do
- it "requests the URI" do
+ it "requests the URI using GET by default" do
@session.request "/"
+ request.should be_get
response.should be_ok
end
|
Make #request use GET by default
|
diff --git a/test/test_messaging.py b/test/test_messaging.py
index <HASH>..<HASH> 100644
--- a/test/test_messaging.py
+++ b/test/test_messaging.py
@@ -5,6 +5,7 @@ from kombu import Exchange, Queue
from mock import patch, Mock
from nameko.dependencies import DependencyFactory
+from nameko.exceptions import ContainerBeingKilled
from nameko.messaging import (
PublishProvider, ConsumeProvider, HeaderEncoder, HeaderDecoder)
from nameko.containers import (
@@ -101,6 +102,14 @@ def test_consume_provider(empty_config):
assert not queue_consumer.ack_message.called
queue_consumer.requeue_message.assert_called_once_with(message)
+ # test requeueing on ContainerBeingKilled (even without requeue_on_error)
+ queue_consumer.reset_mock()
+ consume_provider.requeue_on_error = False
+ spawn_worker.side_effect = ContainerBeingKilled()
+ consume_provider.handle_message("body", message)
+ assert not queue_consumer.ack_message.called
+ queue_consumer.requeue_message.assert_called_once_with(message)
+
@pytest.mark.usefixtures("predictable_call_ids")
def test_publish_to_exchange(empty_config, maybe_declare, patch_publisher):
|
test for requeue on ContainerBeingKilled
|
diff --git a/broker.go b/broker.go
index <HASH>..<HASH> 100644
--- a/broker.go
+++ b/broker.go
@@ -9,8 +9,8 @@ type ServiceCreationRequest struct {
SpaceGUID string `json:"space_guid"`
}
-// ServiceCreationResponce describes Cloud Foundry service provisioning response
-type ServiceCreationResponce struct {
+// ServiceCreationResponse describes Cloud Foundry service provisioning response
+type ServiceCreationResponse struct {
DashboardURL string `json:"dashboard_url"`
}
diff --git a/provider.go b/provider.go
index <HASH>..<HASH> 100644
--- a/provider.go
+++ b/provider.go
@@ -7,7 +7,7 @@ type ServiceProvider interface {
GetCatalog() (*Catalog, *ServiceProviderError)
// CreateService creates a service instance for specific plan
- CreateService(r *ServiceCreationRequest) (*ServiceCreationResponce, *ServiceProviderError)
+ CreateService(r *ServiceCreationRequest) (*ServiceCreationResponse, *ServiceProviderError)
// DeleteService deletes previously created service instance
DeleteService(instanceID string) *ServiceProviderError
|
fix Responce -> Response spelling
|
diff --git a/examples/export-map.js b/examples/export-map.js
index <HASH>..<HASH> 100644
--- a/examples/export-map.js
+++ b/examples/export-map.js
@@ -64,13 +64,6 @@ document.getElementById('export-png').addEventListener('click', function () {
const opacity =
canvas.parentNode.style.opacity || canvas.style.opacity;
mapContext.globalAlpha = opacity === '' ? 1 : Number(opacity);
-
- const backgroundColor = canvas.parentNode.style.backgroundColor;
- if (backgroundColor) {
- mapContext.fillStyle = backgroundColor;
- mapContext.fillRect(0, 0, canvas.width, canvas.height);
- }
-
let matrix;
const transform = canvas.style.transform;
if (transform) {
@@ -94,11 +87,17 @@ document.getElementById('export-png').addEventListener('click', function () {
mapContext,
matrix
);
+ const backgroundColor = canvas.parentNode.style.backgroundColor;
+ if (backgroundColor) {
+ mapContext.fillStyle = backgroundColor;
+ mapContext.fillRect(0, 0, canvas.width, canvas.height);
+ }
mapContext.drawImage(canvas, 0, 0);
}
}
);
mapContext.globalAlpha = 1;
+ mapContext.setTransform(1, 0, 0, 1, 0, 0);
const link = document.getElementById('image-download');
link.href = mapCanvas.toDataURL();
link.click();
|
Set background after applying transform
Reset transform in addition to globalAlpha
|
diff --git a/lib/milia/control.rb b/lib/milia/control.rb
index <HASH>..<HASH> 100644
--- a/lib/milia/control.rb
+++ b/lib/milia/control.rb
@@ -26,7 +26,7 @@ module Milia
old_id = ( Thread.current[:tenant_id].nil? ? '%' : Thread.current[:tenant_id] )
new_id = ( tid.nil? ? '%' : tid.to_s )
Thread.current[:tenant_id] = tid
- logger.debug("MILIA >>>>> [change tenant] new: #{new_id}\told:#{old_id}") unless logger.nil?
+ logger.debug("MILIA >>>>> [change tenant] new: #{new_id}\told: #{old_id}") unless logger.nil?
end
# ------------------------------------------------------------------------------
|
improved logging/traces - 4
|
diff --git a/python/setup.py b/python/setup.py
index <HASH>..<HASH> 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -58,7 +58,7 @@ def read_release_version():
MAJOR, MINOR, PATCH = read_release_version()
-IS_RELEASED = True
+IS_RELEASED = False
VERSION = '%d.%d.%d' % (MAJOR, MINOR, PATCH)
|
Unset IS_RELEASED
|
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index <HASH>..<HASH> 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -5493,6 +5493,7 @@ class assign {
$adminconfig = $this->get_admin_config();
$gradebookplugin = $adminconfig->feedback_plugin_for_gradebook;
+ $gradebookplugin = str_replace('assignfeedback_', '', $gradebookplugin);
$grades = $DB->get_records('assign_grades', array('assignment'=>$this->get_instance()->id));
$plugin = $this->get_feedback_plugin_by_type($gradebookplugin);
|
MDL-<I> assign: Workflow & blind marking do not always show feedback
Before this patch if an assignment has workflow and blind marking enabled if a teacher
sets a submission to have its grades released to students before they reveal student
identities the feedback they have given is not displayed to the student.
The patch causes the reveal_identities() method to pass the correct value to the
get_feedback_plugin_by_type() function in the assign class.
|
diff --git a/src/Services/User.php b/src/Services/User.php
index <HASH>..<HASH> 100644
--- a/src/Services/User.php
+++ b/src/Services/User.php
@@ -97,14 +97,6 @@ class User extends BaseRestService
/**
* {@inheritdoc}
*/
- public function getResources($only_handlers = false)
- {
- return ($only_handlers) ? static::$resources : array_values(static::$resources);
- }
-
- /**
- * {@inheritdoc}
- */
public function getAccessList()
{
$list = parent::getAccessList();
|
Separating resources from resource handlers.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.