diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/system/windows/index.js b/lib/system/windows/index.js
index <HASH>..<HASH> 100644
--- a/lib/system/windows/index.js
+++ b/lib/system/windows/index.js
@@ -24,8 +24,9 @@ var clean_string = function(str){
exports.process_running = function(process_name, callback){
var cmd = 'tasklist /fi "imagename eq ' + process_name + '"';
- exec(cmd, function(err, stdout){
- callback(stdout && stdout.toString().indexOf(process_name) !== -1);
+ exec(cmd, function(err, stdout) {
+ var bool = stdout && stdout.toString().indexOf(process_name) !== -1;
+ callback(!!bool);
});
};
|
Make sure process_running in Windows returns a bool.
|
diff --git a/src/edeposit/amqp/ftp/decoders/fields.py b/src/edeposit/amqp/ftp/decoders/fields.py
index <HASH>..<HASH> 100755
--- a/src/edeposit/amqp/ftp/decoders/fields.py
+++ b/src/edeposit/amqp/ftp/decoders/fields.py
@@ -8,7 +8,18 @@
#= Variables ==================================================================
-
+REQUIRED_FIELDS = [
+ "ISBN",
+ "Vazba/forma",
+ "Název",
+ "Url (pouze pro online publikace)",
+ "Formát (pouze pro online publikace)",
+ "Místo vydání",
+ "Nakladatel",
+ "Měsíc a rok vydání",
+ "Pořadí vydání",
+ "Zpracovatel záznamu" # TODO: look only for the first word
+]
#= Functions & objects ========================================================
|
Added REQUIRED_FIELDS as mentioned in #7.
|
diff --git a/pip_module_scanner/scanner.py b/pip_module_scanner/scanner.py
index <HASH>..<HASH> 100644
--- a/pip_module_scanner/scanner.py
+++ b/pip_module_scanner/scanner.py
@@ -20,7 +20,7 @@ class Scanner:
def __init__(self, path=os.getcwd(), output=None):
# Compiled import regular expression
- self.import_statement = re.compile(r'(?:from|import) ([a-zA-Z0-9]+)(?:.*)')
+ self.import_statement = re.compile(r'(?:from|import) ([a-zA-Z0-9_]+)(?:.*)')
# List of pip distributions
# Called once and then imported for performance
|
Issue #3. Find packages with underscore in the name
|
diff --git a/subprojects/groovy-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java b/subprojects/groovy-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java
index <HASH>..<HASH> 100644
--- a/subprojects/groovy-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java
+++ b/subprojects/groovy-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java
@@ -41,7 +41,7 @@ import java.util.Arrays;
public class NotYetImplementedASTTransformation extends AbstractASTTransformation {
private static final ClassNode CATCHED_THROWABLE_TYPE = ClassHelper.make(Throwable.class);
- private static final ClassNode ASSERTION_FAILED_ERROR_TYPE = ClassHelper.make(AssertionFailedError.class);
+ private static final ClassNode ASSERTION_FAILED_ERROR_TYPE = ClassHelper.make("junit.framework.AssertionFailedError");
public void visit(ASTNode[] nodes, SourceUnit source) {
if (nodes.length != 2 || !(nodes[0] instanceof AnnotationNode) || !(nodes[1] instanceof AnnotatedNode)) {
|
removed static class reference from builtin AST transform implementation class to third-party class junit.framework.AssertionFailedError
- this solves a class loading error for compiler environments (like Gradle) which separate class loading of the compiler from that of the compile class path
|
diff --git a/src/syncers/collection.js b/src/syncers/collection.js
index <HASH>..<HASH> 100644
--- a/src/syncers/collection.js
+++ b/src/syncers/collection.js
@@ -124,6 +124,8 @@ export default class CollectionSyncer extends BaseSyncer {
return items
}
+ this.state = this._initialState()
+
items.forEach(item => {
this._set(item[this._id], item)
})
|
clear this.state before _loadState() in collection.js (#<I>)
* clear this.state before _loadState() in collection.js
|
diff --git a/spec/constraint_spec.rb b/spec/constraint_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/constraint_spec.rb
+++ b/spec/constraint_spec.rb
@@ -19,22 +19,36 @@ describe PGExaminer do
c = examine <<-SQL
CREATE TABLE test_table (
+ a integer CONSTRAINT con CHECK (a > 0)
+ );
+ SQL
+
+ d = examine <<-SQL
+ CREATE TABLE test_table (
a integer
);
ALTER TABLE test_table ADD CONSTRAINT con_two CHECK (a > 0);
SQL
- d = examine <<-SQL
+ e = examine <<-SQL
+ CREATE TABLE test_table (
+ a integer CHECK (a > 0)
+ );
+ SQL
+
+ f = examine <<-SQL
CREATE TABLE test_table (
a integer
);
SQL
a.should == b
- a.should_not == c
- b.should_not == c
+ a.should == c
+ b.should == c
a.should_not == d
- b.should_not == d
+ a.should_not == e
+ a.should_not == f
+ e.should_not == f
end
end
|
Flesh out constraint differentiation a bit.
|
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
@@ -17,10 +17,7 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\Exception\LogicException;
/**
- * If there are any tagged loaders replace
- * default filesystem loader with chain loader
- *
- * Add tagged loaders to chain loader
+ * Adds services tagged twig.loader as Twig loaders
*
* @author Daniel Leech <daniel@dantleech.com>
*/
@@ -45,9 +42,8 @@ class TwigLoaderPass implements CompilerPassInterface
$chainLoader = $container->getDefinition('twig.loader.chain');
foreach (array_keys($loaderIds) as $id) {
$chainLoader->addMethodCall('addLoader', array(new Reference($id)));
- };
+ }
$container->setAlias('twig.loader', 'twig.loader.chain');
}
}
}
-
|
[FrameworkBundle] tweaked previous merge
|
diff --git a/ghost/admin/mixins/pagination-view-infinite-scroll.js b/ghost/admin/mixins/pagination-view-infinite-scroll.js
index <HASH>..<HASH> 100644
--- a/ghost/admin/mixins/pagination-view-infinite-scroll.js
+++ b/ghost/admin/mixins/pagination-view-infinite-scroll.js
@@ -22,9 +22,14 @@ var PaginationViewInfiniteScrollMixin = Ember.Mixin.create({
* Bind to the scroll event once the element is in the DOM
*/
attachCheckScroll: function () {
- var el = this.$();
+ var el = this.$(),
+ controller = this.get('controller');
el.on('scroll', Ember.run.bind(this, this.checkScroll));
+
+ if (this.element.scrollHeight <= this.element.clientHeight) {
+ controller.send('loadNextPage');
+ }
}.on('didInsertElement'),
/**
|
Load next page if scrollHeight <= clientHeight
closes #<I>
- call loadNextPage in attachCheckScroll, if element scrollHeight <=
clientHeight
|
diff --git a/scripts/bundle.config.js b/scripts/bundle.config.js
index <HASH>..<HASH> 100644
--- a/scripts/bundle.config.js
+++ b/scripts/bundle.config.js
@@ -70,9 +70,10 @@ const config = {
loader: 'babel-loader',
include: /src/,
options: {
- presets: [
- ['@babel/preset-env', {forceAllTransforms: true}]
- ]
+ presets: [['@babel/preset-env', {forceAllTransforms: true}]],
+ // all of the helpers will reference the module @babel/runtime to avoid duplication
+ // across the compiled output.
+ plugins: ['@babel/transform-runtime']
}
}
]
@@ -88,8 +89,14 @@ const config = {
new webpack.DefinePlugin({
__VERSION__: JSON.stringify(PACKAGE_INFO.version)
})
+ // Uncomment for bundle size debug
+ // ,new (require('webpack-bundle-analyzer').BundleAnalyzerPlugin)()
],
+ node: {
+ Buffer: false
+ },
+
devtool: false
};
|
Optimize bundle size (#<I>)
|
diff --git a/mapclassify/classifiers.py b/mapclassify/classifiers.py
index <HASH>..<HASH> 100644
--- a/mapclassify/classifiers.py
+++ b/mapclassify/classifiers.py
@@ -1825,12 +1825,8 @@ class FisherJenksSampled(MapClassifier):
counts : array
(k,1), the number of observations falling in each class
- Examples
- --------
-
- (Turned off due to timing being different across hardware)
-
-
+ Notes
+ -----
For theoretical details see :cite:`Rey_2016`.
"""
|
[MAINT] remove Example& hardware comment in FisherJenksSampled
|
diff --git a/src/predef.js b/src/predef.js
index <HASH>..<HASH> 100644
--- a/src/predef.js
+++ b/src/predef.js
@@ -98,7 +98,7 @@ module.exports = {
code: [
'function $has(obj, key) {',
' if (obj === null || obj === undefined) {',
- ' return false;',
+ ' throw new Error(obj + " cannot have keys");',
' }',
' if (typeof key === "string" ||',
' typeof key === "number" && key % 1 === 0) {',
|
Make $has throw an error on null and undefined
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -67,7 +67,7 @@ WPOAuth.prototype.urlToConnect = function(resource, params){
* @api public
*/
-WPOAuth.prototype.setCode = function(code){
+WPOAuth.prototype.code = function(code){
this._code = code;
debug('code: `%s`', this._code);
};
|
core: rename setCode() by code()
|
diff --git a/URL.php b/URL.php
index <HASH>..<HASH> 100644
--- a/URL.php
+++ b/URL.php
@@ -171,7 +171,7 @@ class URL implements iURL
// Попытаемся получить переменную с указанным именем в текущем модуле
// Если переменная модуля не существует тогда используем строковое представление аргумента
// добавим "разпознанное" значение аргумента в коллекцию параметров URL
- $url_params[] = isset( $m[$arg] ) ? $m->$arg : $arg;
+ $url_params[] = isset( $m[$arg] ) && !is_object($m[$arg])? $m->$arg : $arg;
}
// Вернем полный URL-путь относительно текущего хоста и веб-приложения
|
Fixed URL:build() method, added check for object to string convertion
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -10,6 +10,11 @@ var cached = require('gulp-cached');
var remember = require('gulp-remember');
var streamqueue = require('streamqueue');
+function handleError(e) {
+ console.log(e.toString());
+ this.emit('end');
+}
+
module.exports = function(options) {
options = options || {};
@@ -31,12 +36,14 @@ module.exports = function(options) {
moduleRoot: options.modulePrefix,
externalHelpers: options.externalHelpers
}))
+ .on('error', handleError)
.pipe(remember('scripts')));
stream.queue(gulp.src(options.bootstrapFiles)
.pipe(babel({
externalHelpers: options.externalHelpers
- })));
+ }))
+ .on('error', handleError));
stream.done()
.pipe(concat(path.basename(options.outputFile)))
|
Gracefully handle errors during gulp watch
|
diff --git a/lib/rabl/builder.rb b/lib/rabl/builder.rb
index <HASH>..<HASH> 100644
--- a/lib/rabl/builder.rb
+++ b/lib/rabl/builder.rb
@@ -5,6 +5,7 @@ module Rabl
# Constructs a new ejs hash based on given object and options
def initialize(data, options={}, &block)
@options = options
+ @_scope = options[:scope]
@_data = data
@_object = data_object(data)
@_result = {}
diff --git a/lib/rabl/engine.rb b/lib/rabl/engine.rb
index <HASH>..<HASH> 100644
--- a/lib/rabl/engine.rb
+++ b/lib/rabl/engine.rb
@@ -14,6 +14,7 @@ module Rabl
def render(scope, locals, &block)
@_locals, @_scope = locals, scope
self.copy_instance_variables_from(@_scope, [:@assigns, :@helpers])
+ @_options[:scope] = @_scope
@_data = locals[:object] || self.default_object
instance_eval(@_source) if @_source.present?
instance_eval(&block) if block_given?
|
Adds scope ivar to builder
|
diff --git a/src/howler.core.js b/src/howler.core.js
index <HASH>..<HASH> 100644
--- a/src/howler.core.js
+++ b/src/howler.core.js
@@ -782,6 +782,9 @@
self._emit('play', sound._id);
}
+ // Setting rate before playing won't work in IE, so we set it again here.
+ node.playbackRate = sound._rate;
+
// If the node is still paused, then we can assume there was a playback issue.
if (node.paused) {
self._emit('playerror', sound._id, 'Playback was unable to start. This is most commonly an issue ' +
|
Fix rate not working in IE
Fixes #<I>
|
diff --git a/validator/testcases/javascript/traverser.py b/validator/testcases/javascript/traverser.py
index <HASH>..<HASH> 100644
--- a/validator/testcases/javascript/traverser.py
+++ b/validator/testcases/javascript/traverser.py
@@ -160,10 +160,7 @@ class Traverser:
"http://blog.mozilla.com/addons/2009/01/16/"
"firefox-extensions-global-namespace-pollution/"
", or use JavaScript modules.",
- filename=self.filename,
- line=self.line,
- column=self.position,
- context=self.context)
+ filename=self.filename)
def _can_handle_node(self, node_name):
"Determines whether a node can be handled."
|
JS Pollution should not have line/column/context data.
|
diff --git a/IPython/html/static/notebook/js/widget.js b/IPython/html/static/notebook/js/widget.js
index <HASH>..<HASH> 100644
--- a/IPython/html/static/notebook/js/widget.js
+++ b/IPython/html/static/notebook/js/widget.js
@@ -64,7 +64,7 @@ define(["components/underscore/underscore-min",
}
},
- send = function (content) {
+ send: function(content) {
// Used the last modified view as the sender of the message. This
// will insure that any python code triggered by the sent message
|
Fixed typo in widget model code causing notebook to not load
|
diff --git a/src/Import/XmlParser/ProductJsonToXml.php b/src/Import/XmlParser/ProductJsonToXml.php
index <HASH>..<HASH> 100644
--- a/src/Import/XmlParser/ProductJsonToXml.php
+++ b/src/Import/XmlParser/ProductJsonToXml.php
@@ -1,6 +1,6 @@
<?php
-declare(strict_types=1);
+declare(strict_types = 1);
namespace LizardsAndPumpkins\Import\XmlParser;
@@ -21,7 +21,7 @@ class ProductJsonToXml
*/
private $context = [];
- public function toXml(string $product) : string
+ public function toXml(string $product): string
{
$product = json_decode($product, true);
@@ -97,7 +97,7 @@ class ProductJsonToXml
}
/**
- * @param array $product
+ * @param array[] $product
*/
private function writeAttributes(array $product)
{
|
Issue #<I>: Refactor Catalog Import
- Correct type hint
|
diff --git a/bin/nopt.js b/bin/nopt.js
index <HASH>..<HASH> 100755
--- a/bin/nopt.js
+++ b/bin/nopt.js
@@ -1,5 +1,6 @@
#!/usr/bin/env node
var nopt = require("../lib/nopt")
+ , path = require("path")
, types = { num: Number
, bool: Boolean
, help: Boolean
@@ -11,6 +12,7 @@ var nopt = require("../lib/nopt")
, clear: Boolean
, config: Boolean
, length: Number
+ , file: path
}
, shorthands = { s: [ "--str", "astring" ]
, b: [ "--bool" ]
@@ -22,6 +24,7 @@ var nopt = require("../lib/nopt")
, n: [ "--num", "125" ]
, c: ["--config"]
, l: ["--length"]
+ , f: ["--file"]
}
, parsed = nopt( types
, shorthands
|
Add a path arg to example script
|
diff --git a/web-bundle/src/main/js/custom-model-editor/src/custom_model_editor.js b/web-bundle/src/main/js/custom-model-editor/src/custom_model_editor.js
index <HASH>..<HASH> 100644
--- a/web-bundle/src/main/js/custom-model-editor/src/custom_model_editor.js
+++ b/web-bundle/src/main/js/custom-model-editor/src/custom_model_editor.js
@@ -1,6 +1,7 @@
import CodeMirror from "codemirror";
import "codemirror/mode/yaml/yaml";
import "codemirror/mode/javascript/javascript";
+import "codemirror/addon/edit/matchbrackets";
import "codemirror/addon/hint/show-hint";
import "codemirror/addon/lint/lint";
import YAML from "yaml";
@@ -27,6 +28,7 @@ class CustomModelEditor {
this.cm = CodeMirror(callback, {
lineNumbers: true,
+ matchBrackets: true,
mode: "yaml",
extraKeys: {
'Ctrl-Space': this.showAutoCompleteSuggestions
|
Custom model editor: Enable matched bracket highlighting
|
diff --git a/closure/goog/ui/abstractspellchecker.js b/closure/goog/ui/abstractspellchecker.js
index <HASH>..<HASH> 100644
--- a/closure/goog/ui/abstractspellchecker.js
+++ b/closure/goog/ui/abstractspellchecker.js
@@ -318,19 +318,6 @@ goog.ui.AbstractSpellChecker.prototype.getSpellCheck = function() {
return this.spellCheck;
};
-
-/**
- * @return {goog.spell.SpellCheck} The handler used for caching and lookups.
- * @override
- * @suppress {checkTypes} This method makes no sense. It overrides
- * Component's getHandler with something different.
- * @deprecated Use #getSpellCheck instead.
- */
-goog.ui.AbstractSpellChecker.prototype.getHandler = function() {
- return this.getSpellCheck();
-};
-
-
/**
* Sets the spell checker used for caching and lookups.
* @param {goog.spell.SpellCheck} spellCheck The handler used for caching and
|
Remove method that doesn't typecheck.
It already has suppress checkTypes, but it doesn't look used anyways.
RELNOTES: Removing deprecated method,
goog.ui.AbstractSpellChecker.prototype.getHandler
-------------
Created by MOE: <URL>
|
diff --git a/src/maker.js b/src/maker.js
index <HASH>..<HASH> 100644
--- a/src/maker.js
+++ b/src/maker.js
@@ -1,4 +1,5 @@
const Solver = require( "./solver.js" );
+const Publisher = require( "./publisher.js" );
function Maker(){
}
@@ -8,15 +9,20 @@ Start the application reading the tsmake.json to create the tsconfig.json files
@param file {string} File within the configuration of project
*/
Maker.prototype.make = function ( file ) {
- // Use this object to creare one tsconfig file foreach hotpoint declared in tsmake
+ // Use this object to creare one tsconfig file foreach hotpoint declared
+ // in tsmake
var makeopt = JSON.parse( file );
- // Passing configuration that the Solver and the Builder use it to creata the tsconfig files
- var solver = new Solver( makeopt );
+
+ var solver = new Solver( makeopt );
+ var publisher = new Publisher( makeopt );
// Catch all hotpoint in tsmake
Object.keys( makeopt.hotpoint ).forEach( function ( key ) {
- // Create a uncomplete tsconfig object
- console.log( solver.solve( key ) );
+ // Create a uncomplete tsconfig object without information rleative
+ // to directory configuration project but only at the topic
+ var tsconfig = solver.solve( key );
+ // Publish the tsconfig.json with the left information
+ publisher.publish( tsconfig, makeopt.hotpoint[key] );
});
};
|
Keep <I> column, add comments and reference to publisher
|
diff --git a/src/rabird/core/distutils/command/install.py b/src/rabird/core/distutils/command/install.py
index <HASH>..<HASH> 100644
--- a/src/rabird/core/distutils/command/install.py
+++ b/src/rabird/core/distutils/command/install.py
@@ -149,7 +149,7 @@ class GithubUwbpepPackages(object):
raise KeyError("Can't find the requirement : %s" % requirement_text)
class PypiUwbpepPackages(object):
- page_url = "https://pypi.python.org/pypi/uwbpep/0.1.0"
+ page_url = "https://pypi.python.org/pypi/uwbpep/1.0"
def __init__(self):
pass
|
Version of Uwbpep on pypi should be <I> now
|
diff --git a/src/components/level/level.js b/src/components/level/level.js
index <HASH>..<HASH> 100644
--- a/src/components/level/level.js
+++ b/src/components/level/level.js
@@ -7,6 +7,11 @@ export default class Level extends Component {
style: PropTypes.object,
children: PropTypes.any,
className: PropTypes.string,
+ responsive: PropTypes.oneOf([
+ 'isMobile',
+ 'isDesktop',
+ 'isTablet',
+ ]),
};
static defaultProps = {
@@ -17,6 +22,7 @@ export default class Level extends Component {
createClassName() {
return [
styles.level,
+ styles[this.props.responsive],
this.props.className,
].join(' ').trim();
}
|
Added option to set responsive attribute on Level (#<I>)
|
diff --git a/azurerm/internal/services/web/resource_arm_function_app.go b/azurerm/internal/services/web/resource_arm_function_app.go
index <HASH>..<HASH> 100644
--- a/azurerm/internal/services/web/resource_arm_function_app.go
+++ b/azurerm/internal/services/web/resource_arm_function_app.go
@@ -852,11 +852,14 @@ func expandFunctionAppConnectionStrings(d *schema.ResourceData) map[string]*web.
}
func expandFunctionAppIpRestriction(input interface{}) ([]web.IPSecurityRestriction, error) {
- ipSecurityRestrictions := input.([]interface{})
restrictions := make([]web.IPSecurityRestriction, 0)
- for i, ipSecurityRestriction := range ipSecurityRestrictions {
- restriction := ipSecurityRestriction.(map[string]interface{})
+ for i, r := range input.([]interface{}) {
+ if r == nil {
+ continue
+ }
+
+ restriction := r.(map[string]interface{})
ipAddress := restriction["ip_address"].(string)
vNetSubnetID := restriction["subnet_id"].(string)
|
azurerm_function_app - prevent a panic from an empty IPSecurity… (#<I>)
|
diff --git a/src/datab-data.js b/src/datab-data.js
index <HASH>..<HASH> 100644
--- a/src/datab-data.js
+++ b/src/datab-data.js
@@ -13,10 +13,14 @@
* drop_col - drop a column
* drop_row - drop a row
*
- * append_to - append as an html table to a d3 selection
* to_json - create a json string of the data
* to_csv - output a csv
* to_obj - output as an array of (dict-like) objects
+ *
+ * from_input - create data object from a file input selection
+ * ( csv files only )
+ * from_obj - create data object from an array of dict-like
+ * row objects
*
*/
|
Added datab.data.from_input to handle file selection input
|
diff --git a/satpy/tests/compositor_tests/__init__.py b/satpy/tests/compositor_tests/__init__.py
index <HASH>..<HASH> 100644
--- a/satpy/tests/compositor_tests/__init__.py
+++ b/satpy/tests/compositor_tests/__init__.py
@@ -654,6 +654,13 @@ class TestGenericCompositor(unittest.TestCase):
check_areas.assert_called_once()
mask_datasets.assert_not_called()
check_areas.reset_mock()
+ # Dataset for alpha given, so shouldn't be masked
+ projectables = [self.all_valid, self.all_valid]
+ check_areas.return_value = projectables
+ res = self.comp(projectables)
+ check_areas.assert_called_once()
+ mask_datasets.assert_not_called()
+ check_areas.reset_mock()
# When areas are incompatible, masking shouldn't happen
check_areas.side_effect = IncompatibleAreas()
self.assertRaises(IncompatibleAreas,
|
Test that a given alpha channel disables common channel masking
|
diff --git a/lib/model_base/version.rb b/lib/model_base/version.rb
index <HASH>..<HASH> 100644
--- a/lib/model_base/version.rb
+++ b/lib/model_base/version.rb
@@ -1,3 +1,3 @@
module ModelBase
- VERSION = "0.3.8"
+ VERSION = "0.3.9"
end
|
Bump up the version from <I> to <I>
|
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -86,6 +86,7 @@ module ActiveRecord::Associations::Builder
# Post.first.comments and Post.first.comments= methods are defined by this method...
def define_accessors(model, reflection)
mixin = model.generated_feature_methods
+ name = reflection.name
self.class.define_readers(mixin, name)
self.class.define_writers(mixin, name)
end
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/associations/builder/singular_association.rb
+++ b/activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -8,7 +8,7 @@ module ActiveRecord::Associations::Builder
def define_accessors(model, reflection)
super
- self.class.define_constructors(model.generated_feature_methods, name) if reflection.constructable?
+ self.class.define_constructors(model.generated_feature_methods, reflection.name) if reflection.constructable?
end
# Defines the (build|create)_association methods for belongs_to or has_one association
|
Use the reflection name instead of the accessor
|
diff --git a/rows.go b/rows.go
index <HASH>..<HASH> 100644
--- a/rows.go
+++ b/rows.go
@@ -271,7 +271,7 @@ func (f *File) getRowHeight(sheet string, row int) int {
ws, _ := f.workSheetReader(sheet)
for i := range ws.SheetData.Row {
v := &ws.SheetData.Row[i]
- if v.R == row+1 && v.Ht != 0 {
+ if v.R == row && v.Ht != 0 {
return int(convertRowHeightToPixels(v.Ht))
}
}
|
fix getRowHeight actually get the height of the next row (#<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,10 @@ setup(
keywords='crypto pki',
- install_requires=['asn1crypto', 'oscrypto'],
+ install_requires=[
+ 'asn1crypto>=0.13',
+ 'oscrypto>=0.12'
+ ],
packages=find_packages(exclude=['tests*', 'dev*']),
cmdclass={
|
Minimum asn1crypto and oscrypto versions
|
diff --git a/src/HAB/Pica/Record/Field.php b/src/HAB/Pica/Record/Field.php
index <HASH>..<HASH> 100644
--- a/src/HAB/Pica/Record/Field.php
+++ b/src/HAB/Pica/Record/Field.php
@@ -133,6 +133,13 @@ class Field
protected $_shorthand;
/**
+ * Subfields.
+ *
+ * @var array
+ */
+ protected $_subfields;
+
+ /**
* Constructor.
*
* @throws InvalidArgumentException Invalid field tag or occurrence
|
Declare $_subfields property
* src/HAB/Pica/Record/Field.php: Declare $_subfields property.
...after all this years... ;)
|
diff --git a/src/Cartalyst/AsseticFilters/UriRewriteFilter.php b/src/Cartalyst/AsseticFilters/UriRewriteFilter.php
index <HASH>..<HASH> 100644
--- a/src/Cartalyst/AsseticFilters/UriRewriteFilter.php
+++ b/src/Cartalyst/AsseticFilters/UriRewriteFilter.php
@@ -264,7 +264,7 @@ class UriRewriteFilter implements FilterInterface {
}
}
- $base = $_SERVER['REQUEST_URI'];
+ $base = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null;
if ($request->getHost())
{
|
check for REQUEST_URI before assigning it
prevents exceptions from being thrown if executed through cli
|
diff --git a/cts/analytics/ab_testing_test.go b/cts/analytics/ab_testing_test.go
index <HASH>..<HASH> 100644
--- a/cts/analytics/ab_testing_test.go
+++ b/cts/analytics/ab_testing_test.go
@@ -7,6 +7,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/algolia/algoliasearch-client-go/v3/algolia/analytics"
+ "github.com/algolia/algoliasearch-client-go/v3/algolia/opt"
"github.com/algolia/algoliasearch-client-go/v3/algolia/wait"
"github.com/algolia/algoliasearch-client-go/v3/cts"
)
@@ -66,7 +67,7 @@ func TestABTesting(t *testing.T) {
{
found := false
- res, err := analyticsClient.GetABTests()
+ res, err := analyticsClient.GetABTests(opt.Limit(100))
require.NoError(t, err)
for _, b := range res.ABTests {
if b.ABTestID == abTestID {
|
test: prevent flakiness for TestABTesting test
|
diff --git a/lib/deep_cover/cli/exec.rb b/lib/deep_cover/cli/exec.rb
index <HASH>..<HASH> 100755
--- a/lib/deep_cover/cli/exec.rb
+++ b/lib/deep_cover/cli/exec.rb
@@ -24,7 +24,7 @@ module DeepCover
require 'yaml'
env_var = {'DEEP_COVER' => 't',
- 'DEEP_COVER_OPTIONS' => YAML.dump(processed_options.slice(*DEFAULTS.keys)),
+ 'DEEP_COVER_OPTIONS' => YAML.dump(processed_options.transform_keys(&:to_sym).slice(*DEFAULTS.keys)),
}
# Clear inspiration from Bundler's kernel_exec
|
Fix exec in <I>, looks like backport was helping us more than Ruby<I>
|
diff --git a/lib/active_scaffold/config/core.rb b/lib/active_scaffold/config/core.rb
index <HASH>..<HASH> 100644
--- a/lib/active_scaffold/config/core.rb
+++ b/lib/active_scaffold/config/core.rb
@@ -354,12 +354,20 @@ module ActiveScaffold::Config
end
def [](name)
+ return nil unless @global_columns[name]
@columns[name.to_sym] ||= CowProxy.wrap @global_columns[name]
end
- def method_missing(name, *args)
+ def each
+ return enum_for(:each) unless block_given?
+ @global_columns.each do |col|
+ yield self[col.name]
+ end
+ end
+
+ def method_missing(name, *args, &block)
if @global_columns.respond_to?(name, true)
- @global_columns.send(name, *args)
+ @global_columns.send(name, *args, &block)
else
super
end
|
fix iterating on config.user.columns, needs to wrap column in case column is changed
|
diff --git a/lib/capybara/driver/rack_test_driver.rb b/lib/capybara/driver/rack_test_driver.rb
index <HASH>..<HASH> 100644
--- a/lib/capybara/driver/rack_test_driver.rb
+++ b/lib/capybara/driver/rack_test_driver.rb
@@ -1,4 +1,5 @@
require 'rack/test'
+require 'rack/utils'
require 'mime/types'
require 'nokogiri'
require 'cgi'
@@ -163,16 +164,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
end
def merge_param!(params, key, value)
- collection = key.sub!(/\[\]$/, '')
- if collection
- if params[key]
- params[key] << value
- else
- params[key] = [value]
- end
- else
- params[key] = value
- end
+ Rack::Utils.normalize_params(params, key, value)
end
end
|
Teach rack test driver to work with comlex field names such as user[pictures][][path]. See <URL>
|
diff --git a/tests/integration/components/sl-alert-test.js b/tests/integration/components/sl-alert-test.js
index <HASH>..<HASH> 100644
--- a/tests/integration/components/sl-alert-test.js
+++ b/tests/integration/components/sl-alert-test.js
@@ -119,9 +119,9 @@ test( 'Dismiss Action is called on button click', function( assert ) {
{{/sl-alert}}
` );
- const $button = this.$( '>:first-child' ).find( 'button' );
+ const button = this.$( '>:first-child' ).find( 'button' );
this.on( 'dismissAction', dismissAction );
- $button.click();
+ button.click();
});
test( 'Dismiss Action is not possible when dismissable is false', function( assert ) {
|
Closes softlayer/sl-ember-components#<I>
|
diff --git a/okhttp/src/main/java/com/squareup/okhttp/CertificatePinner.java b/okhttp/src/main/java/com/squareup/okhttp/CertificatePinner.java
index <HASH>..<HASH> 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/CertificatePinner.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/CertificatePinner.java
@@ -100,6 +100,13 @@ import static java.util.Collections.unmodifiableList;
* complexity and limit your ability to migrate between certificate authorities.
* Do not use certificate pinning without the blessing of your server's TLS
* administrator!
+ *
+ * <h4>Note about self-signed certificates</h4>
+ * {@link CertificatePinner} can not be used to pin self-signed certificate
+ * if such certificate is not accepted by {@link javax.net.ssl.TrustManager}.
+ *
+ * @see <a href="https://www.owasp.org/index.php/Certificate_and_Public_Key_Pinning">
+ * OWASP: Certificate and Public Key Pinning</a>
*/
public final class CertificatePinner {
public static final CertificatePinner DEFAULT = new Builder().build();
|
Add Javadoc about self-signed certificates
|
diff --git a/tacl/results.py b/tacl/results.py
index <HASH>..<HASH> 100644
--- a/tacl/results.py
+++ b/tacl/results.py
@@ -162,7 +162,6 @@ class Results:
[constants.LABEL_COUNT_FIELDNAME, DELETE_FIELDNAME]
self._matches = pd.concat(new_results, ignore_index=True).reindex(
columns=all_cols)
- self._matches
del self._matches[DELETE_FIELDNAME]
def collapse_witnesses(self):
|
Removed stray useless line.
|
diff --git a/src/phpGPX/Serializers/TrackXmlSerializer.php b/src/phpGPX/Serializers/TrackXmlSerializer.php
index <HASH>..<HASH> 100644
--- a/src/phpGPX/Serializers/TrackXmlSerializer.php
+++ b/src/phpGPX/Serializers/TrackXmlSerializer.php
@@ -25,6 +25,12 @@ abstract class TrackXmlSerializer
$srcNode = $domDocument->createElement("src", $collection->source);
$element->appendChild($srcNode);
}
+
+ if (!empty($collection->name))
+ {
+ $srcNode = $domDocument->createElement("name", $collection->name);
+ $element->appendChild($srcNode);
+ }
if (!empty($collection->url))
{
@@ -151,4 +157,4 @@ abstract class TrackXmlSerializer
return $TrackPointExtensionNode->hasChildNodes() ? $element : null;
}
-}
\ No newline at end of file
+}
|
Add collection name to XML saved track
|
diff --git a/sh.py b/sh.py
index <HASH>..<HASH> 100644
--- a/sh.py
+++ b/sh.py
@@ -498,6 +498,16 @@ class RunningCommand(object):
finishes, RunningCommand is smart enough to translate exit codes to
exceptions. """
+ # these are attributes that we allow to passthrough to OProc for
+ _OProc_attr_whitelist = set((
+ "signal",
+ "terminate",
+ "kill",
+ "pid",
+ "sid",
+ "pgid",
+ ))
+
def __init__(self, cmd, call_args, stdin, stdout, stderr):
"""
cmd is an array, where each element is encoded as bytes (PY3) or str
@@ -649,18 +659,6 @@ class RunningCommand(object):
self.wait()
return self.process.exit_code
- @property
- def pid(self):
- return self.process.pid
-
- @property
- def sid(self):
- return self.process.sid
-
- @property
- def pgid(self):
- return self.process.pgid
-
def __len__(self):
return len(str(self))
@@ -736,7 +734,7 @@ class RunningCommand(object):
def __getattr__(self, p):
# let these three attributes pass through to the OProc object
- if p in ("signal", "terminate", "kill"):
+ if p in self._OProc_attr_whitelist:
if self.process:
return getattr(self.process, p)
else:
|
refactor out OProc passthrough whitelist
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -916,8 +916,9 @@ if (shadowDomV1) {
Object.keys(members).forEach(memberName => {
const memberProperty = members[memberName];
- // All properties should be configurable.
+ // All properties should be configurable and enumerable.
memberProperty.configurable = true;
+ memberProperty.enumerable = true;
// Applying to the data properties only since we can't have writable accessor properties.
if (memberProperty.hasOwnProperty('value')) { // eslint-disable-line no-prototype-builtins
|
fix(enumeration): make all added member properties enumerable
|
diff --git a/docker/models/images.py b/docker/models/images.py
index <HASH>..<HASH> 100644
--- a/docker/models/images.py
+++ b/docker/models/images.py
@@ -140,6 +140,7 @@ class ImageCollection(Collection):
``"0-3"``, ``"0,1"``
decode (bool): If set to ``True``, the returned stream will be
decoded into dicts on the fly. Default ``False``.
+ cachefrom (list): A list of images used for build cache resolution.
Returns:
(:py:class:`Image`): The built image.
|
Add cachefrom to build docstring
|
diff --git a/lib/fog/rackspace/requests/queues/get_queue.rb b/lib/fog/rackspace/requests/queues/get_queue.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/rackspace/requests/queues/get_queue.rb
+++ b/lib/fog/rackspace/requests/queues/get_queue.rb
@@ -1,8 +1,8 @@
module Fog
module Rackspace
class Queues
- class Real
+ class Real
# This operation verifies whether the specified queue exists.
#
# @param [String] queue_name Specifies the name of the queue.
@@ -20,6 +20,19 @@ module Fog
)
end
end
+
+ class Mock
+ def get_queue(queue_name)
+ if data[queue_name].nil?
+ raise NotFound.new
+ else
+ response = Excon::Response.new
+ response.status = 204
+ response
+ end
+ end
+ end
+
end
end
end
|
Mock the get_queue call.
|
diff --git a/src/plugins/Transloadit/index.js b/src/plugins/Transloadit/index.js
index <HASH>..<HASH> 100644
--- a/src/plugins/Transloadit/index.js
+++ b/src/plugins/Transloadit/index.js
@@ -156,7 +156,9 @@ module.exports = class Transloadit extends Plugin {
const tus = Object.assign({}, file.tus, {
endpoint: assembly.tus_url,
// Only send assembly metadata to the tus endpoint.
- metaFields: Object.keys(tlMeta)
+ metaFields: Object.keys(tlMeta),
+ // Make sure tus doesn't resume a previous upload.
+ uploadUrl: null
})
const transloadit = {
assembly: assembly.assembly_id
diff --git a/src/plugins/Tus10.js b/src/plugins/Tus10.js
index <HASH>..<HASH> 100644
--- a/src/plugins/Tus10.js
+++ b/src/plugins/Tus10.js
@@ -125,14 +125,6 @@ module.exports = class Tus10 extends Plugin {
isPaused ? upload.abort() : upload.start()
})
- this.onRetry(file.id, () => {
- this.removeUploadURL(file.id)
- })
-
- this.onRetryAll(file.id, () => {
- this.removeUploadURL(file.id)
- })
-
this.onPauseAll(file.id, () => {
upload.abort()
})
|
Reuse upload URL by default for tus, reset it for each new :tl: assembly.
|
diff --git a/src/DiDom/StyleAttribute.php b/src/DiDom/StyleAttribute.php
index <HASH>..<HASH> 100644
--- a/src/DiDom/StyleAttribute.php
+++ b/src/DiDom/StyleAttribute.php
@@ -73,7 +73,7 @@ class StyleAttribute
$properties = explode(';', $styleString);
foreach ($properties as $property) {
- list($name, $value) = explode(':', $property);
+ list($name, $value) = explode(':', $property, 2);
$name = trim($name);
$value = trim($value);
diff --git a/tests/StyleAttributeTest.php b/tests/StyleAttributeTest.php
index <HASH>..<HASH> 100644
--- a/tests/StyleAttributeTest.php
+++ b/tests/StyleAttributeTest.php
@@ -171,9 +171,9 @@ class StyleAttributeTest extends TestCase
'16px',
],
[
- 'color: blue; font-size: 16px; border: 1px solid black;',
- 'font-size',
- '16px',
+ 'background-image: url(https://example.com/image.jpg); background-repeat: no-repeat',
+ 'background-image',
+ 'url(https://example.com/image.jpg)',
],
[
'color: blue; font-size: 16px; border: 1px solid black;',
|
Fix parsing of a style property in "style" attribute when the value contains a colon
|
diff --git a/src/webpack/presets/index.spec.js b/src/webpack/presets/index.spec.js
index <HASH>..<HASH> 100644
--- a/src/webpack/presets/index.spec.js
+++ b/src/webpack/presets/index.spec.js
@@ -49,7 +49,7 @@ describe('configure', function () {
module: {
loaders: [
{
- test: /\.jsx?$/,
+ test: /\.(jsx?|es6)$/,
loader: 'babel'
}
]
|
Fix unit test broken after new Babel extension
|
diff --git a/config/routes.rb b/config/routes.rb
index <HASH>..<HASH> 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,3 @@
Roboto::Engine.routes.draw do
- get '/' => 'Robots#show'
+ get '/' => 'robots#show'
end
-
|
make routes compatible with Rails <I>
|
diff --git a/lib/editor/htmlarea/coursefiles.php b/lib/editor/htmlarea/coursefiles.php
index <HASH>..<HASH> 100644
--- a/lib/editor/htmlarea/coursefiles.php
+++ b/lib/editor/htmlarea/coursefiles.php
@@ -22,6 +22,7 @@
$oldname = optional_param('oldname', '', PARAM_FILE);
$usecheckboxes = optional_param('usecheckboxes', 1, PARAM_INT);
$save = optional_param('save', 0, PARAM_BOOL);
+ $text = optional_param('text', '', PARAM_RAW);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
@@ -393,7 +394,7 @@
case "edit":
html_header($course, $wdir);
- if (isset($text) and confirm_sesskey()) {
+ if (($text != '') and confirm_sesskey()) {
$fileptr = fopen($basedir.$file,"w");
fputs($fileptr, stripslashes($text));
fclose($fileptr);
|
fixed register globals issue with $text; merged from MOODLE_<I>_STABLE
|
diff --git a/ebooklib/epub.py b/ebooklib/epub.py
index <HASH>..<HASH> 100644
--- a/ebooklib/epub.py
+++ b/ebooklib/epub.py
@@ -1579,7 +1579,10 @@ class EpubReader(object):
nav_node = html_node.xpath("//nav[@*='toc']")[0]
else:
# parsing the list of pages
- nav_node = html_node.xpath("//nav[@*='page-list']")[0]
+ _page_list = html_node.xpath("//nav[@*='page-list']")
+ if len(_page_list) == 0:
+ return
+ nav_node = _page_list[0]
def parse_list(list_node):
items = []
|
Fixed #<I> - Parsing files fails because of page-list
|
diff --git a/invocations/console.py b/invocations/console.py
index <HASH>..<HASH> 100644
--- a/invocations/console.py
+++ b/invocations/console.py
@@ -10,7 +10,7 @@ from invoke.vendor.six.moves import input
# NOTE: originally cribbed from fab 1's contrib.console.confirm
-def confirm(question, affirmative=True):
+def confirm(question, assume_yes=True):
"""
Ask user a yes/no question and return their response as a boolean.
@@ -27,14 +27,14 @@ def confirm(question, affirmative=True):
to "y", "yes", "n" or "no", they will be re-prompted until they do.
:param unicode question: The question part of the prompt.
- :param bool affirmative:
+ :param bool assume_yes:
Whether to assume the affirmative answer by default. Default value:
``True``.
:returns: A `bool`.
"""
# Set up suffix
- if affirmative:
+ if assume_yes:
suffix = "Y/n"
else:
suffix = "y/N"
@@ -47,7 +47,7 @@ def confirm(question, affirmative=True):
response = response.lower().strip() # Normalize
# Default
if not response:
- return affirmative
+ return assume_yes
# Yes
if response in ['y', 'yes']:
return True
|
Rename a kwarg...it wasn't intuitive after leaving it for weeks
|
diff --git a/restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java b/restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java
index <HASH>..<HASH> 100644
--- a/restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java
+++ b/restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java
@@ -52,10 +52,12 @@ public class Ping {
private Timer subsequentTimer;
private boolean subsequentTimerIsSet = false;
private PingTask ping;
+ private final String provider;
Ping(Configuration configuration, ServletContext context){
this.configuration = configuration;
this.context = context;
+ this.provider = configuration.getString("phone-number-provisioning[@class]");
}
public void sendPing(){
@@ -91,6 +93,7 @@ public class Ping {
buffer.append("<requesttype>").append("ping").append("</requesttype>");
buffer.append("<item>");
buffer.append("<endpointgroup>").append(endpoint).append("</endpointgroup>");
+ buffer.append("<provider>").append(provider).append("</provider>");
buffer.append("</item>");
buffer.append("</body>");
buffer.append("</request>");
|
RESTCOMM-<I> #Resolve-Issue Fixed
|
diff --git a/org/xbill/DNS/BitString.java b/org/xbill/DNS/BitString.java
index <HASH>..<HASH> 100644
--- a/org/xbill/DNS/BitString.java
+++ b/org/xbill/DNS/BitString.java
@@ -130,10 +130,6 @@ BitString(String s) throws IOException {
data = new byte[bytes()];
for (int i = 0; i < nbits; i++)
data[i/8] |= ((set.get(i) ? 1 : 0) << (7 - i%8));
- for (int i = nbits; i < (((nbits + 7) >>> 3) << 3); i++) {
- if (set.get(i))
- throw new IOException("Invalid binary label: " + s);
- }
}
BitString(int _nbits, byte [] _data) {
|
Some invalid bitstring labels were being accepted.
git-svn-id: <URL>
|
diff --git a/src/Card/Card.js b/src/Card/Card.js
index <HASH>..<HASH> 100644
--- a/src/Card/Card.js
+++ b/src/Card/Card.js
@@ -13,6 +13,10 @@ class Card extends Component {
*/
children: PropTypes.node,
/**
+ * Override the inline-styles of the container element.
+ */
+ containerStyle: PropTypes.object,
+ /**
* If true, this card component is expandable. Can be set on any child of the `Card` component.
*/
expandable: PropTypes.bool,
@@ -111,16 +115,20 @@ class Card extends Component {
lastElement.type.muiName === 'CardTitle'));
const {
style,
+ containerStyle,
...other,
} = this.props;
const mergedStyles = Object.assign({
zIndex: 1,
}, style);
+ const containerMergedStyles = Object.assign({
+ paddingBottom: addBottomPadding ? 8 : 0,
+ }, containerStyle);
return (
<Paper {...other} style={mergedStyles}>
- <div style={{paddingBottom: addBottomPadding ? 8 : 0}}>
+ <div style={containerMergedStyles}>
{newChildren}
</div>
</Paper>
|
[Card] add containerStyle prop
add containerStyle prop to have the ability to customize inner div styles.
i needed this to give the div width of <I>% then i can align the header to center and the body to left.
Update Card.js
Update Card.js
Update Card.js
rename childrenStyle to containerStyle
Update Card.js
[Card] add containerStyle prop
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,13 @@ from setuptools import setup
setup(
name = 'dharma',
- packages = ['dharma'],
- version = '1.0',
+ packages = ['dharma', 'dharma.core'],
+ version = '1.1',
description = 'A generation-based, context-free grammar fuzzer.',
author = 'Mozilla Security',
author_email = 'fuzzing@mozilla.com',
url = 'https://github.com/mozillasecurity/dharma',
- download_url = 'https://github.com/mozillasecurity/dharma/tarball/1.0',
+ download_url = 'https://github.com/mozillasecurity/dharma/tarball/1.1',
keywords = ['fuzzer', 'security', 'fuzzing', 'testing'],
classifiers = [ # https://pypi.python.org/pypi?%3Aaction=list_classifiers
'Intended Audience :: Developers',
|
Changed setup.py to work with the <I> version
|
diff --git a/migrations/create_bouncer_tables.php b/migrations/create_bouncer_tables.php
index <HASH>..<HASH> 100644
--- a/migrations/create_bouncer_tables.php
+++ b/migrations/create_bouncer_tables.php
@@ -41,6 +41,7 @@ class CreateBouncerTables extends Migration
Schema::create(Models::table('permissions'), function (Blueprint $table) {
$table->integer('ability_id')->unsigned()->index();
$table->morphs('entity');
+ $table->boolean('forbidden')->default(false);
$table->foreign('ability_id')->references('id')->on(Models::table('abilities'))
->onUpdate('cascade')->onDelete('cascade');
|
Add forbidden column to the permissions table, for future ability denials
|
diff --git a/plan/refiner.go b/plan/refiner.go
index <HASH>..<HASH> 100644
--- a/plan/refiner.go
+++ b/plan/refiner.go
@@ -220,7 +220,6 @@ func detachIndexScanConditions(conditions []expression.Expression, indexScan *Ph
var curIndex int
for curIndex = indexScan.accessEqualCount; curIndex < len(indexScan.Index.Columns); curIndex++ {
checker := &conditionChecker{
- tableName: indexScan.Table.Name,
idx: indexScan.Index,
columnOffset: curIndex,
length: indexScan.Index.Columns[curIndex].Length,
@@ -264,9 +263,8 @@ func detachTableScanConditions(conditions []expression.Expression, table *model.
var accessConditions, filterConditions []expression.Expression
checker := conditionChecker{
- tableName: table.Name,
- pkName: pkName,
- length: types.UnspecifiedLength,
+ pkName: pkName,
+ length: types.UnspecifiedLength,
}
for _, cond := range conditions {
cond = pushDownNot(cond, false, nil)
@@ -305,7 +303,6 @@ func buildTableRange(p *PhysicalTableScan) error {
// conditionChecker checks if this condition can be pushed to index plan.
type conditionChecker struct {
- tableName model.CIStr
idx *model.IndexInfo
columnOffset int // the offset of the indexed column to be checked.
pkName model.CIStr
|
plan: clean code. (#<I>)
|
diff --git a/test/unit/css.js b/test/unit/css.js
index <HASH>..<HASH> 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1558,10 +1558,12 @@ QUnit.test( "Do not throw on frame elements from css method (#15098)", function(
( function() {
var supportsCssVars,
- div = jQuery( "<div>" ).appendTo( "#qunit-fixture" )[ 0 ];
+ elem = jQuery( "<div>" ).appendTo( document.body ),
+ div = elem[ 0 ];
div.style.setProperty( "--prop", "value" );
- supportsCssVars = getComputedStyle( div ).getPropertyValue( "--prop" );
+ supportsCssVars = !!getComputedStyle( div ).getPropertyValue( "--prop" );
+ elem.remove();
QUnit[ supportsCssVars ? "test" : "skip" ]( "css(--customProperty)", function( assert ) {
jQuery( "#qunit-fixture" ).append(
|
Tests: Clean up after the CSS Custom Properties support test
Ref bcec<I>ee<I>e2d0e<I>bcb<I>e3d<I>a8f<I>f9
Ref <I>bf<I>d5b<I>f<I>dbc<I>b<I>f1c5a<I>
|
diff --git a/duolingo.py b/duolingo.py
index <HASH>..<HASH> 100644
--- a/duolingo.py
+++ b/duolingo.py
@@ -46,7 +46,6 @@ class Duolingo(object):
requests.
"""
self.username = username
- self.originalUsername = username
self.password = password
self.session_file = session_file
self.user_url = "https://duolingo.com/users/%s" % self.username
@@ -125,10 +124,6 @@ class Duolingo(object):
self.username = username
self.user_data=Struct(**self._get_data())
- def set_original_username(self):
- self.username = self.originalUsername
- self.user_data=Struct(**self._get_data())
-
def get_leaderboard(self, unit, before):
"""
Get user's rank in the week in descending order, stream from
|
removed unnecessary original username variable and its setter
|
diff --git a/lib/custom/src/MW/View/Helper/Jincluded/Standard.php b/lib/custom/src/MW/View/Helper/Jincluded/Standard.php
index <HASH>..<HASH> 100644
--- a/lib/custom/src/MW/View/Helper/Jincluded/Standard.php
+++ b/lib/custom/src/MW/View/Helper/Jincluded/Standard.php
@@ -146,6 +146,7 @@ class Standard extends \Aimeos\MW\View\Helper\Base implements Iface
if( $childItem->isAvailable() )
{
$rtype = $childItem->getResourceType();
+ $rtype = ( $pos = strrpos( $rtype, '/' ) ) !== false ? substr( $rtype, $pos + 1 ) : $rtype;
$entry['relationships'][$rtype]['data'][] = ['id' => $childItem->getId(), 'type' => $rtype];
$this->map( $childItem, $fields, $fcn );
}
|
Don't create wrong links for data sub-domains
|
diff --git a/ReText/window.py b/ReText/window.py
index <HASH>..<HASH> 100644
--- a/ReText/window.py
+++ b/ReText/window.py
@@ -58,7 +58,8 @@ class ReTextWindow(QMainWindow):
if globalSettings.iconTheme:
QIcon.setThemeName(globalSettings.iconTheme)
if QIcon.themeName() in ('hicolor', ''):
- QIcon.setThemeName(get_icon_theme())
+ if not QFile.exists(icon_path + 'document-new.png'):
+ QIcon.setThemeName(get_icon_theme())
if QFile.exists(icon_path+'retext.png'):
self.setWindowIcon(QIcon(icon_path+'retext.png'))
elif QFile.exists('/usr/share/pixmaps/retext.png'):
|
Do not try to get the icon theme when the icons pack is present
|
diff --git a/lib/rabl/builder.rb b/lib/rabl/builder.rb
index <HASH>..<HASH> 100644
--- a/lib/rabl/builder.rb
+++ b/lib/rabl/builder.rb
@@ -59,8 +59,9 @@ module Rabl
# Replace nil values with empty strings if configured
if Rabl.configuration.replace_nil_values_with_empty_strings
- @_result = @_result.each_with_object({}) do |(k, v), hash|
+ @_result = @_result.inject({}) do |hash, (k, v)|
hash[k] = v.nil? ? '' : v
+ hash
end
end
|
Use inject instead of each_with_object to maintain Ruby <I> compatibility
|
diff --git a/lib/tree.js b/lib/tree.js
index <HASH>..<HASH> 100644
--- a/lib/tree.js
+++ b/lib/tree.js
@@ -30,8 +30,18 @@ var _Tree = function( obj, tree ) {
, i
, len = self.length
, repo = repo || self.repo
- , event = new events.EventEmitter();
+ , event = new events.EventEmitter()
+ , prerequisites = 0;
+ function complete() {
+ if( i<len-1 ) {
+ next(i=i+1);
+ }
+ else {
+ event.emit( 'end' );
+ }
+ }
+
function next(i) {
var dir;
var tree;
@@ -45,19 +55,19 @@ var _Tree = function( obj, tree ) {
else {
dir = entry.name;
tree = entry.tree();
+ prerequisites++;
!tree.error && tree.walk( repo ).on( 'entry', function( i, entry ) {
entry.dir += dir + '/';
event.emit( 'entry', i, entry );
+ }).on( 'end' , function( ) {
+ prerequisites--;
+
+ (prerequisites == 0) && event.emit( 'end' );
});
}
- if( i<len-1 ) {
- next(i=i+1);
- }
- else {
- event.emit( 'end' );
- }
+ (prerequisites == 0) && complete();
});
}
|
Fix Loading Issue in lib/tree.js
This code fixes a bug whereby some tree elements will not yet
have loaded when the 'end' event is signalled.
|
diff --git a/symphony/content/content.logout.php b/symphony/content/content.logout.php
index <HASH>..<HASH> 100644
--- a/symphony/content/content.logout.php
+++ b/symphony/content/content.logout.php
@@ -16,6 +16,26 @@ class contentLogout extends HTMLPage
public function view()
{
Administration::instance()->logout();
- redirect(URL);
+ $redirectUrl = URL;
+ /**
+ * A successful logout attempt into the Symphony backend
+ *
+ * @delegate AuthorLogout
+ * @since Symphony 3.0.0
+ * @param string $context
+ * '/logout/'
+ * @param integer $author_id
+ * The ID of Author ID that is about to be deleted
+ * @param Author $author
+ * The Author object.
+ * @param string $redirect_url
+ * The url to which the author will be redirected
+ */
+ Symphony::ExtensionManager()->notifyMembers('AuthorLogout', '/logout/', [
+ 'author' => Symphony::Author(),
+ 'author_id' => Symphony::Author()->get('id'),
+ 'redirect_url' => &$redirectUrl,
+ ]);
+ redirect($redirectUrl);
}
}
|
Add AuthorLogout delegate
Picked from c<I>a<I>af<I>
Picked from e<I>ba<I>a4b
|
diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js
index <HASH>..<HASH> 100644
--- a/benchmark/benchmark.js
+++ b/benchmark/benchmark.js
@@ -11,7 +11,7 @@ process.env.NODE_ENV = "production";
const CONCURRENCY = 10;
-const DEPTH = 7;
+const DEPTH = 8;
const CACHE_DIVS = "CACHE_DIVS";
const CACHE_COMPONENT = "CACHE_COMPONENT";
|
Give benchmark a bit more work to do.
|
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
setup(
name="threat_intel",
- version='0.1.25',
+ version='0.1.26',
provides=['threat_intel'],
author="Yelp Security",
url='https://github.com/Yelp/threat_intel',
|
Bumping the version to <I>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -85,6 +85,8 @@ var RedisStorage = createStorage(queue, unqueue, log);
*/
RedisStorage.prototype.redis = function() {
if (!this.cn) this.cn = redis.createClient();
+ // catch connection errors as service and so we can try reconnecting
+ this.cn.on('error', function() {true});
return this.cn;
};
|
Adding error handler to avoid service kill when redis gone
Could be perhaps improved with some error loggings for higher verbose levels.
Conflicts:
index.js
|
diff --git a/src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js b/src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js
index <HASH>..<HASH> 100644
--- a/src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js
+++ b/src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js
@@ -11,7 +11,9 @@ sap.ui.require([
"sap/ui/model/odata/OperationMode",
"sap/ui/model/odata/v4/ODataModel",
"sap/ui/model/Sorter",
- "sap/ui/test/TestUtils"
+ "sap/ui/test/TestUtils",
+ // load Table resources upfront to avoid loading times > 1 second for the first test using Table
+ "sap/ui/table/Table"
], function (jQuery, ColumnListItem, Text, Controller, Filter, FilterOperator, OperationMode,
ODataModel, Sorter, TestUtils) {
/*global QUnit, sinon */
|
[INTERNAL] ODataModel.integration.qunit: Improve loading time for tests using Table
Should fix the issue that the first test using Table goes red as it
needs more than one second due to resource loading.
PS1: PKS solo
PS1: remove checkFinish from checkRequest (remainder from 1st try)
Change-Id: Ie<I>d9d<I>ca<I>c9d<I>daf1c<I>fe<I>
|
diff --git a/modules/backend/assets/js/october.dragscroll.js b/modules/backend/assets/js/october.dragscroll.js
index <HASH>..<HASH> 100644
--- a/modules/backend/assets/js/october.dragscroll.js
+++ b/modules/backend/assets/js/october.dragscroll.js
@@ -84,7 +84,7 @@
return false
})
- $(window).on('ready', $.proxy(this.fixScrollClasses, this))
+ $(document).on('ready', $.proxy(this.fixScrollClasses, this))
$(window).on('resize', $.proxy(this.fixScrollClasses, this))
/*
|
Update october.dragscroll.js
|
diff --git a/requery-test/src/main/java/io/requery/test/FunctionalTest.java b/requery-test/src/main/java/io/requery/test/FunctionalTest.java
index <HASH>..<HASH> 100644
--- a/requery-test/src/main/java/io/requery/test/FunctionalTest.java
+++ b/requery-test/src/main/java/io/requery/test/FunctionalTest.java
@@ -771,11 +771,14 @@ public abstract class FunctionalTest extends RandomData {
for (int i = 0; i < 3; i++) {
try (Result<Person> query = data.select(Person.class)
.where(Person.NAME.equal(name))
+ .orderBy(Person.NAME)
.limit(5).get()) {
assertEquals(5, query.toList().size());
}
try (Result<Person> query = data.select(Person.class)
- .where(Person.NAME.equal(name)).limit(5).offset(5).get()) {
+ .where(Person.NAME.equal(name))
+ .orderBy(Person.NAME)
+ .limit(5).offset(5).get()) {
assertEquals(5, query.toList().size());
}
}
|
Resolve #<I> Update test case with orderBy/limit
|
diff --git a/fenzo-core/src/test/java/com/netflix/fenzo/AutoScalerTest.java b/fenzo-core/src/test/java/com/netflix/fenzo/AutoScalerTest.java
index <HASH>..<HASH> 100644
--- a/fenzo-core/src/test/java/com/netflix/fenzo/AutoScalerTest.java
+++ b/fenzo-core/src/test/java/com/netflix/fenzo/AutoScalerTest.java
@@ -234,6 +234,7 @@ public class AutoScalerTest {
do {
Thread.sleep(1000);
scheduler.scheduleOnce(requests, leases);
+ leases.clear();
} while (i++<coolDownSecs+2 && latch.getCount()>0);
if(latch.getCount()<1)
Assert.fail("Scale up action received for " + rule2.getRuleName() + " rule, was expecting only on "
|
fix unit test to not input same lease twice to scheduler
|
diff --git a/parser.go b/parser.go
index <HASH>..<HASH> 100644
--- a/parser.go
+++ b/parser.go
@@ -936,14 +936,6 @@ func (p *Parser) normalizeColumn(col model.TableColumn) error {
l := model.NewLength("8")
l.SetDecimal("2")
col.SetLength(l)
- case model.ColumnTypeTinyText, model.ColumnTypeTinyBlob:
- col.SetLength(model.NewLength("255"))
- case model.ColumnTypeBlob, model.ColumnTypeText:
- col.SetLength(model.NewLength("65535"))
- case model.ColumnTypeMediumBlob, model.ColumnTypeMediumText:
- col.SetLength(model.NewLength("16777215"))
- case model.ColumnTypeLongBlob, model.ColumnTypeLongText:
- col.SetLength(model.NewLength("4294967295"))
}
}
|
TEXT and BLOB do not have length
|
diff --git a/tcex/tcex_ti/tcex_ti.py b/tcex/tcex_ti/tcex_ti.py
index <HASH>..<HASH> 100644
--- a/tcex/tcex_ti/tcex_ti.py
+++ b/tcex/tcex_ti/tcex_ti.py
@@ -172,9 +172,9 @@ class TcExTi(object):
else:
try:
if upper_indicator_type in self._custom_indicator_classes.keys():
- custom_indicator_details = self._custom_indicator_classes[indicator_type]
+ custom_indicator_details = self._custom_indicator_classes[upper_indicator_type]
value_fields = custom_indicator_details.get('value_fields')
- c = getattr(module, upper_indicator_type)
+ c = getattr(module, indicator_type.replace(' ', ''))
if len(value_fields) == 1:
indicator = c(
self.tcex, kwargs.pop(value_fields[0], None), owner=owner, **kwargs
@@ -188,6 +188,7 @@ class TcExTi(object):
**kwargs
)
elif len(value_fields) == 3:
+ print(value_fields)
indicator = c(
self.tcex,
kwargs.pop(value_fields[0], None),
|
making it so that cusom indicators unique_id are url safe
|
diff --git a/go/chat/storage/inbox.go b/go/chat/storage/inbox.go
index <HASH>..<HASH> 100644
--- a/go/chat/storage/inbox.go
+++ b/go/chat/storage/inbox.go
@@ -23,7 +23,7 @@ import (
"golang.org/x/net/context"
)
-const inboxVersion = 23
+const inboxVersion = 24
var defaultMemberStatusFilter = []chat1.ConversationMemberStatus{
chat1.ConversationMemberStatus_ACTIVE,
|
Bump inbox storage version (#<I>)
|
diff --git a/Eloquent/Relations/MorphToMany.php b/Eloquent/Relations/MorphToMany.php
index <HASH>..<HASH> 100644
--- a/Eloquent/Relations/MorphToMany.php
+++ b/Eloquent/Relations/MorphToMany.php
@@ -116,6 +116,19 @@ class MorphToMany extends BelongsToMany
}
/**
+ * Get the pivot models that are currently attached.
+ *
+ * @return \Illuminate\Support\Collection
+ */
+ protected function getCurrentlyAttachedPivots()
+ {
+ return parent::getCurrentlyAttachedPivots()->map(function ($record) {
+ return $record->setMorphType($this->morphType)
+ ->setMorphClass($this->morphClass);
+ });
+ }
+
+ /**
* Create a new query builder for the pivot table.
*
* @return \Illuminate\Database\Query\Builder
|
fix bug with update existing pivot and polymorphic many to many
|
diff --git a/openquake/calculators/tests/classical_test.py b/openquake/calculators/tests/classical_test.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/tests/classical_test.py
+++ b/openquake/calculators/tests/classical_test.py
@@ -512,7 +512,7 @@ hazard_uhs-std.csv
'hazard_map-mean.csv'], case_39.__file__, delta=1E-5)
def test_case_40(self):
- # NGE East
+ # NGA East
self.assert_curves_ok([
'hazard_curve-mean-PGV.csv', 'hazard_map-mean.csv'],
case_40.__file__, delta=1E-6)
|
Fixed misprint in comment [skip CI]
|
diff --git a/bin/cargo-tessel.js b/bin/cargo-tessel.js
index <HASH>..<HASH> 100755
--- a/bin/cargo-tessel.js
+++ b/bin/cargo-tessel.js
@@ -42,15 +42,15 @@ parser.command('build')
.help('Cross-compile a binary for Tessel.');
parser.command('sdk')
+ .callback(options => {
+ rust.cargo[options.subcommand](options).catch(closeCommand);
+ })
.option('subcommand', {
position: 1,
required: true,
- options: ['install', 'uninstall'],
+ choices: ['install', 'uninstall'],
help: '"install" or "uninstall" the SDK.',
})
- .callback(options => {
- rust.cargo[options.subcommand](options).catch(closeCommand);
- })
.help('Manage the SDK for cross-compiling Rust binaries.');
|
Make callback first (consistent)
|
diff --git a/src/tabs/index.js b/src/tabs/index.js
index <HASH>..<HASH> 100644
--- a/src/tabs/index.js
+++ b/src/tabs/index.js
@@ -267,7 +267,7 @@ export default createComponent({
},
// emit event when clicked
- onClick(index) {
+ onClick(item, index) {
const { title, disabled, computedName } = this.children[index];
if (disabled) {
this.$emit('disabled', computedName, title);
@@ -275,6 +275,7 @@ export default createComponent({
this.setCurrentIndex(index);
this.scrollToCurrentContent();
this.$emit('click', computedName, title);
+ route(item.$router, item);
}
},
@@ -360,8 +361,7 @@ export default createComponent({
default: () => item.slots('title'),
}}
onClick={() => {
- this.onClick(index);
- route(item.$router, item);
+ this.onClick(item, index);
}}
/>
));
|
fix(Tab): should not trigger route when disabled (#<I>)
|
diff --git a/rivescript/sorting.py b/rivescript/sorting.py
index <HASH>..<HASH> 100644
--- a/rivescript/sorting.py
+++ b/rivescript/sorting.py
@@ -47,7 +47,7 @@ class TriggerObj(object):
self.option = self.alphabet.count('[') + self.alphabet.count('(') # Number of option 0 < 1
if self.star > 0:
- if self.pound == 0 & self.under == 0 & self.option == 0: # Place single star last in the rank
+ if (self.pound == 0) & (self.under == 0) & (self.option == 0): # Place single star last in the rank
self.pound = sys.maxsize
self.under = sys.maxsize
self.option = sys.maxsize
|
#<I> Fix proper use of bitwise operator
|
diff --git a/pygerduty.py b/pygerduty.py
index <HASH>..<HASH> 100755
--- a/pygerduty.py
+++ b/pygerduty.py
@@ -126,7 +126,10 @@ class Collection(object):
response = self.pagerduty.request(
"GET", path, query_params=kwargs)
- return self.container(self, **response.get(self.sname, {}))
+ if response.get(self.sname):
+ return self.container(self, **response.get(self.sname, {}))
+ else:
+ return self.container(self, **response)
def delete(self, entity_id):
path = "%s/%s" % (self.name, entity_id)
|
Handle cases such as /incidents/<ID> which return a single object rather
than a collection.
|
diff --git a/pulse.go b/pulse.go
index <HASH>..<HASH> 100644
--- a/pulse.go
+++ b/pulse.go
@@ -64,7 +64,6 @@ type coreModule interface {
}
func main() {
- gitversion = "0.0.1" // TODO parse git tags
app := cli.NewApp()
app.Name = "pulsed"
app.Version = gitversion
@@ -76,7 +75,7 @@ func main() {
}
func action(ctx *cli.Context) {
- log.Info("Starting PulseD")
+ log.Info("Starting pulsed")
logLevel := ctx.Int("log-level")
logPath := ctx.String("log-path")
maxProcs := ctx.Int("max-procs")
|
Removing gitversion variable declaration. Gitversion set during make of pulse
|
diff --git a/src/packbits.py b/src/packbits.py
index <HASH>..<HASH> 100644
--- a/src/packbits.py
+++ b/src/packbits.py
@@ -59,7 +59,7 @@ def encode(data):
result.append(256-(repeat_count - 1))
result.append(data[pos])
- while pos < len(data)-1:
+ while pos < len(data)-1:
current_byte = data[pos]
if data[pos] == data[pos+1]:
diff --git a/test_packbits.py b/test_packbits.py
index <HASH>..<HASH> 100644
--- a/test_packbits.py
+++ b/test_packbits.py
@@ -62,7 +62,7 @@ def test_encode_long_raw():
print(encoded)
assert packbits.decode(encoded) == data
-def test_encode_long_raw():
+def test_encode_long_raw2():
data = b'12345678' * 16
encoded = packbits.encode(data)
assert packbits.decode(encoded) == data
|
rename test (it was not executed before)
|
diff --git a/src/main/java/com/couchbase/client/core/env/DefaultCoreEnvironment.java b/src/main/java/com/couchbase/client/core/env/DefaultCoreEnvironment.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/couchbase/client/core/env/DefaultCoreEnvironment.java
+++ b/src/main/java/com/couchbase/client/core/env/DefaultCoreEnvironment.java
@@ -427,14 +427,14 @@ public class DefaultCoreEnvironment implements CoreEnvironment {
if (builder.queryServiceConfig != null) {
this.queryServiceConfig = builder.queryServiceConfig;
} else {
- int minEndpoints = queryEndpoints() == VIEW_ENDPOINTS ? 0 : queryEndpoints();
+ int minEndpoints = queryEndpoints() == QUERY_ENDPOINTS ? 0 : queryEndpoints();
this.queryServiceConfig = QueryServiceConfig.create(minEndpoints, queryEndpoints());
}
if (builder.searchServiceConfig != null) {
this.searchServiceConfig = builder.searchServiceConfig;
} else {
- int minEndpoints = searchEndpoints() == VIEW_ENDPOINTS ? 0 : searchEndpoints();
+ int minEndpoints = searchEndpoints() == SEARCH_ENDPOINTS ? 0 : searchEndpoints();
this.searchServiceConfig = SearchServiceConfig.create(minEndpoints, searchEndpoints());
}
|
Use correct default value for endpoints.
This is just a correctness fix, since the constants right now
are all the same.
Change-Id: Icae<I>d9bf3f<I>e<I>fdbfe<I>c8b<I>
Reviewed-on: <URL>
|
diff --git a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php
index <HASH>..<HASH> 100644
--- a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php
+++ b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php
@@ -31,12 +31,12 @@ use Webmozart\Assert\Assert;
class Kernel extends HttpKernel
{
- public const VERSION = '1.3.14';
- public const VERSION_ID = '10314';
+ public const VERSION = '1.3.15-DEV';
+ public const VERSION_ID = '10315';
public const MAJOR_VERSION = '1';
public const MINOR_VERSION = '3';
- public const RELEASE_VERSION = '14';
- public const EXTRA_VERSION = '';
+ public const RELEASE_VERSION = '15';
+ public const EXTRA_VERSION = 'DEV';
public function __construct(string $environment, bool $debug)
{
|
Change application's version to <I>-DEV
|
diff --git a/client/js/azure/uploader.basic.js b/client/js/azure/uploader.basic.js
index <HASH>..<HASH> 100644
--- a/client/js/azure/uploader.basic.js
+++ b/client/js/azure/uploader.basic.js
@@ -194,6 +194,7 @@
}),
getSas = new qq.azure.GetSas({
cors: this._options.cors,
+ customHeaders: this._options.signature.customHeaders,
endpointStore: {
get: function() {
return self._options.signature.endpoint;
|
fix(azure/uploader.basic): customHeaders omitted from delete SAS
closes #<I>
|
diff --git a/goagen/codegen/workspace.go b/goagen/codegen/workspace.go
index <HASH>..<HASH> 100644
--- a/goagen/codegen/workspace.go
+++ b/goagen/codegen/workspace.go
@@ -310,7 +310,7 @@ func PackagePath(path string) (string, error) {
if gp, err := filepath.Abs(gopath); err == nil {
gopath = gp
}
- if strings.HasPrefix(absPath, gopath) {
+ if filepath.HasPrefix(absPath, gopath) {
base := filepath.FromSlash(gopath + "/src")
rel, err := filepath.Rel(base, absPath)
return filepath.ToSlash(rel), err
|
Fix path prefix check. (#<I>)
Windows paths are case-insensitive.
|
diff --git a/spec/lol/champion_spec.rb b/spec/lol/champion_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lol/champion_spec.rb
+++ b/spec/lol/champion_spec.rb
@@ -1,5 +1,5 @@
-require "lol"
require "spec_helper"
+require "lol"
include Lol
diff --git a/spec/lol/client_spec.rb b/spec/lol/client_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lol/client_spec.rb
+++ b/spec/lol/client_spec.rb
@@ -1,5 +1,5 @@
-require "lol"
require "spec_helper"
+require "lol"
require "json"
include Lol
diff --git a/spec/lol/game_spec.rb b/spec/lol/game_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lol/game_spec.rb
+++ b/spec/lol/game_spec.rb
@@ -1,5 +1,5 @@
-require "lol"
require "spec_helper"
+require "lol"
require "json"
include Lol
diff --git a/spec/lol/league_spec.rb b/spec/lol/league_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lol/league_spec.rb
+++ b/spec/lol/league_spec.rb
@@ -0,0 +1 @@
+require "spec_helper"
|
moved spec_helper on top to get simplecov running correctly
|
diff --git a/lib/canonical-rails.rb b/lib/canonical-rails.rb
index <HASH>..<HASH> 100644
--- a/lib/canonical-rails.rb
+++ b/lib/canonical-rails.rb
@@ -20,9 +20,6 @@ module CanonicalRails
mattr_accessor :collection_actions
@@collection_actions = [:index]
- mattr_accessor :member_actions
- @@member_actions = [:show]
-
mattr_accessor :whitelisted_parameters
@@whitelisted_parameters = []
|
Remove member_actions as it is not being used.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,8 @@ setup(
'Programming Language :: Python',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Python Modules',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
],
platforms = ['any'],
url = 'http://github.com/jcassee/django-analytical',
|
added py<I>/<I> classifiers as travis-ci tests these versions
|
diff --git a/mistune/util.py b/mistune/util.py
index <HASH>..<HASH> 100644
--- a/mistune/util.py
+++ b/mistune/util.py
@@ -20,7 +20,12 @@ def escape(s, quote=True):
def escape_url(link):
- safe = '/#:()*?=%@+,&'
+ safe = (
+ ':/?#@' # gen-delims - '[]' (rfc3986)
+ '!$&()*+,;=' # sub-delims - "'" (rfc3986)
+ '%' # leave already-encoded octets alone
+ )
+
if html is None:
return quote(link.encode('utf-8'), safe=safe)
return html.escape(quote(html.unescape(link), safe=safe))
|
Make mistune.util.escape_url less aggressive
This adds ';', '!', and '$' to the set of characters which will be
passed unmolested by escape_url. These are all in RFC <I> reserved
character list — that is to say: escaping these may change the meaning
of a URL.
|
diff --git a/lib/loaders/LoaderBase.js b/lib/loaders/LoaderBase.js
index <HASH>..<HASH> 100644
--- a/lib/loaders/LoaderBase.js
+++ b/lib/loaders/LoaderBase.js
@@ -191,12 +191,12 @@ var LoaderBase = new Class({
*/
_onStateChange: function () {
if (this.xhr.readyState > 1) {
- var status = ''
+ var status
var waiting = false
// Fix error in IE8 where status isn't available until readyState=4
try { status = this.xhr.status } catch (e) { waiting = true }
- if (status === '200') {
+ if (status === 200) {
switch (this.xhr.readyState) {
// send() has been called, and headers and status are available
|
Bugfix wrong status type comparision
|
diff --git a/lib/flor/instruction.rb b/lib/flor/instruction.rb
index <HASH>..<HASH> 100644
--- a/lib/flor/instruction.rb
+++ b/lib/flor/instruction.rb
@@ -37,17 +37,6 @@ class Flor::Instruction
:over
end
- def self.names(*names)
-
- names.each { |n| (@@instructions ||= {})[n] = self }
- end
- class << self; alias :name :names; end
-
- def self.lookup(name)
-
- @@instructions[name]
- end
-
protected
def tree
@@ -61,8 +50,21 @@ class Flor::Instruction
end
end
-module Flor::Ins; end
-
+# class methods
+#
class Flor::Instruction
+
+ def self.names(*names)
+
+ names.each { |n| (@@instructions ||= {})[n] = self }
+ end
+ class << self; alias :name :names; end
+
+ def self.lookup(name)
+
+ @@instructions[name]
+ end
end
+module Flor::Ins; end
+
|
set Flor::Instruction class methods apart
|
diff --git a/lib/toto.rb b/lib/toto.rb
index <HASH>..<HASH> 100644
--- a/lib/toto.rb
+++ b/lib/toto.rb
@@ -143,7 +143,7 @@ module Toto
end
def self.articles ext
- Dir["#{Paths[:articles]}/*.#{ext}"].sort { |file_name| File.basename(file_name) }
+ Dir["#{Paths[:articles]}/*.#{ext}"].sort_by { |file_name| File.basename(file_name) }
end
class Context
|
Ops, wrong call to .sort_by
|
diff --git a/symbols/funcdecl.py b/symbols/funcdecl.py
index <HASH>..<HASH> 100644
--- a/symbols/funcdecl.py
+++ b/symbols/funcdecl.py
@@ -11,7 +11,9 @@
from api import global_
from api.constants import TYPE_SIZES
+import api.symboltable
from symbol_ import Symbol
+from function import SymbolFUNCTION
class SymbolFUNCDECL(Symbol):
@@ -22,6 +24,15 @@ class SymbolFUNCDECL(Symbol):
self.entry = entry # Symbol table entry
@property
+ def entry(self):
+ return self.children[0]
+
+ @entry.setter
+ def entry(self, value):
+ assert isinstance(value, SymbolFUNCTION)
+ self.children = [value]
+
+ @property
def name(self):
return self.entry.name
@@ -39,7 +50,7 @@ class SymbolFUNCDECL(Symbol):
@local_symbol_table.setter
def local_symbol_table(self, value):
- assert isinstance(value, dict)
+ assert isinstance(value, api.symboltable.SymbolTable.Scope)
self.entry.local_symbol_table = value
@property
@@ -55,8 +66,8 @@ class SymbolFUNCDECL(Symbol):
return TYPE_SIZES[self._type]
@property
- def mangled_(self):
- return self.entry.mangled_
+ def mangled(self):
+ return self.entry.mangled
@classmethod
def make_node(clss, func_name, lineno):
|
Little fixes for bugs discovered by TDD
|
diff --git a/src/lib/exceptions.js b/src/lib/exceptions.js
index <HASH>..<HASH> 100644
--- a/src/lib/exceptions.js
+++ b/src/lib/exceptions.js
@@ -85,7 +85,8 @@ module.exports = {
'filename': this.cleanFileUrl(stack.fileName),
'lineno': stack.lineNumber,
'colno': stack.columnNumber,
- 'function': stack.functionName || '[anonymous]'
+ 'function': stack.functionName || '[anonymous]',
+ 'abs_path': stack.fileName
}
// Detect Sourcemaps
|
Add abs_path param to stack frames
|
diff --git a/gandi/conf.py b/gandi/conf.py
index <HASH>..<HASH> 100644
--- a/gandi/conf.py
+++ b/gandi/conf.py
@@ -143,11 +143,13 @@ class GandiContextHelper(object):
if ret is None:
return default
- def call(self, method, args):
+ def call(self, method, *args):
""" call a remote api method and returned the result """
+ print 'calling method:', method
+ print 'with params:', args
try:
func = getattr(self.api, method)
- return func(self.apikey, args)
+ return func(self.apikey, *args)
except socket.error:
msg = 'Gandi API service is unreachable'
raise UsageError(msg)
|
Fixes args passing to api call
|
diff --git a/lib/ditty/controllers/component.rb b/lib/ditty/controllers/component.rb
index <HASH>..<HASH> 100644
--- a/lib/ditty/controllers/component.rb
+++ b/lib/ditty/controllers/component.rb
@@ -42,7 +42,7 @@ module Ditty
end
# Create Form
- get '/new' do
+ get '/new/?' do
authorize settings.model_class, :create
entity = settings.model_class.new(permitted_attributes(settings.model_class, :create))
@@ -66,7 +66,7 @@ module Ditty
end
# Read
- get '/:id' do |id|
+ get '/:id/?' do |id|
entity = read(id)
halt 404 unless entity
authorize entity, :read
@@ -76,7 +76,7 @@ module Ditty
end
# Update Form
- get '/:id/edit' do |id|
+ get '/:id/edit/?' do |id|
entity = read(id)
halt 404 unless entity
authorize entity, :update
@@ -87,7 +87,7 @@ module Ditty
end
# Update
- put '/:id' do |id|
+ put '/:id/?' do |id|
entity = read(id)
halt 404 unless entity
authorize entity, :update
@@ -101,7 +101,7 @@ module Ditty
update_response(entity)
end
- delete '/:id' do |id|
+ delete '/:id/?' do |id|
entity = read(id)
halt 404 unless entity
authorize entity, :delete
|
chore: Allow trailing / on certain component routes
|
diff --git a/discord/invite.py b/discord/invite.py
index <HASH>..<HASH> 100644
--- a/discord/invite.py
+++ b/discord/invite.py
@@ -53,7 +53,7 @@ class Invite(Hashable):
max_age: int
How long the before the invite expires in seconds. A value of 0 indicates that it doesn't expire.
code: str
- The URL fragment used for the invite. :attr:`xkcd` is also a possible fragment.
+ The URL fragment used for the invite.
guild: :class:`Guild`
The guild the invite is for.
revoked: bool
@@ -89,7 +89,7 @@ class Invite(Hashable):
self.max_uses = data.get('max_uses')
inviter_data = data.get('inviter')
- self.inviter = None if inviter_data is None else User(state=state, data=data)
+ self.inviter = None if inviter_data is None else User(state=state, data=inviter_data)
self.channel = data.get('channel')
def __str__(self):
|
Fix parsing of Invite.user
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.