diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100755
--- a/index.js
+++ b/index.js
@@ -26,7 +26,7 @@ function docdown(options) {
});
if (!options.path || !options.url) {
- throw new Error('Path and/or URL must be specified');
+ throw new Error('Path and URL must be specified');
}
return generator(fs.readFileSync(options.path, 'utf8'), options);
}
|
Fix error message as `path` and `url` are required. [closes #<I>]
|
diff --git a/lib/CoreBot.js b/lib/CoreBot.js
index <HASH>..<HASH> 100755
--- a/lib/CoreBot.js
+++ b/lib/CoreBot.js
@@ -823,7 +823,7 @@ function Botkit(configuration) {
// set up a once a second tick to process messages
botkit.tickInterval = setInterval(function() {
botkit.tick();
- }, 1000);
+ }, 1500);
}
};
|
This should be updated to <I> seconds because Facebooks servers sometimes process messages out of order when using images due to the file size processing time. <I> seconds seems to fix it.
|
diff --git a/superset/cli.py b/superset/cli.py
index <HASH>..<HASH> 100755
--- a/superset/cli.py
+++ b/superset/cli.py
@@ -195,7 +195,7 @@ def worker(workers):
CELERYD_CONCURRENCY=config.get("SUPERSET_CELERY_WORKERS"))
worker = celery_app.Worker(optimization='fair')
- worker.run()
+ worker.start()
@manager.option(
|
Fix celery worker (#<I>)
|
diff --git a/spec/retext-emoji.spec.js b/spec/retext-emoji.spec.js
index <HASH>..<HASH> 100755
--- a/spec/retext-emoji.spec.js
+++ b/spec/retext-emoji.spec.js
@@ -914,10 +914,7 @@ describe('emoji()', function () {
);
});
-for (name in gemoji.name) {
- unicode = gemoji.name[name];
- name = ':' + name + ':';
-
+function describeEmoji(name, unicode) {
describe('emoji `' + unicode + '`', function () {
it('should decode the emoticon (from `' + unicode + '` to `' +
name + '`)', function () {
@@ -944,3 +941,7 @@ for (name in gemoji.name) {
);
});
}
+
+for (name in gemoji.name) {
+ describeEmoji(':' + name + ':', gemoji.name[name]);
+}
|
Fixed a bug in the spec where emoji were not correctly tested
|
diff --git a/irc3/plugins/autocommand.py b/irc3/plugins/autocommand.py
index <HASH>..<HASH> 100644
--- a/irc3/plugins/autocommand.py
+++ b/irc3/plugins/autocommand.py
@@ -26,7 +26,7 @@ This example will authorize on Freenode:
... irc3.plugins.autocommand
...
... autocommands =
- ... PRIVMSG NickServ IDENTIFY nick password
+ ... PRIVMSG NickServ :IDENTIFY nick password
... """)
>>> bot = IrcBot(**config)
@@ -41,7 +41,7 @@ Here's another, more complicated example:
... AUTH user password
... MODE {nick} +x
... /sleep 2
- ... PRIVMSG Q INVITE #inviteonly
+ ... PRIVMSG Q :INVITE #inviteonly
... """)
>>> bot = IrcBot(**config)
|
Added ':' to PRIVMSG in documentation
|
diff --git a/code/controllers/ReportAdmin.php b/code/controllers/ReportAdmin.php
index <HASH>..<HASH> 100644
--- a/code/controllers/ReportAdmin.php
+++ b/code/controllers/ReportAdmin.php
@@ -99,10 +99,23 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
public static function has_reports() {
return sizeof(SS_Report::get_reports()) > 0;
}
-
- public function updatereport() {
- // FormResponse::load_form($this->EditForm()->forTemplate());
- // return FormResponse::respond();
+
+ /**
+ * Returns the Breadcrumbs for the ReportAdmin
+ * @return ArrayList
+ */
+ public function Breadcrumbs() {
+ $items = parent::Breadcrumbs();
+
+ if ($this->reportObject) {
+ //build breadcrumb trail to the current report
+ $items->push(new ArrayData(array(
+ 'Title' => $this->reportObject->title(),
+ 'Link' => Controller::join_links($this->Link(), '?' . http_build_query(array('q' => $this->request->requestVar('q'))))
+ )));
+ }
+
+ return $items;
}
function providePermissions() {
|
ENHANCEMENT: SSF-<I> adding breadcrumbs to ReportAdmin
|
diff --git a/tests/framework/console/controllers/MigrateControllerTest.php b/tests/framework/console/controllers/MigrateControllerTest.php
index <HASH>..<HASH> 100644
--- a/tests/framework/console/controllers/MigrateControllerTest.php
+++ b/tests/framework/console/controllers/MigrateControllerTest.php
@@ -171,6 +171,10 @@ class MigrateControllerTest extends TestCase
public function testCreateLongNamedMigration()
{
+ $this->setOutputCallback(function($output) {
+ return null;
+ });
+
$migrationName = str_repeat('a', 180);
$this->expectException('yii\console\Exception');
diff --git a/tests/framework/widgets/FragmentCacheTest.php b/tests/framework/widgets/FragmentCacheTest.php
index <HASH>..<HASH> 100644
--- a/tests/framework/widgets/FragmentCacheTest.php
+++ b/tests/framework/widgets/FragmentCacheTest.php
@@ -196,6 +196,10 @@ class FragmentCacheTest extends \yiiunit\TestCase
public function testVariations()
{
+ $this->setOutputCallback(function($output) {
+ return null;
+ });
+
ob_start();
ob_implicit_flush(false);
$view = new View();
|
Fix test output (Prevent output among phpunit tests) (#<I>)
* Clear output in MigrateControllerTest::testCreateLongNamedMigration
* Clear output in FragmentCacheTest::testVariations
|
diff --git a/plugins/sigma.parsers.json/sigma.parsers.json.js b/plugins/sigma.parsers.json/sigma.parsers.json.js
index <HASH>..<HASH> 100644
--- a/plugins/sigma.parsers.json/sigma.parsers.json.js
+++ b/plugins/sigma.parsers.json/sigma.parsers.json.js
@@ -74,8 +74,8 @@
// ...or it's finally the callback:
} else if (typeof sig === 'function') {
- sig = null;
callback = sig;
+ sig = null;
}
// Call the callback if specified:
|
Minor fix in sigma.parsers.json
When called with only a path and a callback, the callback was actually not called at all. Now it is.
|
diff --git a/boil/environment.py b/boil/environment.py
index <HASH>..<HASH> 100644
--- a/boil/environment.py
+++ b/boil/environment.py
@@ -14,6 +14,8 @@ class PlateEnvironment(jinja2.Environment):
def _setup_filters(self):
self.filters.update(filters.TEMPLATE_FILTERS)
+ if hasattr(self.plate, 'FILTERS'):
+ self.filters.update(self.plate.FILTERS)
def get(plate, **kwargs):
|
Add plate-defined filters to template environment
|
diff --git a/dropwizard-core/src/main/java/com/yammer/dropwizard/config/Environment.java b/dropwizard-core/src/main/java/com/yammer/dropwizard/config/Environment.java
index <HASH>..<HASH> 100644
--- a/dropwizard-core/src/main/java/com/yammer/dropwizard/config/Environment.java
+++ b/dropwizard-core/src/main/java/com/yammer/dropwizard/config/Environment.java
@@ -56,6 +56,8 @@ public class Environment extends AbstractLifeCycle {
/**
* Creates a new environment.
+ *
+ * @param configuration the service's {@link Configuration}
*/
public Environment(Configuration configuration) {
this.config = new DropwizardResourceConfig() {
|
Fix a Javadoc issue in Environment.
|
diff --git a/lib/fit4ruby/GlobalFitDictionaries.rb b/lib/fit4ruby/GlobalFitDictionaries.rb
index <HASH>..<HASH> 100644
--- a/lib/fit4ruby/GlobalFitDictionaries.rb
+++ b/lib/fit4ruby/GlobalFitDictionaries.rb
@@ -86,6 +86,7 @@ module Fit4Ruby
entry 36, 'calibration'
entry 37, 'vo2max' # guess
entry 38, 'recovery_time' # guess (in minutes)
+ entry 39, 'recovery_info' # guess (in minutes, < 24 good, > 24h poor)
entry 42, 'front_gear_change'
entry 43, 'rear_gear_change'
|
Adding recovery_info. Just a guess right now.
|
diff --git a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnector.java b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnector.java
index <HASH>..<HASH> 100644
--- a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnector.java
+++ b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnector.java
@@ -639,6 +639,7 @@ public class SignavioConnector extends AbstractRepositoryConnector<SignavioConne
public String transformJsonToBpmn20Xml(String jsonData) {
try {
JSONObject json = new JSONObject(jsonData);
+ de.hpi.bpmn2_0.factory.configuration.Configuration.ensureSignavioStyle = false; // disable regeneration of IDs that don't match Signavio's ID pattern
Json2XmlConverter converter = new Json2XmlConverter(json.toString(), this.getClass().getClassLoader().getResource("META-INF/validation/xsd/BPMN20.xsd")
.toString());
return converter.getXml().toString();
|
ACT-<I> BPMN <I> Export in Cycle: Disabled regeneration of IDs that don't match Signavio's ID pattern
|
diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js
index <HASH>..<HASH> 100644
--- a/src/editor/EditorManager.js
+++ b/src/editor/EditorManager.js
@@ -517,11 +517,17 @@ define(function (require, exports, module) {
PerfUtils.markStart(PerfUtils.INLINE_EDITOR_CLOSE);
inlineWidget.close();
PerfUtils.addMeasurement(PerfUtils.INLINE_EDITOR_CLOSE);
+
+ // return a resolved promise to CommandManager
+ return new $.Deferred().resolve().promise();
} else {
// main editor has focus, so create an inline editor
- _openInlineWidget(_currentEditor);
+ return _openInlineWidget(_currentEditor);
}
}
+
+ // Can not open an inline editor without a host editor
+ return new $.Deferred().reject().promise();
}
CommandManager.register(Strings.CMD_SHOW_INLINE_EDITOR, Commands.SHOW_INLINE_EDITOR, _showInlineEditor);
|
Fix SHOW_INLINE_EDITOR command handler to return a promise.
|
diff --git a/aws/resource_aws_security_group.go b/aws/resource_aws_security_group.go
index <HASH>..<HASH> 100644
--- a/aws/resource_aws_security_group.go
+++ b/aws/resource_aws_security_group.go
@@ -4,6 +4,7 @@ import (
"bytes"
"fmt"
"log"
+ "regexp"
"sort"
"strconv"
"strings"
@@ -47,7 +48,10 @@ func resourceAwsSecurityGroup() *schema.Resource {
Computed: true,
ForceNew: true,
ConflictsWith: []string{"name_prefix"},
- ValidateFunc: validation.StringLenBetween(0, 255),
+ ValidateFunc: validation.All(
+ validation.StringLenBetween(0, 255),
+ validation.StringDoesNotMatch(regexp.MustCompile(`^sg-`), "cannot begin with sg-"),
+ ),
},
"name_prefix": {
|
Validate that security group names aren't prefixed with sg-
The [API docs](<URL>) have this to say:
> Constraints: Up to <I> characters in length. Cannot start with sg-.
|
diff --git a/generate_test.go b/generate_test.go
index <HASH>..<HASH> 100644
--- a/generate_test.go
+++ b/generate_test.go
@@ -14,8 +14,9 @@ func TestGenerate(t *testing.T) {
}
func ExampleGenerate() {
+ Seed(11)
fmt.Println(Generate("{name.first} {name.last} lives at {address.number} {address.street_name} {address.street_suffix}"))
- // Output: Estell Fay lives at 54407 Plaza berg
+ // Output: Markus Moen lives at 715 Garden mouth
}
func BenchmarkGenerate(b *testing.B) {
|
generate - added seeded.
|
diff --git a/salt/minion.py b/salt/minion.py
index <HASH>..<HASH> 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -1067,6 +1067,9 @@ class Matcher(object):
log.error('Targeted pillar "{0}" not found'.format(comps[0]))
return False
if isinstance(match, dict):
+ if comps[1] == '*':
+ # We are just checking that the key exists
+ return True
log.error('Targeted pillar "{0}" must correspond to a list, '
'string, or numeric value'.format(comps[0]))
return False
|
allow matching on presence of a key when value is a dict
|
diff --git a/src/org/opencms/module/CmsModule.java b/src/org/opencms/module/CmsModule.java
index <HASH>..<HASH> 100644
--- a/src/org/opencms/module/CmsModule.java
+++ b/src/org/opencms/module/CmsModule.java
@@ -1,7 +1,7 @@
/*
* File : $Source: /alkacon/cvs/opencms/src/org/opencms/module/CmsModule.java,v $
- * Date : $Date: 2005/06/26 15:54:25 $
- * Version: $Revision: 1.24 $
+ * Date : $Date: 2005/06/27 09:31:09 $
+ * Version: $Revision: 1.25 $
*
* This library is part of OpenCms -
* the Open Source Content Mananagement System
@@ -59,7 +59,7 @@ import org.apache.commons.logging.Log;
*
* @author Alexander Kandzior
*
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
*
* @since 6.0.0
*
@@ -671,7 +671,7 @@ public class CmsModule implements Comparable {
*
* @param actionInstance the module action instance for this module
*/
- public void setActionInstance(I_CmsModuleAction actionInstance) {
+ /*package*/void setActionInstance(I_CmsModuleAction actionInstance) {
m_actionInstance = actionInstance;
|
setActionInstance is now package protected to avoid external access
|
diff --git a/user/view.php b/user/view.php
index <HASH>..<HASH> 100644
--- a/user/view.php
+++ b/user/view.php
@@ -29,8 +29,6 @@ require_once($CFG->dirroot.'/tag/lib.php');
$id = optional_param('id', 0, PARAM_INT); // user id
$courseid = optional_param('course', SITEID, PARAM_INT); // course id (defaults to Site)
-$enable = optional_param('enable', 0, PARAM_BOOL); // enable email
-$disable = optional_param('disable', 0, PARAM_BOOL); // disable email
if (empty($id)) { // See your own profile by default
require_login();
|
MDL-<I> removed old parameters, no longer used
|
diff --git a/src/ShareFacade.php b/src/ShareFacade.php
index <HASH>..<HASH> 100644
--- a/src/ShareFacade.php
+++ b/src/ShareFacade.php
@@ -14,6 +14,5 @@ class ShareFacade extends Facade
protected static function getFacadeAccessor()
{
return static::$app['share'];
- return 'share';
}
}
|
Use new instance every time the facade is called
|
diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/utils/glide/GlideHelper.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/utils/glide/GlideHelper.java
index <HASH>..<HASH> 100644
--- a/sample/src/main/java/com/alexvasilkov/gestures/sample/utils/glide/GlideHelper.java
+++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/utils/glide/GlideHelper.java
@@ -28,6 +28,7 @@ public class GlideHelper {
public static void loadResource(@DrawableRes int drawableId, @NonNull ImageView image) {
Glide.with(image.getContext())
.load(drawableId)
+ .animate(ANIMATOR)
.override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
.into(new GlideDrawableImageViewTarget(image));
}
|
Fixed glide animation issue which leaves views detached
|
diff --git a/src/Server.js b/src/Server.js
index <HASH>..<HASH> 100644
--- a/src/Server.js
+++ b/src/Server.js
@@ -134,7 +134,7 @@ class Server extends EventEmitter {
* @param {code} [code=1000] Code as per WebSocket spec.
* @returns {Promise<undefined>} Promise.
*/
- close (code = 1000) : Promise<void> {
+ close (code: number = 1000) : Promise<void> {
for (let [, client] of this.clients) {
client.close(code)
}
|
refactor: add missing flow type
|
diff --git a/lib/classes/useragent.php b/lib/classes/useragent.php
index <HASH>..<HASH> 100644
--- a/lib/classes/useragent.php
+++ b/lib/classes/useragent.php
@@ -500,17 +500,17 @@ class core_useragent {
} else {
return false;
}
- $compat_view = false;
+ $compatview = false;
// IE8 and later versions may pretend to be IE7 for intranet sites, use Trident version instead,
// the Trident should always describe the capabilities of IE in any emulation mode.
if ($browser === '7.0' and preg_match("/Trident\/([0-9\.]+)/", $useragent, $match)) {
- $compat_view = true;
+ $compatview = true;
$browser = $match[1] + 4; // NOTE: Hopefully this will work also for future IE versions.
}
$browser = round($browser, 1);
return array(
'version' => $browser,
- 'compatview' => $compat_view
+ 'compatview' => $compatview
);
}
|
MDL-<I> Libraries Wrong naming convention in $compat_view.
|
diff --git a/src/assessments/seo/KeyphraseDistributionAssessment.js b/src/assessments/seo/KeyphraseDistributionAssessment.js
index <HASH>..<HASH> 100644
--- a/src/assessments/seo/KeyphraseDistributionAssessment.js
+++ b/src/assessments/seo/KeyphraseDistributionAssessment.js
@@ -67,7 +67,7 @@ class KeyphraseDistributionAssessment extends Assessment {
assessmentResult.setScore( calculatedResult.score );
assessmentResult.setText( calculatedResult.resultText );
- assessmentResult.setHasMarks( calculatedResult.score > 0 );
+ assessmentResult.setHasMarks( calculatedResult.score > 0 && calculatedResult.score < 9 );
return assessmentResult;
}
|
Disable markers when the result is good
|
diff --git a/spec/api_response.rb b/spec/api_response.rb
index <HASH>..<HASH> 100644
--- a/spec/api_response.rb
+++ b/spec/api_response.rb
@@ -2,8 +2,9 @@ require 'spec_helper'
require 'test_classes/projects'
describe "APIResponse" do
+ pending "No previos spec"
it "should parse response" do
-
+ # Code me maybe?
end
end
|
Added pending message to api_response_spec
|
diff --git a/lib/xmlhttprequest.js b/lib/xmlhttprequest.js
index <HASH>..<HASH> 100644
--- a/lib/xmlhttprequest.js
+++ b/lib/xmlhttprequest.js
@@ -1,8 +1,5 @@
// browser shim for xmlhttprequest module
-// Indicate to eslint that ActiveXObject is global
-/* global ActiveXObject */
-
var hasCORS = require('has-cors');
module.exports = function (opts) {
@@ -34,7 +31,7 @@ module.exports = function (opts) {
if (!xdomain) {
try {
- return new ActiveXObject('Microsoft.XMLHTTP');
+ return new global[['Active'].concat('Object').join('X')]('Microsoft.XMLHTTP');
} catch (e) { }
}
};
|
[fix] Obfuscate `ActiveXObject` occurrences (#<I>)
Some corporate firewalls/proxies such as Blue Coat prevent JavaScript
files from being downloaded if they contain the word "ActiveX".
|
diff --git a/src/Piano.js b/src/Piano.js
index <HASH>..<HASH> 100644
--- a/src/Piano.js
+++ b/src/Piano.js
@@ -48,6 +48,7 @@ function Key(props) {
}}
onMouseDown={props.onNoteDown}
onMouseUp={props.onNoteUp}
+ onMouseOver={props.isMouseDown ? props.onNoteDown : null}
onMouseOut={props.onNoteUp}
onTouchStart={props.onNoteDown}
onTouchCancel={props.onNoteUp}
@@ -95,6 +96,7 @@ class Piano extends React.Component {
};
componentDidMount() {
+ // TODO: removeEventListener calls
window.addEventListener('mousedown', () => {
this.setState({
isMouseDown: true,
@@ -271,6 +273,7 @@ class Piano extends React.Component {
)}
onNoteDown={this.handleNoteDown.bind(this, num)}
onNoteUp={this.handleNoteUp.bind(this, num)}
+ isMouseDown={this.state.isMouseDown}
key={num}
>
{this.props.disabled
|
allow mouse dragging over keys with isMouseDown state
|
diff --git a/src/boot_node.js b/src/boot_node.js
index <HASH>..<HASH> 100644
--- a/src/boot_node.js
+++ b/src/boot_node.js
@@ -1,11 +1,15 @@
/*jshint node: true*/
-/*global require, __dirname*/
-/*global _gpfFinishLoading*/ // Ends the loading (declared in boot.js)
+/*global gpfSourcesPath*/ // Global source path
/*global _gpfNodeFS*/ // Node FS module
+/*global _gpfFinishLoading*/ // Ends the loading (declared in boot.js)
(function () {
"use strict";
- require("./sources.js"); // Get sources
+ // Get sources
+ /*jslint evil: true*/
+ eval(_gpfNodeFS.readFileSync(gpfSourcesPath + "sources.js").toString());
+ /*jslint evil: false*/
+
var
sources = gpf.sources().split(","),
length = sources.length,
@@ -19,7 +23,7 @@
if (!src) {
break;
}
- src = __dirname + "/" + src + ".js";
+ src = gpfSourcesPath + src + ".js";
concat.push(_gpfNodeFS.readFileSync(src).toString());
}
|
Can't use require for node
|
diff --git a/src/gl-matrix/mat4.js b/src/gl-matrix/mat4.js
index <HASH>..<HASH> 100644
--- a/src/gl-matrix/mat4.js
+++ b/src/gl-matrix/mat4.js
@@ -1011,7 +1011,7 @@ export function getRotation(out, mat) {
out[0] = (mat[6] - mat[9]) / S;
out[1] = (mat[8] - mat[2]) / S;
out[2] = (mat[1] - mat[4]) / S;
- } else if ((mat[0] > mat[5])&(mat[0] > mat[10])) {
+ } else if ((mat[0] > mat[5]) && (mat[0] > mat[10])) {
S = Math.sqrt(1.0 + mat[0] - mat[5] - mat[10]) * 2;
out[3] = (mat[6] - mat[9]) / S;
out[0] = 0.25 * S;
|
Fixed an issue related to getRotation in mat4
Fixed an issue as bitwise `&` was used instead of logical `&&`
|
diff --git a/openquake/engine/export/hazard.py b/openquake/engine/export/hazard.py
index <HASH>..<HASH> 100644
--- a/openquake/engine/export/hazard.py
+++ b/openquake/engine/export/hazard.py
@@ -104,6 +104,10 @@ def _get_result_export_path(calc_id, target_dir, result):
core.makedirs(directory)
if output_type in ('hazard_curve', 'hazard_map', 'uh_spectra'):
+ # include the poe in hazard map and uhs file names
+ if output_type in ('hazard_map', 'uh_spectra'):
+ output_type = '%s-poe_%s' % (output_type, result.poe)
+
if result.statistics is not None:
# we could have stats
if result.statistics == 'quantile':
|
export/hazard:
Include "-poe_N.N-" in filenames for UHS and hazard maps.
|
diff --git a/oide/client/oide/components/filesystemservice/filesystemservice.spec.js b/oide/client/oide/components/filesystemservice/filesystemservice.spec.js
index <HASH>..<HASH> 100644
--- a/oide/client/oide/components/filesystemservice/filesystemservice.spec.js
+++ b/oide/client/oide/components/filesystemservice/filesystemservice.spec.js
@@ -84,6 +84,9 @@ describe('oide.filesystemservice', function(){
httpBackend.when('DELETE', /\/filebrowser\/localfiles.*/).respond(function(){
return [200, {'result': 'DELETED file'}];
});
+ httpBackend.whenGET(/\/filebrowser\/a\/fileutil\?filepath=.*&operation=GET_NEXT_DUPLICATE/).respond(function(){
+ return [200, {'filepath': '/home/saurabh/Untitled12'}];
+ });
}));
describe('Functionality of FilesystemService', function(){
@@ -123,5 +126,12 @@ describe('oide.filesystemservice', function(){
});
httpBackend.flush();
});
+ it('should be able to get the next duplicate filename', function(){
+ $filesystemservice.getNextDuplicate(files[0].filepath, function(data){
+ expect(data.originalFile).toBeDefined();
+ expect(data.filepath).toBe('/home/saurabh/Untitled12');
+ });
+ httpBackend.flush();
+ });
});
});
|
add spec to get next duplicate file
|
diff --git a/service.js b/service.js
index <HASH>..<HASH> 100755
--- a/service.js
+++ b/service.js
@@ -220,12 +220,7 @@ class ServiceConsul extends service.Service {
};
}
- const modified = super._configure(config);
-
- // TODO where does baseUrl come from ?
- delete this.consulOptions.baseUrl;
-
- return modified;
+ return super._configure(config);
}
get consul() {
diff --git a/tests/service_test.js b/tests/service_test.js
index <HASH>..<HASH> 100644
--- a/tests/service_test.js
+++ b/tests/service_test.js
@@ -20,7 +20,6 @@ describe('consul service', function () {
}, {
logLevel: 'trace',
name: 'consul',
- //port: 4713,
checkInterval: 100
}], [ServiceConsul, require('kronos-service-health-check'), require('kronos-service-koa')]).then(
manager => {
|
fix: no longer needed to delete this.consulOptions.baseUrl
|
diff --git a/src/Draggable/tests/Draggable.test.js b/src/Draggable/tests/Draggable.test.js
index <HASH>..<HASH> 100644
--- a/src/Draggable/tests/Draggable.test.js
+++ b/src/Draggable/tests/Draggable.test.js
@@ -414,6 +414,28 @@ describe('Draggable', () => {
.toBeInstanceOf(DragStartEvent);
});
+ test('sets dragging to false when `drag:start` event is canceled', () => {
+ const newInstance = new Draggable(containers, {
+ draggable: 'li',
+ });
+ const draggableElement = sandbox.querySelector('li');
+ document.elementFromPoint = () => draggableElement;
+
+ const callback = jest.fn((event) => {
+ event.cancel();
+ });
+ newInstance.on('drag:start', callback);
+
+ triggerEvent(draggableElement, 'mousedown', {button: 0});
+
+ // Wait for delay
+ jest.runTimersToTime(100);
+
+ triggerEvent(draggableElement, 'dragstart', {button: 0});
+
+ expect(newInstance.dragging).toBeFalsy();
+ });
+
test('triggers `drag:move` drag event on mousedown', () => {
const newInstance = new Draggable(containers, {
draggable: 'li',
|
test(dragging): dragging false on drag:start cancel
|
diff --git a/service/env.go b/service/env.go
index <HASH>..<HASH> 100644
--- a/service/env.go
+++ b/service/env.go
@@ -35,6 +35,11 @@ func (e Environment) IsProduction() bool {
return e == EnvProduction
}
+// IsHosted returns true if env if prod or staging
+func (e Environment) IsHosted() bool {
+ return e == EnvProduction || e == EnvStaging
+}
+
// IsDevelopment returns true iff env is development.
func (e Environment) IsDevelopment() bool {
return e == EnvDevelopment
|
Add IsHosted flag for checking prod + staging.
|
diff --git a/lib/Ogone/PaymentResponse.php b/lib/Ogone/PaymentResponse.php
index <HASH>..<HASH> 100644
--- a/lib/Ogone/PaymentResponse.php
+++ b/lib/Ogone/PaymentResponse.php
@@ -43,15 +43,19 @@ interface PaymentResponse extends Response
/**
* @var int
*/
- const STATUS_PAYMENT = 91;
+ const STATUS_AUTHORISATION_NOT_KNOWN = 52;
/**
* @var int
*/
- const STATUS_AUTHORISATION_NOT_KNOWN = 52;
+ const STATUS_PAYMENT = 91;
/**
* @var int
*/
const STATUS_PAYMENT_UNCERTAIN = 92;
+ /**
+ * @var int
+ */
+ const STATUS_PAYMENT_REFUSED = 93;
}
|
Added response status code <I>
|
diff --git a/framework/web/Session.php b/framework/web/Session.php
index <HASH>..<HASH> 100644
--- a/framework/web/Session.php
+++ b/framework/web/Session.php
@@ -96,7 +96,9 @@ class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Co
public function init()
{
parent::init();
- register_shutdown_function([$this, 'close']);
+ if ($this->getIsActive()) {
+ Yii::warning("Session is already started", __METHOD__);
+ }
}
/**
@@ -129,6 +131,7 @@ class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Co
if ($this->getIsActive()) {
Yii::info('Session started', __METHOD__);
$this->updateFlashCounters();
+ register_shutdown_function([$this, 'close']);
} else {
$error = error_get_last();
$message = isset($error['message']) ? $error['message'] : 'Failed to start session.';
|
1. Added init() warning to session component
2. register_shutdown_function() for Session::close now only calls after successful session open
|
diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/scheme.go b/staging/src/k8s.io/apimachinery/pkg/runtime/scheme.go
index <HASH>..<HASH> 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/scheme.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/scheme.go
@@ -70,7 +70,7 @@ type Scheme struct {
defaulterFuncs map[reflect.Type]func(interface{})
// converter stores all registered conversion functions. It also has
- // default coverting behavior.
+ // default converting behavior.
converter *conversion.Converter
// versionPriority is a map of groups to ordered lists of versions for those groups indicating the
|
Fix a typo: coverting -> converting
|
diff --git a/server.go b/server.go
index <HASH>..<HASH> 100644
--- a/server.go
+++ b/server.go
@@ -264,6 +264,12 @@ func (s *Server) close() error {
_ = sh.close()
}
+ // Server is closing, empty maps which should be reloaded on open.
+ s.shards = nil
+ s.dataNodes = nil
+ s.databases = nil
+ s.users = nil
+
return nil
}
|
Clear server maps on close
These maps are reloaded from the metastore on open.
|
diff --git a/aagent/watchers/execwatcher/exec.go b/aagent/watchers/execwatcher/exec.go
index <HASH>..<HASH> 100644
--- a/aagent/watchers/execwatcher/exec.go
+++ b/aagent/watchers/execwatcher/exec.go
@@ -8,6 +8,7 @@ import (
"context"
"encoding/json"
"fmt"
+ "math/rand"
"os"
"os/exec"
"sync"
@@ -47,6 +48,7 @@ type Properties struct {
GovernorTimeout time.Duration `mapstructure:"governor_timeout"`
OutputAsData bool `mapstructure:"parse_as_data"`
SuppressSuccessAnnounce bool `mapstructure:"suppress_success_announce"`
+ GatherInitialState bool `mapstructure:"gather_initial_state"`
Timeout time.Duration
}
@@ -160,11 +162,17 @@ func (w *Watcher) intervalWatcher(ctx context.Context, wg *sync.WaitGroup) {
defer wg.Done()
tick := time.NewTicker(w.interval)
+ if w.properties.GatherInitialState {
+ splay := time.Duration(rand.Intn(30)) * time.Second
+ w.Infof("Performing initial execution after %v", splay)
+ tick.Reset(splay)
+ }
for {
select {
case <-tick.C:
w.performWatch(ctx, false)
+ tick.Reset(w.interval)
case <-ctx.Done():
tick.Stop()
|
(#<I>) Support initial fast gather in execs
|
diff --git a/app/models/unique_key.rb b/app/models/unique_key.rb
index <HASH>..<HASH> 100644
--- a/app/models/unique_key.rb
+++ b/app/models/unique_key.rb
@@ -32,6 +32,7 @@ class UniqueKey < ActiveRecord::Base
viewable = new_record.viewable
end
end
+ viewable.try(:uuid) # forces uuid creation
viewable
end
end
|
forces uuid after all viewables creation
|
diff --git a/aio/scripts/test-pwa-score.js b/aio/scripts/test-pwa-score.js
index <HASH>..<HASH> 100644
--- a/aio/scripts/test-pwa-score.js
+++ b/aio/scripts/test-pwa-score.js
@@ -79,6 +79,9 @@ function launchChromeAndRunLighthouse(url, flags, config) {
return launcher.run().
then(() => lighthouse(url, flags, config)).
+ // Avoid race condition by adding a delay before killing Chrome.
+ // (See also https://github.com/paulirish/pwmetrics/issues/63#issuecomment-282721068.)
+ then(results => new Promise(resolve => setTimeout(() => resolve(results), 1000))).
then(results => launcher.kill().then(() => results)).
catch(err => launcher.kill().then(() => { throw err; }, () => { throw err; }));
}
|
fix(aio): fix PWA testing on Windows (and reduce flaky-ness)
Adding a delay after Lighthouse has run and before killing the Chrome process
avoids `ECONNREFUSED` errors on Windows and will hopefully prevent such errors
occasionally appearing on CI.
Based on info in:
<URL>
|
diff --git a/lib/bade/version.rb b/lib/bade/version.rb
index <HASH>..<HASH> 100644
--- a/lib/bade/version.rb
+++ b/lib/bade/version.rb
@@ -1,4 +1,4 @@
module Bade
- VERSION = '0.1.1'
+ VERSION = '0.1.2'
end
|
Bump to version <I>
|
diff --git a/news-bundle/src/ContaoNewsBundle.php b/news-bundle/src/ContaoNewsBundle.php
index <HASH>..<HASH> 100644
--- a/news-bundle/src/ContaoNewsBundle.php
+++ b/news-bundle/src/ContaoNewsBundle.php
@@ -15,7 +15,7 @@ use Contao\CoreBundle\HttpKernel\Bundle\ContaoBundle;
/**
* Configures the Contao news bundle.
*
- * @author Leo Feyer <https://contao.org>
+ * @author Leo Feyer <https://github.com/leofeyer>
*/
class ContaoNewsBundle extends ContaoBundle
{
|
[News] Update the copyright notices
|
diff --git a/ui/src/dashboards/containers/DashboardPage.js b/ui/src/dashboards/containers/DashboardPage.js
index <HASH>..<HASH> 100644
--- a/ui/src/dashboards/containers/DashboardPage.js
+++ b/ui/src/dashboards/containers/DashboardPage.js
@@ -209,7 +209,11 @@ class DashboardPage extends Component {
const dygraphs = [...this.state.dygraphs, dygraph]
const {dashboards, params} = this.props
const dashboard = dashboards.find(d => d.id === +params.dashboardID)
- if (dashboard && dygraphs.length === dashboard.cells.length) {
+ if (
+ dashboard &&
+ dygraphs.length === dashboard.cells.length &&
+ dashboard.cells.length > 1
+ ) {
Dygraph.synchronize(dygraphs, {
selection: true,
zoom: false,
|
Dont sync graphs if there is only one graph
|
diff --git a/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php b/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php
index <HASH>..<HASH> 100644
--- a/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php
+++ b/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php
@@ -189,14 +189,6 @@ class NodeIndexer extends AbstractNodeIndexer implements BulkNodeIndexerInterfac
]));
}
- if ($node->isRemoved()) {
- // TODO: handle deletion from the fulltext index as well
- $mappingType->deleteDocumentById($contextPathHash);
- $this->logger->log(sprintf('NodeIndexer: Removed node %s from index (node flagged as removed). ID: %s', $contextPath, $contextPathHash), LOG_DEBUG, null, 'ElasticSearch (CR)');
-
- return;
- }
-
$logger = $this->logger;
$fulltextIndexOfNode = [];
$nodePropertiesToBeStoredInIndex = $this->extractPropertiesAndFulltext($node, $fulltextIndexOfNode, function ($propertyName) use ($logger, $documentIdentifier, $node) {
|
TASK: Remove code that is never used
The case removed with this is never reached, since a removed node will
never be handled here. Instead, due to the way removal is handled in the
Content Repository and the way we use the signals emitted, a removed node
is either handled in removeNode() or not found for an update, since the
publication of a removal was already done at this point.
|
diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/App.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/App.java
index <HASH>..<HASH> 100644
--- a/rapidoid-http-server/src/main/java/org/rapidoid/setup/App.java
+++ b/rapidoid-http-server/src/main/java/org/rapidoid/setup/App.java
@@ -123,6 +123,7 @@ public class App extends RapidoidThing {
Res.reset();
Templates.reset();
JSON.reset();
+ AppBootstrap.reset();
for (Setup setup : Setup.instances()) {
setup.reload();
|
Restart bootstrap on app restart.
|
diff --git a/rshell/main.py b/rshell/main.py
index <HASH>..<HASH> 100755
--- a/rshell/main.py
+++ b/rshell/main.py
@@ -969,6 +969,7 @@ def recv_file_from_host(src_file, dst_filename, filesize, dst_mode='wb'):
"""Function which runs on the pyboard. Matches up with send_file_to_remote."""
import sys
import ubinascii
+ import os
if HAS_BUFFER:
try:
import pyb
@@ -1011,6 +1012,8 @@ def recv_file_from_host(src_file, dst_filename, filesize, dst_mode='wb'):
dst_file.write(write_buf[0:read_size])
else:
dst_file.write(ubinascii.unhexlify(write_buf[0:read_size]))
+ if hasattr(os, 'sync'):
+ os.sync()
bytes_remaining -= read_size
return True
except:
diff --git a/rshell/version.py b/rshell/version.py
index <HASH>..<HASH> 100644
--- a/rshell/version.py
+++ b/rshell/version.py
@@ -1 +1 @@
-__version__ = '0.0.25'
+__version__ = '0.0.26'
|
Call os.sync to make UART transfer more reliable
|
diff --git a/test/extended/include.go b/test/extended/include.go
index <HASH>..<HASH> 100644
--- a/test/extended/include.go
+++ b/test/extended/include.go
@@ -57,4 +57,6 @@ import (
_ "github.com/openshift/origin/test/extended/security"
_ "github.com/openshift/origin/test/extended/templates"
_ "github.com/openshift/origin/test/extended/user"
+
+ _ "github.com/openshift/origin/test/e2e/dr"
)
|
tests: import 'dr' package so that DR tests were registered in disruptive suite
|
diff --git a/lib/adapters/serializers/csv.js b/lib/adapters/serializers/csv.js
index <HASH>..<HASH> 100644
--- a/lib/adapters/serializers/csv.js
+++ b/lib/adapters/serializers/csv.js
@@ -2,6 +2,7 @@ var _ = require('underscore');
var base = require('./base');
var csv = require('csv-write-stream');
var errors = require('../../errors');
+var values = require('../../runtime/values');
module.exports = base.extend({
@@ -11,6 +12,12 @@ module.exports = base.extend({
_.each(points, function(point) {
var keys = _.keys(point);
+ _.each(point, function(value, key) {
+ if (values.isArray(value) || values.isObject(value)) {
+ point[key] = JSON.stringify(value);
+ }
+ });
+
if (!self.headers) {
self.headers = keys;
self.csvWriter = csv({
|
CSV stdio serializer supports arrays/objects
Serialize array/object values using JSON, to keep point structure flat
and processable by CSV writer.
|
diff --git a/spyder_kernels/customize/spydercustomize.py b/spyder_kernels/customize/spydercustomize.py
index <HASH>..<HASH> 100644
--- a/spyder_kernels/customize/spydercustomize.py
+++ b/spyder_kernels/customize/spydercustomize.py
@@ -228,18 +228,6 @@ class IPyTesProgram(TestProgram):
TestProgram.__init__(self, *args, **kwargs)
unittest.main = IPyTesProgram
-# Patch ipykernel to avoid errors when setting the Qt5 Matplotlib
-# backemd
-# Fixes Issue 6091
-import ipykernel
-import IPython
-if LooseVersion(ipykernel.__version__) <= LooseVersion('4.7.0'):
- if ((PY2 and LooseVersion(IPython.__version__) >= LooseVersion('5.5.0')) or
- (not PY2 and LooseVersion(IPython.__version__) >= LooseVersion('6.2.0'))
- ):
- from ipykernel import eventloops
- eventloops.loop_map['qt'] = eventloops.loop_map['qt5']
-
#==============================================================================
# Pandas adjustments
|
Spydercustomize: Remove check for ipykernel versions we don't support anymore
|
diff --git a/app/lib/actions/katello/product/reindex_subscriptions.rb b/app/lib/actions/katello/product/reindex_subscriptions.rb
index <HASH>..<HASH> 100644
--- a/app/lib/actions/katello/product/reindex_subscriptions.rb
+++ b/app/lib/actions/katello/product/reindex_subscriptions.rb
@@ -15,7 +15,7 @@ module Actions
plan_self(id: product.id, subscription_id: subscription_id)
end
- def run
+ def finalize
product = ::Katello::Product.find_by!(:id => input[:id])
product.import_subscription(input[:subscription_id])
end
|
Fixes #<I> - Import sub for custom product after save (#<I>)
Subscriptions were being imported for a custom product, but not
associating to that product's pool. Importing them after they have
been saved with candlepin id will assure the association is being
created.
|
diff --git a/spyderlib/plugins/__init__.py b/spyderlib/plugins/__init__.py
index <HASH>..<HASH> 100644
--- a/spyderlib/plugins/__init__.py
+++ b/spyderlib/plugins/__init__.py
@@ -307,12 +307,7 @@ class SpyderPluginMixin(object):
title = self.get_plugin_title()
if self.CONF_SECTION == 'editor':
title = _('Editor')
- try:
- shortcut = CONF.get('shortcuts', '_/switch to ' + self.CONF_SECTION)
- except configparser.NoOptionError:
- shortcut = None
- action = create_action(self, title, toggled=self.toggle_view,
- shortcut=shortcut)
+ action = create_action(self, title, toggled=self.toggle_view)
self.toggle_view_action = action
def toggle_view(self, checked):
|
Revert revision <I>e2a1ab2d<I>
- Adding shortcuts to Panes menu entries created ambiguities in all of them
which let them unapplied
|
diff --git a/addons/knobs/src/components/Panel.js b/addons/knobs/src/components/Panel.js
index <HASH>..<HASH> 100644
--- a/addons/knobs/src/components/Panel.js
+++ b/addons/knobs/src/components/Panel.js
@@ -86,6 +86,8 @@ export default class KnobPanel extends PureComponent {
const value = Types[knob.type].deserialize(urlValue);
knob.value = value;
queryParams[`knob-${name}`] = Types[knob.type].serialize(value);
+
+ api.emit(CHANGE, knob);
}
}
});
|
REVERT removal of event firing upon knob being set from url state
|
diff --git a/djangocms_page_tags/__init__.py b/djangocms_page_tags/__init__.py
index <HASH>..<HASH> 100644
--- a/djangocms_page_tags/__init__.py
+++ b/djangocms_page_tags/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import, print_function, unicode_literals
-__version__ = '0.6.2'
+__version__ = '0.7.0.dev1'
__author__ = 'Iacopo Spalletti <i.spalletti@nephila.it>'
|
Bump develop version [ci skip]
|
diff --git a/twitter4j-core/src/test/java/twitter4j/HelpMethodsTest.java b/twitter4j-core/src/test/java/twitter4j/HelpMethodsTest.java
index <HASH>..<HASH> 100644
--- a/twitter4j-core/src/test/java/twitter4j/HelpMethodsTest.java
+++ b/twitter4j-core/src/test/java/twitter4j/HelpMethodsTest.java
@@ -45,9 +45,9 @@ public class HelpMethodsTest extends TwitterTestBase {
TwitterAPIConfiguration conf = twitter1.getAPIConfiguration();
assertEquals(3145728, conf.getPhotoSizeLimit());
- assertEquals(20, conf.getCharactersReservedPerMedia());
- assertEquals(19, conf.getShortURLLength());
- assertEquals(20, conf.getShortURLLengthHttps());
+ assertEquals(21, conf.getCharactersReservedPerMedia());
+ assertEquals(20, conf.getShortURLLength());
+ assertEquals(21, conf.getShortURLLengthHttps());
assertEquals(4, conf.getPhotoSizes().size());
assertTrue(20 < conf.getNonUsernamePaths().length);
assertEquals(1, conf.getMaxMediaPerUpload());
|
adapting recent t.co changes.
|
diff --git a/management/src/main/java/org/kaazing/gateway/management/gateway/GatewayManagementBeanImpl.java b/management/src/main/java/org/kaazing/gateway/management/gateway/GatewayManagementBeanImpl.java
index <HASH>..<HASH> 100644
--- a/management/src/main/java/org/kaazing/gateway/management/gateway/GatewayManagementBeanImpl.java
+++ b/management/src/main/java/org/kaazing/gateway/management/gateway/GatewayManagementBeanImpl.java
@@ -331,12 +331,12 @@ public class GatewayManagementBeanImpl extends AbstractManagementBean
JSONArray jsonArray = new JSONArray();
for (String balanceeURI : balancees) {
- jsonArray.put(balanceeURI.toString());
+ jsonArray.put(balanceeURI);
}
- jsonObj.put(uri.toString(), jsonArray);
+ jsonObj.put(uri, jsonArray);
} else {
- jsonObj.put(uri.toString(), JSONObject.NULL);
+ jsonObj.put(uri, JSONObject.NULL);
}
}
} catch (JSONException ex) {
|
Added minor fix (removed unnecessary toString() method)
|
diff --git a/src/main/java/com/stripe/model/EventDataDeserializer.java b/src/main/java/com/stripe/model/EventDataDeserializer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/stripe/model/EventDataDeserializer.java
+++ b/src/main/java/com/stripe/model/EventDataDeserializer.java
@@ -19,6 +19,7 @@ public class EventDataDeserializer implements JsonDeserializer<EventData> {
@SuppressWarnings("rawtypes")
static Map<String, Class> objectMap = new HashMap<String, Class>();
static {
+ objectMap.put("account", Account.class);
objectMap.put("charge", Charge.class);
objectMap.put("discount", Discount.class);
objectMap.put("customer", Customer.class);
|
Add ability to deserialize account-related events.
|
diff --git a/chef/lib/chef/provider/deploy/revision.rb b/chef/lib/chef/provider/deploy/revision.rb
index <HASH>..<HASH> 100644
--- a/chef/lib/chef/provider/deploy/revision.rb
+++ b/chef/lib/chef/provider/deploy/revision.rb
@@ -53,8 +53,7 @@ class Chef
def load_cache
begin
JSON.parse(Chef::FileCache.load("revision-deploys/#{new_resource.name}"))
- rescue
- Chef::Exceptions::FileNotFound
+ rescue Chef::Exceptions::FileNotFound
save_cache([])
end
end
@@ -67,4 +66,4 @@ class Chef
end
end
end
-end
\ No newline at end of file
+end
|
fix typo in rescue clause
rescue Chef::Exceptions::FileNotFound as intended instead of
StandardError as was actually happening
|
diff --git a/lib/plum/client/legacy_client_session.rb b/lib/plum/client/legacy_client_session.rb
index <HASH>..<HASH> 100644
--- a/lib/plum/client/legacy_client_session.rb
+++ b/lib/plum/client/legacy_client_session.rb
@@ -96,7 +96,7 @@ module Plum
parser = HTTP::Parser.new
parser.on_headers_complete = proc {
resp_headers = parser.headers.map { |key, value| [key.downcase, value] }.to_h
- @response._headers({ ":status" => parser.status_code }.merge(resp_headers))
+ @response._headers({ ":status" => parser.status_code.to_s }.merge(resp_headers))
@headers_callback.call(@response) if @headers_callback
}
|
client/legacy_client_session: fix response header: ':status' header's value must be String for consistency
|
diff --git a/scapy/route.py b/scapy/route.py
index <HASH>..<HASH> 100644
--- a/scapy/route.py
+++ b/scapy/route.py
@@ -137,8 +137,9 @@ class Route:
pathes=[]
for d,m,gw,i,a in self.routes:
aa = atol(a)
- if aa == dst:
- pathes.append((0xffffffff,(LOOPBACK_NAME,a,"0.0.0.0")))
+ #Commented out after issue with virtual network with local address 0.0.0.0
+ #if aa == dst:
+ # pathes.append((0xffffffff,(LOOPBACK_NAME,a,"0.0.0.0")))
if (dst & m) == (d & m):
pathes.append((m,(i,a,gw)))
if not pathes:
|
Issue with virtual local network with address <I>
|
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index <HASH>..<HASH> 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -922,10 +922,13 @@ class AuthComponent extends Object {
return $this->authenticate->hashPasswords($data);
}
- $model =& $this->getModel();
- if (is_array($data) && isset($data[$model->alias])) {
- if (isset($data[$model->alias][$this->fields['username']]) && isset($data[$model->alias][$this->fields['password']])) {
- $data[$model->alias][$this->fields['password']] = $this->password($data[$model->alias][$this->fields['password']]);
+ if (is_array($data)) {
+ $model =& $this->getModel();
+
+ if(isset($data[$model->alias])) {
+ if (isset($data[$model->alias][$this->fields['username']]) && isset($data[$model->alias][$this->fields['password']])) {
+ $data[$model->alias][$this->fields['password']] = $this->password($data[$model->alias][$this->fields['password']]);
+ }
}
}
return $data;
|
Don't get User model if not needed. Fixes #<I>
|
diff --git a/HTSeq/__init__.py b/HTSeq/__init__.py
index <HASH>..<HASH> 100644
--- a/HTSeq/__init__.py
+++ b/HTSeq/__init__.py
@@ -7,8 +7,6 @@ import itertools, warnings
from _HTSeq import *
-import pysam
-
from _version import __version__
#from vcf_reader import *
@@ -721,12 +719,15 @@ class VCF_Reader( FileOrSequence ):
class BAM_Reader( object ):
def __init__( self, filename ):
+ global pysam
self.filename = filename
-
- def seek( self ):
-
+ try:
+ import pysam
+ except ImportError:
+ print "Please Install PySam to use the BAM_Reader Class (http://code.google.com/p/pysam/)"
+ raise
def __iter__( self ):
sf = pysam.Samfile(self.filename, "rb")
for pa in sf:
- yield HTSeq.SAM_Alignment.from_pysam_AlignedRead( pa, sf )
+ yield SAM_Alignment.from_pysam_AlignedRead( pa, sf )
|
conditional pysam dependency added
|
diff --git a/example/example-advanced-specs.js b/example/example-advanced-specs.js
index <HASH>..<HASH> 100644
--- a/example/example-advanced-specs.js
+++ b/example/example-advanced-specs.js
@@ -17,15 +17,17 @@ co(function * () {
* Module specification.
* @see https://github.com/realglobe-Inc/sg-schemas/blob/master/lib/module_spec.json
*/
- $spec: {
- name: 'sugo-demo-actor-sample',
- version: '1.0.0',
- desc: 'A sample module',
- methods: {
- watchFile: {
- params: [
- { name: 'pattern', desc: 'Glob pattern files to watch' }
- ]
+ get $spec() {
+ return {
+ name: 'sugo-demo-actor-sample',
+ version: '1.0.0',
+ desc: 'A sample module',
+ methods: {
+ watchFile: {
+ params: [
+ { name: 'pattern', desc: 'Glob pattern files to watch' }
+ ]
+ }
}
}
}
|
Update example-advanced-specs.js
|
diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb
index <HASH>..<HASH> 100644
--- a/activesupport/lib/active_support/basic_object.rb
+++ b/activesupport/lib/active_support/basic_object.rb
@@ -1,21 +1,14 @@
module ActiveSupport
- if defined? ::BasicObject
- # A class with no predefined methods that behaves similarly to Builder's
- # BlankSlate. Used for proxy classes.
- class BasicObject < ::BasicObject
- undef_method :==
- undef_method :equal?
+ # A class with no predefined methods that behaves similarly to Builder's
+ # BlankSlate. Used for proxy classes.
+ class BasicObject < ::BasicObject
+ undef_method :==
+ undef_method :equal?
- # Let ActiveSupport::BasicObject at least raise exceptions.
- def raise(*args)
- ::Object.send(:raise, *args)
- end
- end
- else
- class BasicObject #:nodoc:
- instance_methods.each do |m|
- undef_method(m) if m.to_s !~ /(?:^__|^nil\?$|^send$|^object_id$)/
- end
+ # Let ActiveSupport::BasicObject at least raise exceptions.
+ def raise(*args)
+ ::Object.send(:raise, *args)
end
end
+
end
|
::BasicObject always defined in ruby <I>
|
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index <HASH>..<HASH> 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -473,7 +473,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
var tableRowLimits = piwik.config.datatable_row_limits,
evolutionLimits =
{
- day: [30, 60, 90, 180, 365, 500],
+ day: [7, 30, 60, 90, 180, 365, 500],
week: [4, 12, 26, 52, 104, 500],
month: [3, 6, 12, 24, 36, 120],
year: [3, 5, 10]
|
fixes #<I> 7 days in Evolution over the period when Period is Day
|
diff --git a/packages/phenomic/src/commands/build.js b/packages/phenomic/src/commands/build.js
index <HASH>..<HASH> 100644
--- a/packages/phenomic/src/commands/build.js
+++ b/packages/phenomic/src/commands/build.js
@@ -61,7 +61,7 @@ async function build(config) {
debug("building")
const phenomicServer = createServer(db, config.plugins)
const port = await getPort()
- phenomicServer.listen(port)
+ const runningServer = phenomicServer.listen(port)
debug("server ready")
// Build webpack
@@ -86,6 +86,9 @@ async function build(config) {
await config.bundler.build(config)
console.log("📦 Webpack built " + (Date.now() - lastStamp) + "ms")
lastStamp = Date.now()
+
+ runningServer.close()
+ debug("server closed")
}
export default (options) => {
|
Close phenomic server properly after build
|
diff --git a/app/controllers/doorkeeper/application_controller.rb b/app/controllers/doorkeeper/application_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/doorkeeper/application_controller.rb
+++ b/app/controllers/doorkeeper/application_controller.rb
@@ -4,11 +4,7 @@ module Doorkeeper
include Helpers::Controller
- if ::Rails.version.to_i < 4
- protect_from_forgery
- else
- protect_from_forgery with: :exception
- end
+ protect_from_forgery with: :exception
helper 'doorkeeper/dashboard'
end
|
Remove the dead code for legacy Rails
The Rails 3.x support is dropped since <I>f<I>.
|
diff --git a/filters/validations.py b/filters/validations.py
index <HASH>..<HASH> 100644
--- a/filters/validations.py
+++ b/filters/validations.py
@@ -103,7 +103,13 @@ def CSVofIntegers(msg=None):
try:
if isinstance(value, unicode):
if ',' in value:
- value = map(int, filter(bool, value.split(',')))
+ value = map(
+ int, filter(
+ bool, map(
+ lambda x: x.strip(), value.split(',')
+ )
+ )
+ )
return value
else:
return int(value)
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ except (ImportError, OSError):
os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
__name__ = 'drf-url-filters'
-__version__ = '0.1.3'
+__version__ = '0.1.4'
__author__ = 'Manjit Kumar'
__author_email__ = 'manjit1727@gmail.com'
__url__ = 'https://github.com/manjitkumar/drf-url-filters'
|
Fix empty spaces while validating CSV of integers. (#8)
* Fix empty spaces while validating CSV of integers.
* Update setup.py
* Update validations.py
|
diff --git a/src/CoandaCMS/Coanda/Pages/Repositories/Eloquent/Models/PageVersion.php b/src/CoandaCMS/Coanda/Pages/Repositories/Eloquent/Models/PageVersion.php
index <HASH>..<HASH> 100644
--- a/src/CoandaCMS/Coanda/Pages/Repositories/Eloquent/Models/PageVersion.php
+++ b/src/CoandaCMS/Coanda/Pages/Repositories/Eloquent/Models/PageVersion.php
@@ -159,7 +159,7 @@ class PageVersion extends Eloquent {
$new_attribute = new \CoandaCMS\Coanda\Pages\Repositories\Eloquent\Models\PageAttribute;
$new_attribute->type = $page_attribute_type->identifier();
- $new_attribute->identifier = $definition['identifier'];
+ $new_attribute->identifier = $attribute_identifier;
$new_attribute->order = $index;
$this->attributes()->save($new_attribute);
|
Bugfix - should have been using attribute identifier.
|
diff --git a/lib/spaceship/base.rb b/lib/spaceship/base.rb
index <HASH>..<HASH> 100644
--- a/lib/spaceship/base.rb
+++ b/lib/spaceship/base.rb
@@ -52,13 +52,12 @@ module Spaceship
module_name = method_sym.to_s
module_name.sub!(/^[a-z\d]/) { $&.upcase }
module_name.gsub!(/(?:_|(\/))([a-z\d])/) { $2.upcase }
- const_name = "#{self.name}::#{module_name}"
- # if const_defined?(const_name)
- klass = const_get(const_name)
+ if const_defined?(module_name)
+ klass = const_get(module_name)
klass.set_client(@client)
- # else
- # super
- # end
+ else
+ super
+ end
end
end
|
fixes issue #<I> - Module#const_defined? has different behavior in <I> vs <I>
|
diff --git a/swift/storage.py b/swift/storage.py
index <HASH>..<HASH> 100644
--- a/swift/storage.py
+++ b/swift/storage.py
@@ -1,6 +1,7 @@
from StringIO import StringIO
import re
import os
+import posixpath
import urlparse
import hmac
from hashlib import sha1
@@ -103,6 +104,23 @@ class SwiftStorage(Storage):
s = name.strip().replace(' ', '_')
return re.sub(r'(?u)[^-_\w./]', '', s)
+ def get_available_name(self, name):
+ """
+ Returns a filename that's free on the target storage system, and
+ available for new content to be written to.
+ """
+ dir_name, file_name = os.path.split(name)
+ file_root, file_ext = os.path.splitext(file_name)
+ # If the filename already exists, add an underscore and a number (before
+ # the file extension, if one exists) to the filename until the generated
+ # filename doesn't exist.
+ count = itertools.count(1)
+ while self.exists(name):
+ # file_ext includes the dot.
+ name = posixpath.join(dir_name, "%s_%s%s" % (file_root, next(count), file_ext))
+
+ return name
+
def size(self, name):
headers = self.connection.head_object(self.container_name, name)
return int(headers['content-length'])
|
Override get_available_name with posixpath.join
Fixes #6
|
diff --git a/lib/musk/decorator/printable_track.rb b/lib/musk/decorator/printable_track.rb
index <HASH>..<HASH> 100644
--- a/lib/musk/decorator/printable_track.rb
+++ b/lib/musk/decorator/printable_track.rb
@@ -13,16 +13,36 @@ module Musk
"#{position_number}/#{positions_count}"
end
- [:position_number, :positions_count, :year, :comment].each do |method|
- define_method(method) do
- [nil, 0, "0"].include?(@track.send(method)) ? "-" : @track.send(method)
- end
+ def position_number
+ [nil, 0, "0"].include?(@track.position_number) ? "-" : @track.position_number
end
- [:title, :artist, :release, :genre].each do |method|
- define_method(method) do
- @track.send(method) or "-"
- end
+ def positions_count
+ [nil, 0, "0"].include?(@track.positions_count) ? "-" : @track.positions_count
+ end
+
+ def year
+ [nil, 0, "0"].include?(@track.year) ? "-" : @track.year
+ end
+
+ def comment
+ [nil, 0, "0"].include?(@track.comment) ? "-" : @track.comment
+ end
+
+ def title
+ @track.title or "-"
+ end
+
+ def artist
+ @track.artist or "-"
+ end
+
+ def release
+ @track.release or "-"
+ end
+
+ def genre
+ @track.genre or "-"
end
end
end
|
refactor Musk::Decorator::PrintableTrack
|
diff --git a/test/extended/operators/images.go b/test/extended/operators/images.go
index <HASH>..<HASH> 100644
--- a/test/extended/operators/images.go
+++ b/test/extended/operators/images.go
@@ -22,7 +22,9 @@ var _ = Describe("[Feature:Platform][Smoke] Managed cluster", func() {
// find out the current installed release info
out, err := oc.Run("adm", "release", "info").Args("--pullspecs", "-o", "json").Output()
if err != nil {
- e2e.Failf("unable to read release payload with error: %v", err)
+ // TODO need to determine why release tests are not having access to read payload
+ e2e.Logf("unable to read release payload with error: %v", err)
+ return
}
releaseInfo := &release.ReleaseInfo{}
if err := json.Unmarshal([]byte(out), &releaseInfo); err != nil {
|
extended: exit early if unable to read release payload
|
diff --git a/v2alpha/soap/client/client_test.go b/v2alpha/soap/client/client_test.go
index <HASH>..<HASH> 100644
--- a/v2alpha/soap/client/client_test.go
+++ b/v2alpha/soap/client/client_test.go
@@ -2,7 +2,6 @@ package client
import (
"context"
- "encoding/xml"
"fmt"
"net/http"
"net/http/httptest"
@@ -92,12 +91,8 @@ func TestPerformAction(t *testing.T) {
c := New(ts.URL + "/endpointpath")
- reqAction := &envelope.Action{
- XMLName: xml.Name{Space: "http://example.com/endpointns", Local: "Foo"},
- Args: &ActionArgs{
- Name: "World",
- },
- }
+ reqAction := envelope.NewAction("http://example.com/endpointns", "Foo",
+ &ActionArgs{Name: "World"})
reply := &ActionReply{}
replyAction := &envelope.Action{Args: reply}
|
Use envelope.NewAction in client_test.
|
diff --git a/webassembletool-core/src/main/java/net/webassembletool/cache/Rfc2616.java b/webassembletool-core/src/main/java/net/webassembletool/cache/Rfc2616.java
index <HASH>..<HASH> 100644
--- a/webassembletool-core/src/main/java/net/webassembletool/cache/Rfc2616.java
+++ b/webassembletool-core/src/main/java/net/webassembletool/cache/Rfc2616.java
@@ -346,6 +346,9 @@ public class Rfc2616 {
copyHeader(resource, output, "ETag");
copyHeader(resource, output, "Expires");
copyHeader(resource, output, "Cache-control");
+ // FIXME: We have to copy all headers except those that the RFC says not
+ // to. For now, we just add a missing (and important) header
+ copyHeader(resource, output, "Content-Disposition");
}
private final static void copyHeader(Resource resource, Output output,
|
copy the Content-disposition header. Just a patch waiting for a black list of headers (and copy of all the others)
|
diff --git a/gateway/static/script/form.js b/gateway/static/script/form.js
index <HASH>..<HASH> 100644
--- a/gateway/static/script/form.js
+++ b/gateway/static/script/form.js
@@ -65,7 +65,16 @@ $.fn.featform._onSubmit = function(ev) {
var options = $this.data('featform.options');
if (options.method == 'GET') {
var url = options.url;
- var serialized = $this.serialize();
+ var serialized = '';
+ var array = $this.serializeArray();
+ for (var i in array) {
+ if (array[i].value) {
+ if (serialized) serialized += '&';
+ serialized += array[i].name;
+ serialized += "=";
+ serialized += array[i].value;
+ }
+ }
if (serialized) {
url = url + "?" + serialized;
}
|
Fix gateway GET forms not to put empty values of optional fields into the
query string.
|
diff --git a/src/main/python/rlbot/version.py b/src/main/python/rlbot/version.py
index <HASH>..<HASH> 100644
--- a/src/main/python/rlbot/version.py
+++ b/src/main/python/rlbot/version.py
@@ -8,9 +8,11 @@ __version__ = '1.9.0'
release_notes = {
'1.9.0': """
- *Much* faster core dll initialization! - ccman32
+ - Adding support for a training mode! Check out https://github.com/RLBot/RLBotTraining - DomNomNom
- Allow the user to change the appearance of human and party-member bot agents via the GUI - r0bbi3
- Added game speed info to game tick packet and the ability to modify it via state setting - Marvin
- Make the game stop capturing the mouse cursor if only bots are playing - whatisaphone
+ - Various quality-of-life improvements - DomNomNom
""",
'1.8.3': """
- Allow SimpleControllerState initialization. - Marvin
|
Updating the <I> version notes.
|
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -118,6 +118,9 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface
case 'Symfony\Component\Validator\Constraints\Country':
return new TypeGuess('country', array(), Guess::HIGH_CONFIDENCE);
+ case 'Symfony\Component\Validator\Constraints\Currency':
+ return new TypeGuess('currency', array(), Guess::HIGH_CONFIDENCE);
+
case 'Symfony\Component\Validator\Constraints\Date':
return new TypeGuess('date', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
|
[Form] Guess currency field based on validator constraint
|
diff --git a/gnucash_portfolio/lib/__init__.py b/gnucash_portfolio/lib/__init__.py
index <HASH>..<HASH> 100644
--- a/gnucash_portfolio/lib/__init__.py
+++ b/gnucash_portfolio/lib/__init__.py
@@ -1,2 +1,2 @@
from . import Price, database
-from .settings import Settings
\ No newline at end of file
+#from .settings import Settings
\ No newline at end of file
|
removing Settings from library provided interfaces
|
diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index <HASH>..<HASH> 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -472,7 +472,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
for(var j=0, lenJ=this.grid[i].length; j<lenJ; j++) {
var tile = this.grid[i][j].createBackBuffer();
if(!tile) {
- return;
+ continue;
}
// to be able to correctly position the back buffer we
// place the tiles grid at (0, 0) in the back buffer
|
just skip tiles that are currently loading when creating the back buffer
|
diff --git a/modules/images.js b/modules/images.js
index <HASH>..<HASH> 100644
--- a/modules/images.js
+++ b/modules/images.js
@@ -13,7 +13,7 @@ module.exports = function(grunt, util, config) {
var imagesDir = 'images_src';
- var images = !!glob.sync(imagesDir + '/*.{png,jpg,gif}').length;
+ var images = !!glob.sync(imagesDir + '/*.{png,jpg,jpeg,gif}').length;
var svgs = !!glob.sync(imagesDir + '/*.svg').length;
if (!images && !svgs) return config;
@@ -24,7 +24,7 @@ module.exports = function(grunt, util, config) {
options: {
atBegin: true
},
- files: imagesDir + '/*.{png,jpg,gif,svg}',
+ files: imagesDir + '/*.{png,jpg,jpeg,gif,svg}',
tasks: ['images']
}
}
@@ -44,7 +44,7 @@ module.exports = function(grunt, util, config) {
{
expand: true,
cwd: imagesDir,
- src: '*.{png,jpg,gif}',
+ src: '*.{png,jpg,jpeg,gif}',
dest: 'images'
}
]
|
Images: add JPEG to the list of available extensions.
|
diff --git a/pythran/cxxtypes.py b/pythran/cxxtypes.py
index <HASH>..<HASH> 100644
--- a/pythran/cxxtypes.py
+++ b/pythran/cxxtypes.py
@@ -216,10 +216,14 @@ std::declval<bool>()))
def __add__(self, other):
worklist = list(self.types)
+ visited = set()
while worklist:
item = worklist.pop()
if item is other:
return self
+ if item in visited:
+ continue
+ visited.add(item)
if isinstance(item, CombinedTypes):
worklist.extend(item.types)
return Type.__add__(self, other)
|
Do not revisit combined types twice
This does speed up some type inference part.
Fix #<I>
|
diff --git a/bliss/core/api.py b/bliss/core/api.py
index <HASH>..<HASH> 100644
--- a/bliss/core/api.py
+++ b/bliss/core/api.py
@@ -145,7 +145,7 @@ class CmdAPI:
gds.hexdump(encoded, preamble=cmdobj.name + ':' + pad)
try:
- values = (self._host, self._port, cmdobj.name)
+ values = (self._host, self._port, str(cmdobj))
log.command('Sending to %s:%d: %s' % values)
self._socket.sendto(encoded, (self._host, self._port))
status = True
|
Issue #<I> - Print arguments when sending a command
|
diff --git a/src/main/java/com/profesorfalken/jpowershell/PowerShell.java b/src/main/java/com/profesorfalken/jpowershell/PowerShell.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/profesorfalken/jpowershell/PowerShell.java
+++ b/src/main/java/com/profesorfalken/jpowershell/PowerShell.java
@@ -344,7 +344,7 @@ public class PowerShell implements AutoCloseable {
* @param params the parameters of the script
* @return response with the output of the command
*/
- private PowerShellResponse executeScript(BufferedReader srcReader, String params) {
+ public PowerShellResponse executeScript(BufferedReader srcReader, String params) {
if (srcReader != null) {
File tmpFile = createWriteTempFile(srcReader);
|
Make public the executeScript method which uses BuffReader
|
diff --git a/src/Keboola/Syrup/Command/JobCommand.php b/src/Keboola/Syrup/Command/JobCommand.php
index <HASH>..<HASH> 100644
--- a/src/Keboola/Syrup/Command/JobCommand.php
+++ b/src/Keboola/Syrup/Command/JobCommand.php
@@ -170,6 +170,7 @@ class JobCommand extends ContainerAwareCommand
$status = self::STATUS_RETRY;
} catch (MaintenanceException $e) {
+ $jobResult = [];
$jobStatus = Job::STATUS_WAITING;
$status = self::STATUS_LOCK;
} catch (UserException $e) {
|
fix: return job status to waiting when maintenance occurs
|
diff --git a/lib/lolcommits/platform.rb b/lib/lolcommits/platform.rb
index <HASH>..<HASH> 100644
--- a/lib/lolcommits/platform.rb
+++ b/lib/lolcommits/platform.rb
@@ -123,8 +123,8 @@ module Lolcommits
# TODO: handle other platforms here (linux/windows) e.g with ffmpeg -list_devices
return unless Platform.platform_mac?
- capturer = Lolcommits::CaptureMacVideo.new
- `#{capturer.executable_path} -l`
+ videosnap = File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')
+ `#{videosnap} -l`
end
end
end
|
fix --devices command for macOS
|
diff --git a/css_optimiser.php b/css_optimiser.php
index <HASH>..<HASH> 100644
--- a/css_optimiser.php
+++ b/css_optimiser.php
@@ -77,7 +77,7 @@ if($is_custom)
setcookie ('custom_template', $_REQUEST['custom'], time()+360000);
}
else {
- setcookie ('custom_template', $_REQUEST['custom'], time()-3600);
+ setcookie ('custom_template', '', time()-3600);
}
rmdirr('temp');
|
Fixed small bug in cookie setting (had also made an earlier change here to avoid custom templates showing up forever)
|
diff --git a/src/Zephyrus/Security/SecuritySession.php b/src/Zephyrus/Security/SecuritySession.php
index <HASH>..<HASH> 100644
--- a/src/Zephyrus/Security/SecuritySession.php
+++ b/src/Zephyrus/Security/SecuritySession.php
@@ -91,7 +91,7 @@ class SecuritySession
private function laterSessionStart()
{
if (!is_null($this->fingerprint) && !$this->fingerprint->hasValidFingerprint()) {
- throw new \Exception("Session fingerprint doesn't match");
+ throw new \Exception("Session fingerprint doesn't match"); // @codeCoverageIgnore
}
if (!is_null($this->expiration) && $this->expiration->isObsolete()) {
return true;
|
Added coverage ignore for SecuritySession exception
|
diff --git a/dsl/failures.go b/dsl/failures.go
index <HASH>..<HASH> 100644
--- a/dsl/failures.go
+++ b/dsl/failures.go
@@ -14,10 +14,10 @@ func init() {
globalFailHandler = ginkgo.Fail
}
-// RegisterAgoutiFailHandler connects the implied assertions is Agouti's dsl with
+// RegisterAgoutiFailHandler connects the implied assertions in Agouti's dsl with
// Gingko. When set to ginkgo.Fail (the default), failures in Agouti's dsl-provided
// methods will cause test failures in Ginkgo.
-func RegisterAgoutiFailHandler(handler func(message string, callerSkip ...int)) {
+func RegisterAgoutiFailHandler(handler AgoutiFailHandler) {
globalFailHandler = handler
}
|
Update type of handler provided to RegisterAgoutiFailHandler in dsl
|
diff --git a/utool/util_path.py b/utool/util_path.py
index <HASH>..<HASH> 100644
--- a/utool/util_path.py
+++ b/utool/util_path.py
@@ -128,13 +128,14 @@ def delete(path, dryrun=False, recursive=True, verbose=True, ignore_errors=True,
return flag
-def remove_file_list(fpath_list):
+def remove_file_list(fpath_list, verbose=VERBOSE):
print('[path] Removing %d files' % len(fpath_list))
for fpath in fpath_list:
try:
os.remove(fpath) # Force refresh
except OSError as ex:
- printex(ex, 'Could not remove fpath = %r' % (fpath,), iswarning=True)
+ if verbose:
+ printex(ex, 'Could not remove fpath = %r' % (fpath,), iswarning=True)
pass
|
Option for suppressing warnings when deleting thumbnails
|
diff --git a/ipymd/test.py b/ipymd/test.py
index <HASH>..<HASH> 100644
--- a/ipymd/test.py
+++ b/ipymd/test.py
@@ -1,12 +1,14 @@
+import sys
import os
import os.path as op
from pprint import pprint
from ipymd.converters import nb_to_markdown, markdown_to_nb, process_latex
-
dir = op.dirname(os.path.realpath(__file__))
-code_wrap = 'atlas' # 'atlas' or 'markdown'
+# atlas or markdown
+code_wrap = sys.argv[1] if len(sys.argv) >= 2 else 'markdown'
+
path_md = op.join(dir, '../notebooks/test_%s.md' % code_wrap)
add_prompt = True
|
Added CLI option in test.py.
|
diff --git a/lib/jitsu.js b/lib/jitsu.js
index <HASH>..<HASH> 100644
--- a/lib/jitsu.js
+++ b/lib/jitsu.js
@@ -232,7 +232,7 @@ jitsu.setup = function (callback) {
//
// TODO: replace with custom logger method
//
- console.log(data);
+ // console.log(data);
}
};
});
|
[fix] Removing console.log for debug mode. Old .jitsuconf files are defaulted to "debug": true causing debug output for all upgraded versions.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,7 @@
-(function(inBrowser) {
+(function(isCommonJs) {
'use strict'
- var React = inBrowser ? window.React : require('react')
+ var React = isCommonJs ? require('react') : window.React
var tabbordionUuid = (function() {
var index = 0
@@ -639,13 +639,13 @@
}
})
- if (inBrowser) {
- window.Panel = Panel
- window.Tabbordion = Tabbordion
- } else {
+ if (isCommonJs) {
module.exports = {
Panel: Panel,
Tabbordion: Tabbordion
}
+ } else {
+ window.Panel = Panel
+ window.Tabbordion = Tabbordion
}
-})(typeof window !== 'undefined')
+})(typeof exports === 'object')
|
Reverse check from browser to CommonJS
|
diff --git a/www/medic.js b/www/medic.js
index <HASH>..<HASH> 100644
--- a/www/medic.js
+++ b/www/medic.js
@@ -49,5 +49,15 @@ exports.load = function (callback) {
xhr.onerror = function() {
callback();
}
- xhr.send();
+
+ try {
+ xhr.send(null);
+ }
+ catch(ex) {
+ // some platforms throw on a file not found
+ console.log('Did not find medic config file');
+ setTimeout(function(){
+ callback();
+ },0);
+ }
}
|
Handle case where file not found throws exception
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -1,2 +1,2 @@
-global.root_path = process.cwd();
+global.rootPath = process.cwd();
module.exports = require('./lib/babel-root-import.js');
|
Change root_path to camelcase
|
diff --git a/tests/integration-basic/tests.js b/tests/integration-basic/tests.js
index <HASH>..<HASH> 100644
--- a/tests/integration-basic/tests.js
+++ b/tests/integration-basic/tests.js
@@ -37,7 +37,7 @@ describe('Service Lifecyle Integration Test', function() {
if (error.message.indexOf('does not exist') > -1) return;
throw error;
}
- await spawn(serverlessExec, ['remove'], { cwd: tmpDir });
+ await spawn(serverlessExec, ['remove'], { cwd: tmpDir, env });
});
it('should create service in tmp directory', async () => {
@@ -84,7 +84,7 @@ describe('Service Lifecyle Integration Test', function() {
`;
fs.writeFileSync(path.join(tmpDir, 'handler.js'), newHandler);
- return spawn(serverlessExec, ['deploy'], { cwd: tmpDir });
+ return spawn(serverlessExec, ['deploy'], { cwd: tmpDir, env });
});
it('should invoke updated function from aws', async () => {
|
Ensure to rely on preprepared env
|
diff --git a/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java b/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java
index <HASH>..<HASH> 100644
--- a/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java
+++ b/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java
@@ -65,6 +65,7 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.openqa.selenium.TestWaiter.waitFor;
+import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
import static org.openqa.selenium.WaitingConditions.pageTitleToBe;
import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
@@ -134,8 +135,7 @@ public class FirefoxDriverTest extends JUnit4TestBase {
String sentText = "I like cheese\n\nIt's really nice";
String expectedText = textarea.getAttribute("value") + sentText;
textarea.sendKeys(sentText);
- String seenText = textarea.getAttribute("value");
- assertThat(seenText, equalTo(expectedText));
+ waitFor(elementValueToEqual(textarea, expectedText));
driver.quit();
}
|
EranMes: Make our tests properly wait for a value, rather than blindly assert.
r<I>
|
diff --git a/lib/Sabre/VObject/RecurrenceIterator.php b/lib/Sabre/VObject/RecurrenceIterator.php
index <HASH>..<HASH> 100644
--- a/lib/Sabre/VObject/RecurrenceIterator.php
+++ b/lib/Sabre/VObject/RecurrenceIterator.php
@@ -1039,8 +1039,7 @@ class RecurrenceIterator implements \Iterator {
// all wednesdays in this month.
$dayHits = array();
- $checkDate = clone $startDate;
- $checkDate->modify('first day of this month');
+ $checkDate = new \DateTime($startDate->format('Y-m-1'));
$checkDate->modify($dayName);
do {
|
Work around hhvm not being able to modify a date with 'first day of this month'
see <URL>
|
diff --git a/tests/tools/internal-rules/no-invalid-meta.js b/tests/tools/internal-rules/no-invalid-meta.js
index <HASH>..<HASH> 100644
--- a/tests/tools/internal-rules/no-invalid-meta.js
+++ b/tests/tools/internal-rules/no-invalid-meta.js
@@ -242,24 +242,14 @@ ruleTester.run("no-invalid-meta", rule, {
column: 5
}]
},
-
- /*
- * Rule doesn't export anything: Should warn on the Program node.
- * See https://github.com/eslint/eslint/issues/9534
- */
-
- /*
- * Should be invalid, but will currently show as valid due to #9534.
- * FIXME: Uncomment when #9534 is fixed in major release.
- * {
- * code: "",
- * errors: [{
- * message: "Rule does not export anything. Make sure rule exports an object according to new rule format.",
- * line: 1,
- * column: 1
- * }]
- * },
- */
+ {
+ code: "",
+ errors: [{
+ message: "Rule does not export anything. Make sure rule exports an object according to new rule format.",
+ line: 1,
+ column: 1
+ }]
+ },
{
code: "foo();",
errors: [{
|
Chore: Uncommented test for empty program for no-invalid-meta (#<I>)
|
diff --git a/lib/chef/resource/osx_profile.rb b/lib/chef/resource/osx_profile.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/resource/osx_profile.rb
+++ b/lib/chef/resource/osx_profile.rb
@@ -81,7 +81,7 @@ class Chef
def check_resource_semantics!
if mac? && node["platform_version"] =~ ">= 11.0"
- raise "The osx_profile resource is not available on macOS Big Sur or above due to the removal of apple support for CLI installation of profiles"
+ raise "The osx_profile resource is not available on macOS Big Sur or above due to the removal of Apple support for CLI installation of profiles"
end
if action == :remove
|
Capitalize apple
Dumb change simply to sign-off previous commit.
|
diff --git a/lib/session.py b/lib/session.py
index <HASH>..<HASH> 100644
--- a/lib/session.py
+++ b/lib/session.py
@@ -59,7 +59,7 @@ except ImportError:
from invenio.config import CFG_WEBSESSION_EXPIRY_LIMIT_REMEMBER, \
- CFG_WEBSESSION_CHECK_SESSION_ADDR
+ CFG_WEBSESSION_IPADDR_CHECK_SKIP_BITS
_qparm_re = re.compile(r'([\0- ]*'
r'([^\0- ;,=\"]+)="([^"]*)"'
@@ -369,8 +369,8 @@ class SessionManager:
# exceptions -- SessionError.format() by default -- is
# responsible for revoking the session cookie. Yuck.
raise SessionError(session_id=sessid)
- if (session.get_remote_address() >> CFG_WEBSESSION_CHECK_SESSION_ADDR !=
- request.get_environ("REMOTE_ADDR") >> CFG_WEBSESSION_CHECK_SESSION_ADDR):
+ if (session.get_remote_address() >> CFG_WEBSESSION_IPADDR_CHECK_SKIP_BITS !=
+ request.get_environ("REMOTE_ADDR") >> CFG_WEBSESSION_IPADDR_CHECK_SKIP_BITS):
raise SessionError("Remote IP address does not match the "
"IP address that created the session",
session_id=sessid)
|
Renaming in the sam/better-session commit.
Renamed CFG_WEBSESSION_CHECK_SESSION_ADDR into CFG_WEBSESSION_IPADDR_CHECK_SKIP_BITS
in order to better fit its meaning. Expanded help string.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.