diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractInteractableComponent.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractInteractableComponent.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractInteractableComponent.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractInteractableComponent.java
@@ -40,12 +40,12 @@ public abstract class AbstractInteractableComponent<T extends AbstractInteractab
}
@Override
- public Interactable takeFocus() {
+ public T takeFocus() {
BasePane basePane = getBasePane();
if(basePane != null) {
basePane.setFocusedInteractable(this);
}
- return this;
+ return self();
}
/**
|
Adjusting method so it turns the parameterized type instead of the general interface
|
diff --git a/main.go b/main.go
index <HASH>..<HASH> 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
package main
import (
+ "crypto/tls"
"encoding/json"
"flag"
"fmt"
@@ -51,7 +52,27 @@ func main() {
http.HandleFunc("/report", reportHandler)
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
- err = http.ListenAndServeTLS(fmt.Sprintf(":%d", *port), *certFile, *keyFile, nil)
+ cert, err := tls.LoadX509KeyPair(*certFile, *keyFile)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ cfg := &tls.Config{
+ Certificates: []tls.Certificate{cert},
+ SessionTicketsDisabled: true,
+ }
+
+ listener, err := tls.Listen("tcp", fmt.Sprintf(":%d", *port), cfg)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ srv := http.Server{
+ ReadTimeout: 5 * time.Second,
+ WriteTimeout: 5 * time.Second,
+ }
+
+ err = srv.Serve(listener)
if err != nil {
log.Fatal(err)
}
|
Set read and write timeouts on HTTPS requests
|
diff --git a/Classes/Helper/InlineHelper.php b/Classes/Helper/InlineHelper.php
index <HASH>..<HASH> 100644
--- a/Classes/Helper/InlineHelper.php
+++ b/Classes/Helper/InlineHelper.php
@@ -289,6 +289,10 @@ class InlineHelper
foreach ($rows as $element) {
if ($inWorkspacePreviewMode) {
$element = BackendUtility::getRecordWSOL($childTable, $element['uid']);
+ // Ignore disabled elements in backend preview.
+ if ($element[$GLOBALS['TCA'][$childTable]['ctrl']['enablecolumns']['disabled']] ?? false) {
+ continue;
+ }
}
$elements[$element['uid']] = $element;
}
|
[BUGFIX] Ignore disabled elements in backend preview
|
diff --git a/graylog2-server/src/main/java/org/graylog2/plugin/Message.java b/graylog2-server/src/main/java/org/graylog2/plugin/Message.java
index <HASH>..<HASH> 100644
--- a/graylog2-server/src/main/java/org/graylog2/plugin/Message.java
+++ b/graylog2-server/src/main/java/org/graylog2/plugin/Message.java
@@ -35,6 +35,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nonnull;
+import javax.annotation.concurrent.NotThreadSafe;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Collection;
@@ -54,6 +55,7 @@ import static org.graylog2.plugin.Tools.ES_DATE_FORMAT_FORMATTER;
import static org.graylog2.plugin.Tools.buildElasticSearchTimeFormat;
import static org.joda.time.DateTimeZone.UTC;
+@NotThreadSafe
public class Message implements Messages {
private static final Logger LOG = LoggerFactory.getLogger(Message.class);
|
Mark Message class as not thread-safe (#<I>)
Refs #<I>
|
diff --git a/src/Collection/CollectionInterface.php b/src/Collection/CollectionInterface.php
index <HASH>..<HASH> 100644
--- a/src/Collection/CollectionInterface.php
+++ b/src/Collection/CollectionInterface.php
@@ -855,5 +855,5 @@ interface CollectionInterface extends Iterator, JsonSerializable
*
* @return \Iterator
*/
- public function _unwrap();
+ public function unwrap();
}
diff --git a/src/Collection/CollectionTrait.php b/src/Collection/CollectionTrait.php
index <HASH>..<HASH> 100644
--- a/src/Collection/CollectionTrait.php
+++ b/src/Collection/CollectionTrait.php
@@ -544,7 +544,7 @@ trait CollectionTrait
* {@inheritDoc}
*
*/
- public function _unwrap()
+ public function unwrap()
{
$iterator = $this;
while (get_class($iterator) === 'Cake\Collection\Collection') {
@@ -552,4 +552,15 @@ trait CollectionTrait
}
return $iterator;
}
+
+ /**
+ * Backwards compatible wrapper for unwrap()
+ *
+ * @return \Iterator
+ * @deprecated
+ */
+ public function _unwrap()
+ {
+ return $this->unwrap();
+ }
}
|
Making unwrap public, because "Coding Standards"
|
diff --git a/lib/transflow/transaction.rb b/lib/transflow/transaction.rb
index <HASH>..<HASH> 100644
--- a/lib/transflow/transaction.rb
+++ b/lib/transflow/transaction.rb
@@ -62,7 +62,7 @@ module Transflow
alias_method :[], :call
def to_s
- "Transaction(#{steps.keys.join(' => ')})"
+ "Transaction(#{steps.keys.reverse.join(' => ')})"
end
def fn(obj)
diff --git a/spec/unit/transaction_spec.rb b/spec/unit/transaction_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/transaction_spec.rb
+++ b/spec/unit/transaction_spec.rb
@@ -50,4 +50,12 @@ RSpec.describe Transflow::Transaction do
end
end
end
+
+ describe '#to_s' do
+ it 'returns a string representation of a transaction' do
+ transaction = Transflow::Transaction.new(three: proc {}, two: proc {}, one: proc {})
+
+ expect(transaction.to_s).to eql('Transaction(one => two => three)')
+ end
+ end
end
|
Fix order of steps in Transaction#to_s
|
diff --git a/client.js b/client.js
index <HASH>..<HASH> 100644
--- a/client.js
+++ b/client.js
@@ -4,6 +4,6 @@
*/
var common = require("./common");
-common.controller = require("./core/ClientController");
+common.ClientController = require("./core/ClientController");
module.exports = common;
\ No newline at end of file
|
Fixing one more file to follow the capitalization convention.
|
diff --git a/lib/knife-solo/berkshelf.rb b/lib/knife-solo/berkshelf.rb
index <HASH>..<HASH> 100644
--- a/lib/knife-solo/berkshelf.rb
+++ b/lib/knife-solo/berkshelf.rb
@@ -19,8 +19,12 @@ module KnifeSolo
path = berkshelf_path
ui.msg "Installing Berkshelf cookbooks to '#{path}'..."
- berkshelf_options = KnifeSolo::Tools.config_value(config, :berkshelf_options) || {}
- berksfile = ::Berkshelf::Berksfile.from_file('Berksfile',berkshelf_options)
+ if defined?(::Berkshelf) && Gem::Version.new(::Berkshelf::VERSION) >= Gem::Version.new("3.0.0")
+ berkshelf_options = KnifeSolo::Tools.config_value(config, :berkshelf_options) || {}
+ berksfile = ::Berkshelf::Berksfile.from_file('Berksfile',berkshelf_options)
+ else
+ berksfile = ::Berkshelf::Berksfile.from_file('Berksfile')
+ end
if berksfile.respond_to?(:vendor)
FileUtils.rm_rf(path)
berksfile.vendor(path)
|
Fixed for compatibility with Berkshelf 2
|
diff --git a/lib/amee.rb b/lib/amee.rb
index <HASH>..<HASH> 100644
--- a/lib/amee.rb
+++ b/lib/amee.rb
@@ -11,6 +11,9 @@ class String
def is_json?
slice(0,1) == '{'
end
+ def is_v2_json?
+ is_json? && match('"apiVersion".*?:.*?"2.0"')
+ end
def is_xml?
slice(0,5) == '<?xml'
end
|
Add tests for v2 JSON responses
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function (grunt) {
cfg.connect = {
src: {
options: {
- port: 9200
+ port: 9210
, base: 'src/'
}
}
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -34,7 +34,7 @@ port = 9876;
// cli runner port
-runnerPort = 9200;
+runnerPort = 9210;
// enable / disable colors in the output (reporters and logs)
|
try port <I> for karma
|
diff --git a/scs_osio/cmd/cmd_user_topics.py b/scs_osio/cmd/cmd_user_topics.py
index <HASH>..<HASH> 100644
--- a/scs_osio/cmd/cmd_user_topics.py
+++ b/scs_osio/cmd/cmd_user_topics.py
@@ -6,8 +6,6 @@ Created on 2 Jul 2017
import optparse
-from scs_core.data.localized_datetime import LocalizedDatetime
-
# --------------------------------------------------------------------------------------------------------------------
|
Added OPCMonitor class.
|
diff --git a/lib/fluent/plugin/in_exec.rb b/lib/fluent/plugin/in_exec.rb
index <HASH>..<HASH> 100644
--- a/lib/fluent/plugin/in_exec.rb
+++ b/lib/fluent/plugin/in_exec.rb
@@ -98,7 +98,7 @@ module Fluent::Plugin
router.emit(tag, time, record)
rescue => e
log.error "exec failed to emit", tag: tag, record: Yajl.dump(record), error: e
- router.emit_error_event(tag, time, record, "exec failed to emit")
+ router.emit_error_event(tag, time, record, e) if tag && time && record
end
end
end
diff --git a/lib/fluent/plugin/out_exec_filter.rb b/lib/fluent/plugin/out_exec_filter.rb
index <HASH>..<HASH> 100644
--- a/lib/fluent/plugin/out_exec_filter.rb
+++ b/lib/fluent/plugin/out_exec_filter.rb
@@ -305,7 +305,7 @@ module Fluent::Plugin
log.error_backtrace e.backtrace
@next_log_time = Time.now.to_i + @suppress_error_log_interval
end
- router.emit_error_event(tag, time, record, "exec_filter failed to emit") if tag && time && record
+ router.emit_error_event(tag, time, record, e) if tag && time && record
end
end
end
|
fix to pass error object into error stream
|
diff --git a/src/main/java/me/legrange/mikrotik/ApiConnection.java b/src/main/java/me/legrange/mikrotik/ApiConnection.java
index <HASH>..<HASH> 100644
--- a/src/main/java/me/legrange/mikrotik/ApiConnection.java
+++ b/src/main/java/me/legrange/mikrotik/ApiConnection.java
@@ -429,8 +429,10 @@ public class ApiConnection {
private List<Result> getResults() throws ApiCommandException, ApiConnectionException {
try {
- synchronized (this) {
- wait();
+ synchronized (this) { // don't wait if we already have a result.
+ if ((err == null) && results.isEmpty()) {
+ wait();
+ }
}
} catch (InterruptedException ex) {
throw new ApiConnectionException(ex.getMessage(), ex);
|
Fixed possible race condition in short-lived synchrynous commands
|
diff --git a/bokeh/embed.py b/bokeh/embed.py
index <HASH>..<HASH> 100644
--- a/bokeh/embed.py
+++ b/bokeh/embed.py
@@ -386,7 +386,8 @@ def file_html(models,
resources,
title=None,
template=FILE,
- template_variables={}):
+ template_variables={},
+ theme=None):
''' Return an HTML document that embeds Bokeh Model or Document objects.
The data for the plot is stored directly in the returned HTML, with
@@ -412,7 +413,7 @@ def file_html(models,
'''
models = _check_models(models)
- with _ModelInDocument(models):
+ with _ModelInDocument(models, apply_theme=theme):
(docs_json, render_items) = _standalone_docs_json_and_render_items(models)
title = _title_from_models(models, title)
bundle = _bundle_for_objs_and_resources(models, resources)
|
Support themes in file_html embedding
Currently, themes are only applied when using `components` to embed plots
|
diff --git a/src/Illuminate/Foundation/Testing/TestResponse.php b/src/Illuminate/Foundation/Testing/TestResponse.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Foundation/Testing/TestResponse.php
+++ b/src/Illuminate/Foundation/Testing/TestResponse.php
@@ -3,7 +3,6 @@
namespace Illuminate\Foundation\Testing;
use Closure;
-use Illuminate\Support\Str;
use Illuminate\Http\Response;
use Illuminate\Contracts\View\View;
use PHPUnit_Framework_Assert as PHPUnit;
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/jmock2/src/org/jmock/Mockery.java b/jmock2/src/org/jmock/Mockery.java
index <HASH>..<HASH> 100644
--- a/jmock2/src/org/jmock/Mockery.java
+++ b/jmock2/src/org/jmock/Mockery.java
@@ -188,6 +188,9 @@ public class Mockery implements SelfDescribing {
*
* The builder is responsible for interpreting high-level, readable API calls to
* construct an expectation.
+ *
+ * This method can be called multiple times per test and the expectations defined in
+ * each block are combined as if they were defined in same order within a single block.
*/
public void checking(ExpectationBuilder expectations) {
expectations.buildExpectations(defaultAction, dispatcher);
|
Javadoc improvements (JMOCK-<I>)
|
diff --git a/c3d.py b/c3d.py
index <HASH>..<HASH> 100644
--- a/c3d.py
+++ b/c3d.py
@@ -866,7 +866,7 @@ class Reader(Manager):
gen_scale = param.float_value
self._handle.seek((self.header.data_block - 1) * 512)
- for frame_no in xrange(self.first_frame(), self.last_frame() + 1):
+ for frame_no in range(self.first_frame(), self.last_frame() + 1):
raw = np.fromfile(self._handle, dtype=point_dtype,
count=4 * self.header.point_count).reshape((ppf, 4))
@@ -1018,7 +1018,7 @@ class Writer(Manager):
dimensions=[len(point_units)], bytes=point_units)
point_group.add_param(
'LABELS', desc='labels', data_size=-1, dimensions=[5, ppf],
- bytes=''.join('M%03d ' % i for i in xrange(ppf)))
+ bytes=''.join('M%03d ' % i for i in range(ppf)))
point_group.add_param(
'DESCRIPTIONS', desc='descriptions', data_size=-1,
dimensions=[16, ppf], bytes=' ' * 16 * ppf)
|
Further py3k changes.
|
diff --git a/src/robotto.js b/src/robotto.js
index <HASH>..<HASH> 100644
--- a/src/robotto.js
+++ b/src/robotto.js
@@ -83,6 +83,7 @@ robotto.parse = function(robotsFile) {
};
robotto.check = function(userAgent, urlParam, rulesObj) {
+ delete rulesObj.comments;
let userAgents = Object.keys(rulesObj);
let desiredRoute = (url.parse(urlParam).pathname + '/').split('/')[1];
let allowed = true;
|
Deleting unuseful comments key before checking routes
|
diff --git a/src/Rocketeer/Services/Tasks/TasksBuilder.php b/src/Rocketeer/Services/Tasks/TasksBuilder.php
index <HASH>..<HASH> 100644
--- a/src/Rocketeer/Services/Tasks/TasksBuilder.php
+++ b/src/Rocketeer/Services/Tasks/TasksBuilder.php
@@ -339,8 +339,8 @@ class TasksBuilder
protected function isCallable($task)
{
// Check for container bindings
- if (is_array($task)) {
- return count($task) === 2 && $this->app->bound($task[0]);
+ if (is_array($task) ) {
+ return count($task) === 2 && $this->app->bound($task[0]) || is_callable($task);
}
return is_callable($task) && !$task instanceof Closure;
|
Fix slight bug in TasksBuilder
|
diff --git a/lib/accounting/bank.rb b/lib/accounting/bank.rb
index <HASH>..<HASH> 100644
--- a/lib/accounting/bank.rb
+++ b/lib/accounting/bank.rb
@@ -2,6 +2,6 @@ module Accounting
class Bank < ActiveRecord::Base
has_many :accounts
- belongs_to :vcard, :class_name => 'Vcards::Vcard'
+ has_vcards
end
end
|
Use has_vcards from vcards plugin.
|
diff --git a/src/ossos-pipeline/ossos/fitsviewer/displayable.py b/src/ossos-pipeline/ossos/fitsviewer/displayable.py
index <HASH>..<HASH> 100644
--- a/src/ossos-pipeline/ossos/fitsviewer/displayable.py
+++ b/src/ossos-pipeline/ossos/fitsviewer/displayable.py
@@ -280,6 +280,8 @@ class Marker(object):
def add_to_axes(self, axes):
axes.add_patch(self.circle)
+ self.vline.set_transform(axes.transData)
+ self.hline.set_transform(axes.transData)
axes.lines.extend([self.vline, self.hline])
def remove_from_axes(self):
|
Fixed coordinate offset for crosshair on source marker.
|
diff --git a/tasks/lib/compile/dependencies.js b/tasks/lib/compile/dependencies.js
index <HASH>..<HASH> 100644
--- a/tasks/lib/compile/dependencies.js
+++ b/tasks/lib/compile/dependencies.js
@@ -36,7 +36,6 @@ function parseClassExtend (content, absPath) {
hierarchy[parentName].children.push(childName);
- hierarchy[childName].parent = parentName;
hierarchy[childName].absPath = absPath;
return true;
|
{Update: dependencies.js} Remove unnecessary assignment of parent.
|
diff --git a/odl/space/npy_tensors.py b/odl/space/npy_tensors.py
index <HASH>..<HASH> 100644
--- a/odl/space/npy_tensors.py
+++ b/odl/space/npy_tensors.py
@@ -1856,7 +1856,10 @@ def _lincomb_impl(a, x1, b, x2, out):
_lincomb_impl(a + b, x1, 0, x1, out)
elif out is x1 and out is x2:
# All the vectors are aligned -> out = (a+b)*out
- scal(a + b, out_arr, size)
+ if (a + b) != 0:
+ scal(a + b, out_arr, size)
+ else:
+ out_arr[:] = 0
elif out is x1:
# out is aligned with x1 -> out = a*out + b*x2
if a != 1:
|
BUG: Fix bug with zero-assignment with nans, see #<I>
|
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index <HASH>..<HASH> 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -1532,7 +1532,7 @@ class Python3Parser(PythonParser):
# FIXME: Put more in this table
self.reduce_check_table = {
"except_handler_else": except_handler_else,
- "ifstmt": ifstmt,
+ # "ifstmt": ifstmt,
"ifstmtl": ifstmt,
"ifelsestmtc": ifstmt,
"ifelsestmt": ifelsestmt,
|
FIx bug that snuck in last commit.
|
diff --git a/src/numdifftools/multicomplex.py b/src/numdifftools/multicomplex.py
index <HASH>..<HASH> 100644
--- a/src/numdifftools/multicomplex.py
+++ b/src/numdifftools/multicomplex.py
@@ -50,7 +50,9 @@ def c_min(x, y):
def c_abs(z):
- return np.where(np.real(z) >= 0, z, -z)
+ if np.all(np.iscomplex(z)):
+ return np.where(np.real(z) >= 0, z, -z)
+ return np.abs(z)
class Bicomplex(object):
|
Fixed c_abs so it works with algopy on python <I>.
|
diff --git a/src/extensions/cytoscape.renderer.canvas.js b/src/extensions/cytoscape.renderer.canvas.js
index <HASH>..<HASH> 100644
--- a/src/extensions/cytoscape.renderer.canvas.js
+++ b/src/extensions/cytoscape.renderer.canvas.js
@@ -174,7 +174,7 @@
}
// no parent node: no node to add to the drag layer
- if (parent == node)
+ if (parent == node && inDragLayer)
{
return;
}
|
minor bug fix for touch events to remove compound nodes from the drag layer
|
diff --git a/aeron-client/src/main/java/io/aeron/logbuffer/TermBlockScanner.java b/aeron-client/src/main/java/io/aeron/logbuffer/TermBlockScanner.java
index <HASH>..<HASH> 100644
--- a/aeron-client/src/main/java/io/aeron/logbuffer/TermBlockScanner.java
+++ b/aeron-client/src/main/java/io/aeron/logbuffer/TermBlockScanner.java
@@ -60,7 +60,7 @@ public class TermBlockScanner
{
if (termOffset == offset)
{
- offset += align(frameLength, FRAME_ALIGNMENT);
+ offset += alignedFrameLength;
}
break;
|
[Java] Replace redundant alignment calculation in term block scanner.
|
diff --git a/resources/assets/js/helpers.js b/resources/assets/js/helpers.js
index <HASH>..<HASH> 100644
--- a/resources/assets/js/helpers.js
+++ b/resources/assets/js/helpers.js
@@ -526,7 +526,7 @@ $.extend(true, laravelValidation, {
* @returns {*|string}
*/
allElementValues: function (validator, element) {
- if (element.name.indexOf('[') !== -1 && element.name.indexOf(']') !== -1) {
+ if (element.name.indexOf('[]') !== -1) {
return validator.findByName(element.name).map(function (i, e) {
return validator.elementValue(e);
}).get();
|
fix: min / max array rules (#<I>)
|
diff --git a/web/concrete/single_pages/dashboard/composer/drafts.php b/web/concrete/single_pages/dashboard/composer/drafts.php
index <HASH>..<HASH> 100644
--- a/web/concrete/single_pages/dashboard/composer/drafts.php
+++ b/web/concrete/single_pages/dashboard/composer/drafts.php
@@ -21,9 +21,9 @@ if (count($drafts) > 0) { ?>
} ?></a></td>
<td><?=$dr->getCollectionTypeName()?></td>
<td><?
- $mask = 'F jS Y - g:i a';
+ $mask = DATE_APP_GENERIC_MDYT;
if ($today == $dr->getCollectionDateLastModified("Y-m-d")) {
- $mask = 'g:i a';
+ $mask = DATE_APP_GENERIC_T;
}
print $dr->getCollectionDateLastModified($mask)?></td>
<? } ?>
|
localization fixes to composer drafts
Former-commit-id: e<I>eb<I>b<I>a<I>c<I>fba<I>a4aa<I>e<I>bc
|
diff --git a/squad/core/admin.py b/squad/core/admin.py
index <HASH>..<HASH> 100644
--- a/squad/core/admin.py
+++ b/squad/core/admin.py
@@ -56,6 +56,7 @@ force_notify_project.short_description = "Force sending email notification for s
class ProjectAdmin(admin.ModelAdmin):
list_display = ['__str__', 'is_public', 'notification_strategy', 'moderate_notifications']
+ list_filter = ['group', 'is_public', 'notification_strategy', 'moderate_notifications']
inlines = [EnvironmentInline, TokenInline, SubscriptionInline, AdminSubscriptionInline]
actions = [force_notify_project]
|
core/admin: add several filters for the project listing
|
diff --git a/pydealer/pydealer.py b/pydealer/pydealer.py
index <HASH>..<HASH> 100644
--- a/pydealer/pydealer.py
+++ b/pydealer/pydealer.py
@@ -123,7 +123,7 @@ class Deck(object):
cards.append(card)
num -= 1
elif rebuild:
- self.build_deck()
+ self.build()
self.shuffle()
else:
break
|
changed line <I> from self.build_deck() to self.build()
|
diff --git a/test/property_test.rb b/test/property_test.rb
index <HASH>..<HASH> 100755
--- a/test/property_test.rb
+++ b/test/property_test.rb
@@ -27,6 +27,15 @@ class PropertyTest < Test::Unit::TestCase
assert_equal "VALUE", @iface["ReadOrWriteMe"]
end
+ # https://github.com/mvidner/ruby-dbus/pull/19
+ def test_service_select_timeout
+ @iface["ReadOrWriteMe"] = "VALUE"
+ assert_equal "VALUE", @iface["ReadOrWriteMe"]
+ # wait for the service to become idle
+ sleep 6
+ assert_equal "VALUE", @iface["ReadOrWriteMe"], "Property value changed; perhaps the service died and got restarted"
+ end
+
def test_property_nonwriting
e = assert_raises DBus::Error do
@iface["ReadMe"] = "WROTE"
|
A test case for a stupid bug when a service becomes idle.
which was fixed in 1c6b3d3bded<I>a<I>baec5a<I>e<I>a<I>b<I>
|
diff --git a/WazeRouteCalculator/WazeRouteCalculator.py b/WazeRouteCalculator/WazeRouteCalculator.py
index <HASH>..<HASH> 100644
--- a/WazeRouteCalculator/WazeRouteCalculator.py
+++ b/WazeRouteCalculator/WazeRouteCalculator.py
@@ -137,9 +137,7 @@ class WazeRouteCalculator(object):
if self.vehicle_type:
url_options["vehicleType"] = self.vehicle_type
# Handle vignette system in Europe
- if 'AVOID_TOLL_ROADS' in self.route_options:
- pass #don't want to do anything if we're avoiding toll roads
- else:
+ if 'AVOID_TOLL_ROADS' not in self.route_options:
url_options["subscription"] = "*"
response = requests.get(self.WAZE_URL + routing_server, params=url_options, headers=self.HEADERS)
|
Amended to use not in for AVOID_TOLL_ROADS
|
diff --git a/lib/bixby_agent/cli.rb b/lib/bixby_agent/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/bixby_agent/cli.rb
+++ b/lib/bixby_agent/cli.rb
@@ -60,7 +60,6 @@ EOF
option :directory,
:short => "-d DIRECTORY",
:long => "--directory DIRECTORY",
- :default => "/opt/bixby",
:description => "Root directory for Bixby (optional, default: /opt/bixby)"
option :port,
|
don't pass in default root_dir
|
diff --git a/src/reply.js b/src/reply.js
index <HASH>..<HASH> 100644
--- a/src/reply.js
+++ b/src/reply.js
@@ -13,6 +13,14 @@ export default class Reply {
return this._response.payload;
}
+ set error (value) {
+ this._response.error = value;
+ }
+
+ get error () {
+ return this._response.error;
+ }
+
/**
* Abort the current request and respond wih the passed value
*/
|
Give access to error payload in reply interface
|
diff --git a/controller/grpc/controller.go b/controller/grpc/controller.go
index <HASH>..<HASH> 100644
--- a/controller/grpc/controller.go
+++ b/controller/grpc/controller.go
@@ -186,7 +186,7 @@ const ctxKeyFlynnAuthKeyID = "flynn-auth-key-id"
func (c *Config) Authorize(ctx context.Context) (context.Context, error) {
if md, ok := metadata.FromIncomingContext(ctx); ok {
- if passwords, ok := md["Auth-Key"]; ok && len(passwords) > 0 {
+ if passwords, ok := md["auth-key"]; ok && len(passwords) > 0 {
auth, err := c.authorizer.Authorize(passwords[0])
if err != nil {
return ctx, grpc.Errorf(codes.Unauthenticated, err.Error())
@@ -201,6 +201,8 @@ func (c *Config) Authorize(ctx context.Context) (context.Context, error) {
}
ctx = ctxhelper.NewContextLogger(ctx, logger.New("authKeyID", auth.ID))
}
+
+ return ctx, nil
}
return ctx, grpc.Errorf(codes.Unauthenticated, "no Auth-Key provided")
|
controller/grpc: Fix Auth
|
diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index <HASH>..<HASH> 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -6,15 +6,4 @@ use App\Controller\AppController as BaseController;
class AppController extends BaseController
{
-
- /**
- * Initialization hook method.
- *
- * @return void
- */
- public function initialize()
- {
- parent::initialize();
- $this->viewBuilder()->layout('QoboAdminPanel.basic');
- }
}
|
Removed forced layout (task #<I>)
|
diff --git a/src/Extensions/WorkflowEmbargoExpiryExtension.php b/src/Extensions/WorkflowEmbargoExpiryExtension.php
index <HASH>..<HASH> 100644
--- a/src/Extensions/WorkflowEmbargoExpiryExtension.php
+++ b/src/Extensions/WorkflowEmbargoExpiryExtension.php
@@ -58,7 +58,10 @@ class WorkflowEmbargoExpiryExtension extends DataExtension
'AllowEmbargoedEditing' => true
);
- // This "config" option, might better be handled in _config
+ /**
+ * @deprecated 5.2.0:6.0.0 This setting does nothing and will be removed in in 6.0
+ * @var bool
+ */
public static $showTimePicker = true;
/**
|
API Deprecate $showTimePicker. It is not used any longer and will be removed in 6.
|
diff --git a/cert_issuer/blockchain_handlers/ethereum/connectors.py b/cert_issuer/blockchain_handlers/ethereum/connectors.py
index <HASH>..<HASH> 100644
--- a/cert_issuer/blockchain_handlers/ethereum/connectors.py
+++ b/cert_issuer/blockchain_handlers/ethereum/connectors.py
@@ -201,7 +201,7 @@ class MyEtherWalletBroadcaster(object):
data = {
"jsonrpc": "2.0",
"method": "eth_getTransactionCount",
- "params": [address, "latest"],
+ "params": [address, "pending"],
"id": 1
}
response = requests.post(self.base_url, json=data)
|
#<I> - Changing over to pending for get_balance as well.
|
diff --git a/great_expectations/data_context/types/resource_identifiers.py b/great_expectations/data_context/types/resource_identifiers.py
index <HASH>..<HASH> 100644
--- a/great_expectations/data_context/types/resource_identifiers.py
+++ b/great_expectations/data_context/types/resource_identifiers.py
@@ -108,13 +108,13 @@ class ValidationResultIdentifier(DataContextKey):
return tuple(
list(self.expectation_suite_identifier.to_tuple()) + [
self.run_id or "__none__",
- self.batch_identifier
+ self.batch_identifier or "__none__"
]
)
def to_fixed_length_tuple(self):
return self.expectation_suite_identifier.expectation_suite_name, self.run_id or "__none__", \
- self.batch_identifier
+ self.batch_identifier or "__none__"
@classmethod
def from_tuple(cls, tuple_):
|
If batch_id is None, set to “__none__” in tuple
|
diff --git a/pushy/src/test/java/com/turo/pushy/apns/server/MockApnsServerTest.java b/pushy/src/test/java/com/turo/pushy/apns/server/MockApnsServerTest.java
index <HASH>..<HASH> 100644
--- a/pushy/src/test/java/com/turo/pushy/apns/server/MockApnsServerTest.java
+++ b/pushy/src/test/java/com/turo/pushy/apns/server/MockApnsServerTest.java
@@ -36,6 +36,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
public class MockApnsServerTest extends AbstractClientServerTest {
@@ -129,6 +130,16 @@ public class MockApnsServerTest extends AbstractClientServerTest {
@Test
public void testRestartWithProvidedEventLoopGroup() throws Exception {
+ int javaVersion = 0;
+
+ try {
+ javaVersion = Integer.parseInt(System.getProperty("java.specification.version"));
+ } catch (final NumberFormatException ignored) {
+ }
+
+ // TODO Remove this assumption when https://github.com/netty/netty/issues/8697 gets resolved
+ assumeTrue(javaVersion < 11);
+
final NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup(1);
try {
|
Temporarily ignore a test under Java <I> until an upstream issue is resolved.
|
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index <HASH>..<HASH> 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -1279,6 +1279,7 @@ export function popSavedQuery(saveQueryId) {
.then(({ json }) => {
const queryEditorProps = {
...convertQueryToClient(json.result),
+ loaded: true,
autorun: false,
};
return dispatch(addQueryEditor(queryEditorProps));
|
fix(sql lab): when editing a saved query, the status is lost when switching tabs (#<I>)
|
diff --git a/lib/irt/commands/help.rb b/lib/irt/commands/help.rb
index <HASH>..<HASH> 100644
--- a/lib/irt/commands/help.rb
+++ b/lib/irt/commands/help.rb
@@ -117,8 +117,8 @@ module IRT
the evaluated yaml file
e.g.: {:a => 2}.vi #=> {:an_edited => 'value'}
Method#location When possible, it returns file and line where the
- method is defined. It is uitable to be passed to the
- in place editing commands.
+ method is defined. It is suitable to be passed to
+ the in place editing commands.
Method#info Returns useful info about the method. It is suitable
to be passed to the in place editing commands.
)
|
little irt_help fix
|
diff --git a/lib/ticket_evolution/core/endpoint/request_handler.rb b/lib/ticket_evolution/core/endpoint/request_handler.rb
index <HASH>..<HASH> 100644
--- a/lib/ticket_evolution/core/endpoint/request_handler.rb
+++ b/lib/ticket_evolution/core/endpoint/request_handler.rb
@@ -19,7 +19,8 @@ module TicketEvolution
def request(method, path, params = nil)
request = self.build_request(method, path, params)
- response = self.naturalize_response(request.http(method))
+ request.http(method)
+ response = self.naturalize_response(request)
if response.response_code >= 400
TicketEvolution::ApiError.new(response)
else
diff --git a/lib/ticket_evolution/modules/show.rb b/lib/ticket_evolution/modules/show.rb
index <HASH>..<HASH> 100644
--- a/lib/ticket_evolution/modules/show.rb
+++ b/lib/ticket_evolution/modules/show.rb
@@ -6,13 +6,13 @@ module TicketEvolution
end
def build_for_show(response)
+ remove_instance_variable(:@responsible)
"TicketEvolution::#{self.class.to_s.split('::').last.singularize.camelize}".constantize.new(
response.body.merge({
:status_code => response.response_code,
:server_message => response.server_message
})
)
- remove_instance_variable(:@responsible)
end
end
end
|
fixed two small return / reordering
|
diff --git a/test/worker.py b/test/worker.py
index <HASH>..<HASH> 100755
--- a/test/worker.py
+++ b/test/worker.py
@@ -496,9 +496,9 @@ class TestBaseSplitCloneResiliency(TestBaseSplitClone):
# for each destination shard ("finding targets" state).
utils.poll_for_vars(
'vtworker', worker_port,
- 'WorkerState == cloning the data (offline)',
+ 'WorkerState == cloning the data (online)',
condition_fn=lambda v: v.get('WorkerState') == 'cloning the'
- ' data (offline)')
+ ' data (online)')
logging.debug('Worker is in copy state, starting reparent now')
utils.run_vtctl(
|
test: worker.py: Wait for online instead of the offline phase to run the reparent.
|
diff --git a/libs/playback/config.py b/libs/playback/config.py
index <HASH>..<HASH> 100644
--- a/libs/playback/config.py
+++ b/libs/playback/config.py
@@ -45,3 +45,19 @@ class Config(object):
:return: Dictionary vars
"""
return self.conf
+
+ def gen_conf(self):
+ """
+ Initial a configuration for the first time
+ :return:
+ """
+ pass
+ # TODO gen_conf
+
+ def set_conf(self):
+ """
+ Setting the value to the dict
+ :return:
+ """
+ pass
+ # TODO set_conf
\ No newline at end of file
|
Generate and setting configuration for Config
|
diff --git a/Classes/Console/Command/DatabaseCommandController.php b/Classes/Console/Command/DatabaseCommandController.php
index <HASH>..<HASH> 100644
--- a/Classes/Console/Command/DatabaseCommandController.php
+++ b/Classes/Console/Command/DatabaseCommandController.php
@@ -172,6 +172,10 @@ class DatabaseCommandController extends CommandController
'--single-transaction',
];
+ if ($this->output->getSymfonyConsoleOutput()->isVerbose()) {
+ $additionalArguments[] = '--verbose';
+ }
+
foreach ($excludeTables as $table) {
$additionalArguments[] = sprintf('--ignore-table=%s.%s', $dbConfig['dbname'], $table);
}
|
[FEATURE] Add verbose option to database:export (#<I>)
`database:export -v` now makes `mysqldump` verbose too.
`mysqldump` outputs its information using stderr so piping the dump via stdout
into a file or `database:import` continues to work.
|
diff --git a/packages/form/src/Form.js b/packages/form/src/Form.js
index <HASH>..<HASH> 100644
--- a/packages/form/src/Form.js
+++ b/packages/form/src/Form.js
@@ -25,9 +25,9 @@ const Form = ({
validationSchema={validationSchema}
validate={validate}
>
- <RsForm data-testid="form-container" tag={FForm} {...rest}>
- {children}
- </RsForm>
+ {props => <RsForm data-testid="form-container" tag={FForm} {...rest}>
+ {typeof children === 'function' ? children(props) : children}
+ </RsForm>}
</Formik>
);
|
bug(form): formik children props
Enables the usage of Formik children props when using Function as Child Components
|
diff --git a/CollectionTest.php b/CollectionTest.php
index <HASH>..<HASH> 100644
--- a/CollectionTest.php
+++ b/CollectionTest.php
@@ -212,7 +212,7 @@ class CollectionTest extends \Doctrine\Tests\DoctrineTestCase
{
$this->fillMatchingFixture();
- $col = $this->_coll->matching(new Criteria($this->_coll->expr()->eq("foo", "bar")));
+ $col = $this->_coll->matching(new Criteria(Criteria::expr()->eq("foo", "bar")));
$this->assertInstanceOf('Doctrine\Common\Collections\Collection', $col);
$this->assertNotSame($col, $this->_coll);
$this->assertEquals(1, count($col));
diff --git a/CriteriaTest.php b/CriteriaTest.php
index <HASH>..<HASH> 100644
--- a/CriteriaTest.php
+++ b/CriteriaTest.php
@@ -74,4 +74,9 @@ class CriteriaTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(array("foo" => "ASC"), $criteria->getOrderings());
}
+
+ public function testExpr()
+ {
+ $this->assertInstanceOf('Doctrine\Common\Collections\ExpressionBuilder', Criteria::expr());
+ }
}
|
Move Selectable#expr() to static Criteria#expr() for creation of an ExpressionBuilder, it makes much more sense that way.
|
diff --git a/web/metrics.go b/web/metrics.go
index <HASH>..<HASH> 100644
--- a/web/metrics.go
+++ b/web/metrics.go
@@ -78,7 +78,7 @@ var (
"Severity": 1,
"Resolution": "Increase swap or memory",
"Explanation": "Ran out of all available memory space",
- "EventClass": "/Memory",
+ "EventClass": "/Perf/Memory",
},
},
},
|
fixed type in metrics. missing /Perf
|
diff --git a/lib/vagrant-vbguest/installer.rb b/lib/vagrant-vbguest/installer.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant-vbguest/installer.rb
+++ b/lib/vagrant-vbguest/installer.rb
@@ -43,20 +43,12 @@ module VagrantVbguest
@vm.channel.upload(i_script, installer_destination)
@vm.channel.sudo("sh #{installer_destination}") do |type, data|
- # Print the data directly to STDOUT, not doing any newlines
- # or any extra formatting of our own
- $stdout.print(data) if type != :exit_status
+ @vm.ui.info(data, :prefix => false, :new_line => false)
end
@vm.channel.execute("rm #{installer_destination} #{iso_destination}") do |type, data|
- # Print the data directly to STDOUT, not doing any newlines
- # or any extra formatting of our own
- $stdout.print(data) if type != :exit_status
+ @vm.ui.error(data.chomp, :prefix => false)
end
-
- # Puts out an ending newline just to make sure we end on a new
- # line.
- $stdout.puts
end
end
end
|
Replace the use of $stdout for printing
Formatting and newlines can be suppressed with arguments. Any output from
the rm command is going to be an error.
|
diff --git a/controllers/Categories.php b/controllers/Categories.php
index <HASH>..<HASH> 100644
--- a/controllers/Categories.php
+++ b/controllers/Categories.php
@@ -9,9 +9,9 @@ use RainLab\Blog\Models\Category;
class Categories extends Controller
{
public $implement = [
- 'Backend.Behaviors.FormController',
- 'Backend.Behaviors.ListController',
- 'Backend.Behaviors.ReorderController'
+ \Backend\Behaviors\FormController::class,
+ \Backend\Behaviors\ListController::class,
+ \Backend\Behaviors\ReorderController::class
];
public $formConfig = 'config_form.yaml';
diff --git a/controllers/Posts.php b/controllers/Posts.php
index <HASH>..<HASH> 100644
--- a/controllers/Posts.php
+++ b/controllers/Posts.php
@@ -9,9 +9,9 @@ use RainLab\Blog\Models\Post;
class Posts extends Controller
{
public $implement = [
- 'Backend.Behaviors.FormController',
- 'Backend.Behaviors.ListController',
- 'Backend.Behaviors.ImportExportController'
+ \Backend\Behaviors\FormController::class,
+ \Backend\Behaviors\ListController::class,
+ \Backend\Behaviors\ImportExportController::class
];
public $formConfig = 'config_form.yaml';
|
Use class definitions for implemented behaviours (#<I>)
|
diff --git a/lib/webmock/http_lib_adapters/httpclient_adapter.rb b/lib/webmock/http_lib_adapters/httpclient_adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/webmock/http_lib_adapters/httpclient_adapter.rb
+++ b/lib/webmock/http_lib_adapters/httpclient_adapter.rb
@@ -103,7 +103,7 @@ if defined?(::HTTPClient)
raise HTTPClient::TimeoutError if webmock_response.should_timeout
webmock_response.raise_error_if_any
- block.call(nil, body) if block
+ block.call(response, body) if block
response
end
diff --git a/spec/acceptance/httpclient/httpclient_spec.rb b/spec/acceptance/httpclient/httpclient_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/acceptance/httpclient/httpclient_spec.rb
+++ b/spec/acceptance/httpclient/httpclient_spec.rb
@@ -37,6 +37,15 @@ describe "HTTPClient" do
include_examples "with WebMock"
end
+ it "should work with get_content" do
+ stub_request(:get, 'www.example.com').to_return(:status => 200, :body => 'test', :headers => {})
+ str = ''
+ HTTPClient.get_content('www.example.com') do |content|
+ str << content
+ end
+ str.should == 'test'
+ end
+
context "Filters" do
class Filter
def filter_request(request)
|
Fix failure with HTTPClient.get_content
|
diff --git a/switchbot/devices/device.py b/switchbot/devices/device.py
index <HASH>..<HASH> 100644
--- a/switchbot/devices/device.py
+++ b/switchbot/devices/device.py
@@ -4,17 +4,17 @@ from __future__ import annotations
import asyncio
import binascii
import logging
-from ctypes import cast
-from typing import Any, Callable, TypeVar
+from typing import Any
from uuid import UUID
import async_timeout
-import bleak
+
from bleak import BleakError
from bleak.backends.device import BLEDevice
from bleak.backends.service import BleakGATTCharacteristic, BleakGATTServiceCollection
from bleak_retry_connector import (
BleakClientWithServiceCache,
+ BleakNotFoundError,
ble_device_has_changed,
establish_connection,
)
@@ -106,10 +106,17 @@ class SwitchbotDevice:
for attempt in range(max_attempts):
try:
return await self._send_command_locked(key, command)
+ except BleakNotFoundError:
+ _LOGGER.error(
+ "%s: device not found or no longer in range; Try restarting Bluetooth",
+ self.name,
+ exc_info=True,
+ )
+ return b"\x00"
except BLEAK_EXCEPTIONS:
if attempt == retry:
_LOGGER.error(
- "%s: communication failed. Stopping trying",
+ "%s: communication failed; Stopping trying",
self.name,
exc_info=True,
)
|
Improve error message when device has disappeared (#<I>)
|
diff --git a/graphlite/transaction.py b/graphlite/transaction.py
index <HASH>..<HASH> 100644
--- a/graphlite/transaction.py
+++ b/graphlite/transaction.py
@@ -101,14 +101,6 @@ class Transaction(object):
dst=edge.dst,
))
- def clear(self):
- """
- Clear the internal record of changes by
- deleting the elements of the list to
- free memory.
- """
- del self.ops[:]
-
def commit(self):
"""
Commits the stored changes to the database.
@@ -120,7 +112,6 @@ class Transaction(object):
if self.defined:
with self.lock:
self.perform_ops()
- self.clear()
def __enter__(self):
"""
diff --git a/tests/test_query.py b/tests/test_query.py
index <HASH>..<HASH> 100644
--- a/tests/test_query.py
+++ b/tests/test_query.py
@@ -45,6 +45,7 @@ def test_to(graph):
def test_edge():
+ assert not V(1).knows(2) == 3
assert V(1).knows(2) == V(1).knows(2)
assert V(1).knows(3) != V(1).knows(2)
|
removed Transaction.clear and improve coverage
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -14,9 +14,9 @@ class Manifest extends TreeWalker {
});
Defaults.defineOptions(this, options);
- }
- files = {}
+ this.files = {};
+ }
create(filePath) {
const extension = path.extname(filePath).slice(1);
|
fix(class field support): adding support for node <I>
node <I> doesn't support class fields. Class filds are not intruduced until node <I>
|
diff --git a/lib/grit.rb b/lib/grit.rb
index <HASH>..<HASH> 100644
--- a/lib/grit.rb
+++ b/lib/grit.rb
@@ -20,8 +20,12 @@ end
# third party
require 'rubygems'
-gem "mime-types", ">=0"
-require 'mime/types'
+begin
+ gem "mime-types", ">=0"
+ require 'mime/types'
+rescue Gem::LoadError => e
+ puts "WARNING: Gem LoadError: #{e.message}"
+end
# ruby 1.9 compatibility
require 'grit/ruby1.9'
|
do not fail for stupidity of mime-types in rubygems <= <I>
|
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/generator/InvoiceWithMetadata.java b/invoice/src/main/java/org/killbill/billing/invoice/generator/InvoiceWithMetadata.java
index <HASH>..<HASH> 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/generator/InvoiceWithMetadata.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/generator/InvoiceWithMetadata.java
@@ -95,7 +95,8 @@ public class InvoiceWithMetadata {
@Override
public boolean apply(final InvoiceItem invoiceItem) {
return invoiceItem.getInvoiceItemType() != InvoiceItemType.USAGE ||
- invoiceItem.getAmount().compareTo(BigDecimal.ZERO) != 0;
+ invoiceItem.getAmount().compareTo(BigDecimal.ZERO) != 0 ||
+ (invoiceItem.getQuantity() != null && invoiceItem.getQuantity() > 0);
}
});
final ImmutableList<InvoiceItem> filteredItems = ImmutableList.copyOf(resultingItems);
|
invoice: Refine new InvoiceConfig#isUsageZeroAmountDisabled to also check on quantity being zero
|
diff --git a/packages/Navbar/src/index.js b/packages/Navbar/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/Navbar/src/index.js
+++ b/packages/Navbar/src/index.js
@@ -6,7 +6,8 @@ export class Navbar extends Component {
previousY = 0
previousX = 0
state = {
- maxHeight: 64
+ maxHeight: 64,
+ height: 56
}
componentDidMount() {
@@ -48,7 +49,7 @@ export class Navbar extends Component {
reveal
} = this.props
- const { maxHeight } = this.state
+ const { maxHeight, height } = this.state
const styles = {
boxShadow: `
@@ -57,7 +58,7 @@ export class Navbar extends Component {
0px 1px 10px 0px rgba(0, 0, 0, 0.12)
`,
transition: 'max-height 150ms cubic-bezier(0.4, 0.0, 0.2, 1)',
- height: 64,
+ height: height,
maxHeight: maxHeight,
overflow: 'hidden',
display: 'flex',
@@ -73,6 +74,11 @@ export class Navbar extends Component {
}
render({ children }) {
+ if (window.matchMedia("(max-width: 960px)").matches)
+ this.setState({ height: 56 })
+ else
+ this.setState({ height: 64 })
+
const styles = this.getStyles()
return <div style={styles}>{children}</div>
|
:sparkles: Added responsiveness to the navbar
|
diff --git a/build/generateExterns.js b/build/generateExterns.js
index <HASH>..<HASH> 100755
--- a/build/generateExterns.js
+++ b/build/generateExterns.js
@@ -846,8 +846,12 @@ function main(args) {
// Get externs.
const externs = sorted.map((x) => x.externs).join('');
+ // Get license header.
+ const licenseHeader = fs.readFileSync(__dirname + '/license-header', 'utf-8');
+
// Output generated externs, with an appropriate header.
fs.writeFileSync(outputPath,
+ licenseHeader +
'/**\n' +
' * @fileoverview Generated externs. DO NOT EDIT!\n' +
' * @externs\n' +
|
fix: Add license header to generated externs
To comply with internal regulations, even our generated externs should
have a license header. This prepends the header to all generated
externs.
Closes #<I>
Change-Id: Idef8e7bff<I>aefa<I>a8f<I>e<I>fa
|
diff --git a/lib/rodal.js b/lib/rodal.js
index <HASH>..<HASH> 100644
--- a/lib/rodal.js
+++ b/lib/rodal.js
@@ -52,8 +52,8 @@ var Dialog = function Dialog(props) {
return _react2.default.createElement(
'div',
{ style: mergedStyles, className: className },
- CloseButton,
- props.children
+ props.children,
+ CloseButton
);
};
|
Fixing a Display Issue
Adjusted the display priority to ensure the close button not be covered by its children.
|
diff --git a/salt/states/git.py b/salt/states/git.py
index <HASH>..<HASH> 100644
--- a/salt/states/git.py
+++ b/salt/states/git.py
@@ -374,10 +374,16 @@ def latest(name,
remote = remote_name
if not remote:
- return _fail(ret, '\'remote\' option is required')
+ return _fail(ret, '\'remote\' argument is required')
if not target:
- return _fail(ret, '\'target\' option is required')
+ return _fail(ret, '\'target\' argument is required')
+
+ if not rev:
+ return _fail(
+ ret,
+ '\'{0}\' is not a valid value for the \'rev\' argument'.format(rev)
+ )
# Ensure that certain arguments are strings to ensure that comparisons work
if not isinstance(rev, six.string_types):
|
Don't permit rev to be None or any other False value
|
diff --git a/packages/react-select/src/Select.js b/packages/react-select/src/Select.js
index <HASH>..<HASH> 100644
--- a/packages/react-select/src/Select.js
+++ b/packages/react-select/src/Select.js
@@ -1798,8 +1798,8 @@ export default class Select extends Component<Props, State> {
if (!this.state.isFocused) return null;
return (
<A11yText aria-live="polite">
- <p id="aria-selection-event"> {this.state.ariaLiveSelection}</p>
- <p id="aria-context"> {this.constructAriaLiveMessage()}</p>
+ <span id="aria-selection-event"> {this.state.ariaLiveSelection}</span>
+ <span id="aria-context"> {this.constructAriaLiveMessage()}</span>
</A11yText>
);
}
|
Fix aria renderLiveRegion A<I>yText DOM structure
W3C was breaking because of A<I>yText span wrapping p elements.
|
diff --git a/contrib/plots/quantile-generator.py b/contrib/plots/quantile-generator.py
index <HASH>..<HASH> 100755
--- a/contrib/plots/quantile-generator.py
+++ b/contrib/plots/quantile-generator.py
@@ -62,7 +62,8 @@ def main(args=None):
parser.add_argument("result",
metavar="RESULT",
type=str,
- help="XML file with result produced by benchexec"
+ nargs="+",
+ help="XML files with result produced by benchexec"
)
parser.add_argument("--correct-only",
action="store_true", dest="correct_only",
@@ -77,7 +78,9 @@ def main(args=None):
# load results
run_set_result = tablegenerator.RunSetResult.create_from_xml(
- options.result, tablegenerator.parse_results_file(options.result))
+ options.result[0], tablegenerator.parse_results_file(options.result[0]))
+ for results_file in options.result[1:]:
+ run_set_result.append(results_file, tablegenerator.parse_results_file(results_file))
run_set_result.collect_data(options.correct_only or options.scored_based)
# select appropriate results
|
Make quantile-generator accept multiple result files as input.
|
diff --git a/lib/models/room-state.js b/lib/models/room-state.js
index <HASH>..<HASH> 100644
--- a/lib/models/room-state.js
+++ b/lib/models/room-state.js
@@ -244,7 +244,6 @@ RoomState.prototype.maySendStateEvent = function(stateEventType, userId) {
var default_user_level = 0;
var user_levels = [];
- var current_user_level = 0;
var state_default = 0;
if (power_levels_event) {
@@ -253,9 +252,6 @@ RoomState.prototype.maySendStateEvent = function(stateEventType, userId) {
default_user_level = parseInt(power_levels.users_default || 0);
user_levels = power_levels.users || {};
- current_user_level = user_levels[userId];
-
- if (current_user_level === undefined) { current_user_level = default_user_level; }
if (power_levels.state_default !== undefined) {
state_default = power_levels.state_default;
@@ -268,7 +264,7 @@ RoomState.prototype.maySendStateEvent = function(stateEventType, userId) {
if (events_levels[stateEventType] !== undefined) {
state_event_level = events_levels[stateEventType];
}
- return current_user_level >= state_event_level;
+ return member.powerLevel >= state_event_level;
};
/**
|
Use member.powerLevel instead of duplicating the user power level calculation.
|
diff --git a/src/Webiny/Component/Entity/Attribute/One2ManyAttribute.php b/src/Webiny/Component/Entity/Attribute/One2ManyAttribute.php
index <HASH>..<HASH> 100755
--- a/src/Webiny/Component/Entity/Attribute/One2ManyAttribute.php
+++ b/src/Webiny/Component/Entity/Attribute/One2ManyAttribute.php
@@ -230,7 +230,7 @@ class One2ManyAttribute extends AbstractCollectionAttribute
$attrValues = $this->getValue();
foreach ($attrValues as $r) {
- if (!in_array($r->id, $newValues)) {
+ if (!in_array($r->id, $newIds)) {
$r->delete();
}
}
|
- fix on cleanUpRecord method
|
diff --git a/server/socket.js b/server/socket.js
index <HASH>..<HASH> 100644
--- a/server/socket.js
+++ b/server/socket.js
@@ -75,10 +75,6 @@ module.exports = function (server) {
io.sockets.emit('verifying', infoHash, stats());
- torrent.once('verifying', function () {
- io.sockets.emit('verifying', infoHash, stats());
- });
-
torrent.once('ready', function () {
io.sockets.emit('ready', infoHash, stats());
});
|
don't broadcast `verifying` event
|
diff --git a/src/GW2Api.php b/src/GW2Api.php
index <HASH>..<HASH> 100644
--- a/src/GW2Api.php
+++ b/src/GW2Api.php
@@ -60,7 +60,7 @@ class GW2Api {
$handler->push(EffectiveUrlMiddleware::middleware());
return [
- 'base_url' => $this->apiUrl,
+ 'base_uri' => $this->apiUrl,
'defaults' => [
'verify' => $this->getCacertFilePath()
],
|
fix base_uri
guzzle 6 changed the name of this option
|
diff --git a/lib/twitter-ads/version.rb b/lib/twitter-ads/version.rb
index <HASH>..<HASH> 100644
--- a/lib/twitter-ads/version.rb
+++ b/lib/twitter-ads/version.rb
@@ -1,5 +1,5 @@
# Copyright (C) 2015 Twitter, Inc.
module TwitterAds
- VERSION = '0.1.0'
+ VERSION = '0.1.1'
end
|
[release] bumping to <I>
|
diff --git a/kernel/setup/session.php b/kernel/setup/session.php
index <HASH>..<HASH> 100644
--- a/kernel/setup/session.php
+++ b/kernel/setup/session.php
@@ -329,7 +329,7 @@ $param['expiration_filter'] = $expirationFilterType;
$param['user_id'] = $userID;
if ( isset( $viewParameters['sortby'] ) )
$param['sortby'] = $viewParameters['sortby'];
-$sessionsActive = eZSession::countActive( $param );
+$sessionsActive = eZSession::countActive();
$sessionsCount = eZFetchActiveSessionCount( $param );
$sessionsList = eZFetchActiveSessions( $param );
|
eZSession::countActive() uses no arg, but a call give 1 arg => this arg is useless
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -28,8 +28,7 @@ setup(
author_email='jax-dev@google.com',
packages=find_packages(exclude=["examples"]),
install_requires=[
- 'numpy>=1.12', 'six', 'protobuf>=3.6.0', 'absl-py', 'opt_einsum',
- 'fastcache'
+ 'numpy>=1.12', 'six', 'absl-py', 'opt_einsum', 'fastcache'
],
url='https://github.com/google/jax',
license='Apache-2.0',
|
Drop protobuf dependency from `jax` package. It appears unused. (#<I>)
|
diff --git a/src/main/java/org/eobjects/analyzer/connection/JdbcDatastore.java b/src/main/java/org/eobjects/analyzer/connection/JdbcDatastore.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/eobjects/analyzer/connection/JdbcDatastore.java
+++ b/src/main/java/org/eobjects/analyzer/connection/JdbcDatastore.java
@@ -171,4 +171,19 @@ public final class JdbcDatastore extends UsageAwareDatastore {
}
}
}
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("JdbcDatastore[name=");
+ sb.append(_name);
+ if (_jdbcUrl != null) {
+ sb.append(",url=");
+ sb.append(_jdbcUrl);
+ } else {
+ sb.append(",jndi=");
+ sb.append(_datasourceJndiUrl);
+ }
+ return sb.toString();
+ }
}
|
Added convenient toString() method for JdbcDatastore
|
diff --git a/example/geopage/models.py b/example/geopage/models.py
index <HASH>..<HASH> 100644
--- a/example/geopage/models.py
+++ b/example/geopage/models.py
@@ -75,3 +75,12 @@ class GeoStreamPage(Page):
def get_context(self, request):
data = super(GeoStreamPage, self).get_context(request)
return data
+
+
+class ClassicGeoPage(Page):
+ address = models.CharField(max_length=250, blank=True, null=True)
+ location = models.CharField(max_length=250, blank=True, null=True)
+
+ content_panels = Page.content_panels + [
+ GeoPanel('location', address_field='address'),
+ ]
|
Added regular text field example with geppanel
|
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -1,4 +1,5 @@
require 'set'
+require 'active_support/json'
module ActionView
module Helpers
diff --git a/actionpack/lib/action_view/helpers/scriptaculous_helper.rb b/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
+++ b/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
@@ -1,4 +1,5 @@
require 'action_view/helpers/javascript_helper'
+require 'active_support/json'
module ActionView
module Helpers
|
prototype and scripty helpers require json
|
diff --git a/sprd/model/BasketItem.js b/sprd/model/BasketItem.js
index <HASH>..<HASH> 100644
--- a/sprd/model/BasketItem.js
+++ b/sprd/model/BasketItem.js
@@ -34,14 +34,18 @@ define(["sprd/data/SprdModel", "sprd/entity/ConcreteElement", "sprd/entity/Price
if (this.$.priceItem) {
return this.$.priceItem.$.vatIncluded;
}
- return this.get('element.item.price().vatIncluded') || 0;
+
+ return (this.get('element.item.price().vatIncluded') || 0) +
+ (this.get('element.article.commission.vatIncluded') || 0);
},
vatExcluded: function () {
if (this.$.priceItem) {
return this.$.priceItem.$.vatExcluded;
}
- return this.get('element.item.price().vatExcluded') || 0;
+
+ return (this.get('element.item.price().vatExcluded') || 0) + +
+ (this.get('element.article.commission.vatExcluded') || 0);
},
discountPriceVatIncluded: function(){
|
include article commission in basket, if an article was references for the basketItem
|
diff --git a/lib/util.js b/lib/util.js
index <HASH>..<HASH> 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -742,20 +742,6 @@ var Util = function (settings) {
this.authenticate = this.Authenticate;
/*
- RetrieveMultiple public and private methods
- */
- this.RetrieveMultiple = function (options, cb) {
- this.executePost(options, "RetrieveMultiple", apiRetrieveMultipleMessage, serializer.toXmlRetrieveMultiple(options), cb);
- };
-
- /*
- Retrieve public and private methods
- */
- this.Retrieve = function (options, cb) {
- this.executePost(options, "Retrieve", apiRetrieveMessage, serializer.toXmlRetrieve(options), cb);
- };
-
- /*
Create public and private methods
*/
this.Create = function (options, cb) {
|
Removing obsolete implementations of Retrieve and RetrieveMultiple
|
diff --git a/graylog_hook.go b/graylog_hook.go
index <HASH>..<HASH> 100644
--- a/graylog_hook.go
+++ b/graylog_hook.go
@@ -117,7 +117,7 @@ func (hook *GraylogHook) sendEntry(entry graylogEntry) {
Host: host,
Short: string(short),
Full: string(full),
- TimeUnix: time.Now().UnixNano(),
+ TimeUnix: time.Now().UnixNano() / 1000000000.,
Level: level,
Facility: hook.Facility,
File: entry.file,
|
Graylog actually expects seconds, not nanosec
|
diff --git a/packages/testing/testing-utils/test-utils.js b/packages/testing/testing-utils/test-utils.js
index <HASH>..<HASH> 100755
--- a/packages/testing/testing-utils/test-utils.js
+++ b/packages/testing/testing-utils/test-utils.js
@@ -168,6 +168,7 @@ function getPkgsChanged({ from = 'HEAD', base = 'master' } = {}) {
'generator-bolt',
'@bolt/drupal-twig-extensions',
'@bolt/uikit-workshop',
+ '@bolt/bolt-starter',
];
// will contain package names and keep them unique
|
fix: ignore Drupal Lab package.json from getting picked up by testing utils
|
diff --git a/src/rez/__init__.py b/src/rez/__init__.py
index <HASH>..<HASH> 100644
--- a/src/rez/__init__.py
+++ b/src/rez/__init__.py
@@ -2,7 +2,7 @@ import logging.config
import os
-__version__ = "2.0.ALPHA.129"
+__version__ = "2.0.ALPHA.130"
__author__ = "Allan Johns"
__license__ = "LGPL"
diff --git a/src/rez/rex.py b/src/rez/rex.py
index <HASH>..<HASH> 100644
--- a/src/rez/rex.py
+++ b/src/rez/rex.py
@@ -553,11 +553,10 @@ class Python(ActionInterpreter):
if self.manager:
self.target_environ.update(self.manager.environ)
- if not hasattr(args, '__iter__'):
- import shlex
- args = shlex.split(args)
-
- return subprocess.Popen(args, env=self.target_environ,
+ shell_mode = not hasattr(args, '__iter__')
+ return subprocess.Popen(args,
+ shell=shell_mode,
+ env=self.target_environ,
**subproc_kwargs)
def command(self, value):
|
fixed bug where complex shell commands in package commands would cause an
error when using ResolvedContext.execute_command()
|
diff --git a/core.py b/core.py
index <HASH>..<HASH> 100644
--- a/core.py
+++ b/core.py
@@ -3,7 +3,7 @@
"""
futmarket.core
~~~~~~~~~~~~~~~~~~~~~
-This module implements the fut's basic methods.
+This module implements the futmarket's basic methods.
"""
# Imports
@@ -83,6 +83,8 @@ def active():
## Get names and attributes of team members, including last sale price
def my_team():
+ sold()
+ not_sold()
myclub = fut.club()
my_auction = pd.DataFrame(myclub)
my_auction = my_auction[my_auction['untradeable'] == False]
|
Fixed my_team function to clean tradepile first
|
diff --git a/ngReact.js b/ngReact.js
index <HASH>..<HASH> 100644
--- a/ngReact.js
+++ b/ngReact.js
@@ -5,6 +5,16 @@
// - reactComponent (generic directive for delegating off to React Components)
// - reactDirective (factory for creating specific directives that correspond to reactComponent directives)
+var React, angular;
+
+if (typeof module !== 'undefined' && module.exports) {
+ React = require('react');
+ angular = require('angular');
+} else {
+ React = window.React;
+ angular = window.angular;
+}
+
(function(React, angular) {
'use strict';
@@ -184,4 +194,4 @@
.directive('reactComponent', ['$timeout', '$injector', reactComponent])
.factory('reactDirective', ['$timeout','$injector', reactDirective]);
-})(window.React, window.angular);
\ No newline at end of file
+})(React, angular);
\ No newline at end of file
|
added a shim to require react and angular for browserify environment
|
diff --git a/com/checkout/ApiServices/Reporting/ReportingService.php b/com/checkout/ApiServices/Reporting/ReportingService.php
index <HASH>..<HASH> 100644
--- a/com/checkout/ApiServices/Reporting/ReportingService.php
+++ b/com/checkout/ApiServices/Reporting/ReportingService.php
@@ -32,7 +32,7 @@ class ReportingService extends \com\checkout\ApiServices\BaseServices
}
- ublic function queryChargeback(RequestModels\TransactionFilter $requestModel) {
+ public function queryChargeback(RequestModels\TransactionFilter $requestModel) {
$reportingMapper = new ReportingMapper($requestModel);
$reportingUri = $this->_apiUrl->getQueryChargebackApiUri();
$secretKey = $this->_apiSetting->getSecretKey();
|
Fix typo inside ReportingService.php
|
diff --git a/src/bidi/chartypes.py b/src/bidi/chartypes.py
index <HASH>..<HASH> 100644
--- a/src/bidi/chartypes.py
+++ b/src/bidi/chartypes.py
@@ -50,6 +50,10 @@ class ExChar(object):
return None
+ def __repr__(self):
+ return u'<%s %s (bidi type:%s)>' % (self.__class__.__name__,
+ unicodedata.name(self.uni_char), self.bidi_type)
+
class ExCharUpperRtl(ExChar):
"""An extended char which treats upper case chars as a strong 'R'
(for debugging purpose)
|
Added __repr__
|
diff --git a/xblock/runtime.py b/xblock/runtime.py
index <HASH>..<HASH> 100644
--- a/xblock/runtime.py
+++ b/xblock/runtime.py
@@ -460,7 +460,7 @@ class Mixologist(object):
self._generated_classes[cls] = type(
cls.__name__ + 'WithMixins',
(cls, ) + self._mixins,
- {'mixed_class': True}
+ {'unmixed_class': cls}
)
return self._generated_classes[cls]
diff --git a/xblock/test/test_runtime.py b/xblock/test/test_runtime.py
index <HASH>..<HASH> 100644
--- a/xblock/test/test_runtime.py
+++ b/xblock/test/test_runtime.py
@@ -413,3 +413,6 @@ class TestMixologist(object):
# Test that mixins are applied in order
def test_mixin_order(self):
assert_is(1, self.mixologist.mix(FieldTester).number)
+
+ def test_unmixed_class(self):
+ assert_is(FieldTester, self.mixologist.mix(FieldTester).unmixed_class)
|
Add the unmixed class as an attribute to automixed classes
|
diff --git a/kernel/class/edit.php b/kernel/class/edit.php
index <HASH>..<HASH> 100644
--- a/kernel/class/edit.php
+++ b/kernel/class/edit.php
@@ -527,7 +527,7 @@ $class->NameList->setHasDirtyData();
$trans = eZCharTransform::instance();
-if ( $validationRequired )
+if ( $contentClassHasInput && $validationRequired )
{
// check for duplicate attribute identifiers and placements in the input
$placementMap = array();
|
Fix EZP-<I>: Impossible to set default selection item on relation attribute
|
diff --git a/backtrader/indicators/deviation.py b/backtrader/indicators/deviation.py
index <HASH>..<HASH> 100644
--- a/backtrader/indicators/deviation.py
+++ b/backtrader/indicators/deviation.py
@@ -31,9 +31,11 @@ class StandardDeviation(Indicator):
Note:
- If 2 datas are provided as parameters, the 2nd is considered to be the
mean of the first
- - ``safepow´´ (default: False) If this parameter is True, the standard deviation
- will be calculated as pow(abs(meansq - sqmean), 0.5) to safe guard for possible
- negative results of ``meansq - sqmean´´ caused by the floating point representation.
+
+ - ``safepow´´ (default: False) If this parameter is True, the standard
+ deviation will be calculated as pow(abs(meansq - sqmean), 0.5) to safe
+ guard for possible negative results of ``meansq - sqmean´´ caused by
+ the floating point representation.
Formula:
- meansquared = SimpleMovingAverage(pow(data, 2), period)
|
PEP-8 compliance in docstring
|
diff --git a/infrastructure/config_drive_metadata_service.go b/infrastructure/config_drive_metadata_service.go
index <HASH>..<HASH> 100644
--- a/infrastructure/config_drive_metadata_service.go
+++ b/infrastructure/config_drive_metadata_service.go
@@ -104,7 +104,7 @@ func (ms *configDriveMetadataService) load() error {
return nil
}
- ms.logger.Warn(ms.logTag, "Failed to load config from %s", diskPath, err)
+ ms.logger.Warn(ms.logTag, "Failed to load config from %s - %s", diskPath, err.Error())
}
return err
diff --git a/platform/linux_platform.go b/platform/linux_platform.go
index <HASH>..<HASH> 100644
--- a/platform/linux_platform.go
+++ b/platform/linux_platform.go
@@ -403,7 +403,7 @@ func (p linux) SetupEphemeralDiskWithPath(realPath string) error {
if err != nil {
_, isInsufficentSpaceError := err.(insufficientSpaceError)
if isInsufficentSpaceError {
- p.logger.Warn(logTag, "No partitions created on root device, using root partition as ephemeral disk", err)
+ p.logger.Warn(logTag, "No partitions created on root device, using root partition as ephemeral disk - %s", err.Error())
return nil
}
|
Fix improper usages of logger.Warn
The format string was missing the format specifier.
|
diff --git a/packages/@uppy/transloadit/src/index.js b/packages/@uppy/transloadit/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/@uppy/transloadit/src/index.js
+++ b/packages/@uppy/transloadit/src/index.js
@@ -471,6 +471,7 @@ module.exports = class Transloadit extends Plugin {
this._onFileUploadComplete(id, file)
})
assembly.on('error', (error) => {
+ error.assembly = assembly.status
this.uppy.emit('transloadit:assembly-error', assembly.status, error)
})
@@ -610,7 +611,7 @@ module.exports = class Transloadit extends Plugin {
return Promise.resolve()
}
- // AssemblyWatcher tracks completion state of all Assemblies in this upload.
+ // AssemblyWatcher tracks completion states of all Assemblies in this upload.
const watcher = new AssemblyWatcher(this.uppy, assemblyIDs)
fileIDs.forEach((fileID) => {
|
transloadit: add assembly status property to assembly errors
|
diff --git a/sumo/plotting/bs_plotter.py b/sumo/plotting/bs_plotter.py
index <HASH>..<HASH> 100644
--- a/sumo/plotting/bs_plotter.py
+++ b/sumo/plotting/bs_plotter.py
@@ -476,8 +476,7 @@ class SBSPlotter(BSPlotter):
labeltop='off', bottom='off', top='off')
if dos_label is not None:
- ax.yaxis.set_label_position('right')
- ax.set_ylabel(dos_label, rotation=270, labelpad=label_size)
+ ax.set_xlabel(dos_label)
ax.legend(loc=2, frameon=False, ncol=1,
prop={'size': label_size - 3},
|
BUG: Move DOS label to x-axis
|
diff --git a/openquake/engine/supervising/supervisor.py b/openquake/engine/supervising/supervisor.py
index <HASH>..<HASH> 100644
--- a/openquake/engine/supervising/supervisor.py
+++ b/openquake/engine/supervising/supervisor.py
@@ -51,7 +51,7 @@ from openquake.engine.utils import monitor
from openquake.engine.utils import stats
-LOG_FORMAT = ('[%(asctime)s %(calc_domain) #%(calc_id)s %(hostname)s '
+LOG_FORMAT = ('[%(asctime)s %(calc_domain)s #%(calc_id)s %(hostname)s '
'%(levelname)s %(processName)s/%(process)s %(name)s] '
'%(message)s')
|
supervising/supervisor:
Corrected LOG_FORMAT format string.
Former-commit-id: fb<I>c<I>df<I>c4f<I>e<I>f5fb7f5cf<I>
|
diff --git a/app/models/socializer/person.rb b/app/models/socializer/person.rb
index <HASH>..<HASH> 100644
--- a/app/models/socializer/person.rb
+++ b/app/models/socializer/person.rb
@@ -179,7 +179,7 @@ module Socializer
# @example
# current_user.likes?(object)
#
- # @param object [type]
+ # @param [Socializer::ActivityObject] object
#
# @return [TrueClass] if the person likes the object
# @return [FalseClass] if the person does not like the object
|
Person Model - Unresolved type
|
diff --git a/lib/httparty.rb b/lib/httparty.rb
index <HASH>..<HASH> 100644
--- a/lib/httparty.rb
+++ b/lib/httparty.rb
@@ -6,6 +6,7 @@ require 'zlib'
require 'multi_xml'
require 'json'
require 'csv'
+require 'erb'
require 'httparty/module_inheritable_attributes'
require 'httparty/cookie_hash'
|
Require ERB to prevent errors in HashConversions
(and, possibly, elsewhere)
|
diff --git a/Kwf/Component/PagesMetaRow.php b/Kwf/Component/PagesMetaRow.php
index <HASH>..<HASH> 100644
--- a/Kwf/Component/PagesMetaRow.php
+++ b/Kwf/Component/PagesMetaRow.php
@@ -89,7 +89,7 @@ class Kwf_Component_PagesMetaRow extends Kwf_Model_Db_Row
));
foreach ($pages as $p) {
$row = $this->getModel()->getRow($p->componentId);
- $row->deleteRecursive();
+ if ($row) $row->deleteRecursive();
}
}
|
Fix deleteRecursive if page is not yet in meta table
|
diff --git a/lib/tetra/project_initer.rb b/lib/tetra/project_initer.rb
index <HASH>..<HASH> 100644
--- a/lib/tetra/project_initer.rb
+++ b/lib/tetra/project_initer.rb
@@ -65,7 +65,7 @@ module Tetra
end
# adds a source archive at the project, both in original and unpacked forms
- def commit_source_archive(file)
+ def commit_source_archive(file, message)
from_directory do
result_dir = File.join(packages_dir, name)
FileUtils.mkdir_p(result_dir)
@@ -81,6 +81,7 @@ module Tetra
end
unarchiver.decompress(file, "src")
+ commit_sources(message, true)
end
end
end
diff --git a/lib/tetra/ui/init_subcommand.rb b/lib/tetra/ui/init_subcommand.rb
index <HASH>..<HASH> 100644
--- a/lib/tetra/ui/init_subcommand.rb
+++ b/lib/tetra/ui/init_subcommand.rb
@@ -22,7 +22,7 @@ module Tetra
if source_archive
puts "Decompressing sources..."
- project.commit_source_archive(File.expand_path(source_archive))
+ project.commit_source_archive(File.expand_path(source_archive), "Inital sources added from archive")
puts "Sources decompressed in #{package_name}/src/, original archive copied in #{package_name}/packages/."
else
puts "Please add sources to src/."
|
Refactoring: move commit message to ui, where it belongs
|
diff --git a/commerce-frontend-taglib/src/main/resources/META-INF/resources/quantity_selector/QuantitySelector.es.js b/commerce-frontend-taglib/src/main/resources/META-INF/resources/quantity_selector/QuantitySelector.es.js
index <HASH>..<HASH> 100644
--- a/commerce-frontend-taglib/src/main/resources/META-INF/resources/quantity_selector/QuantitySelector.es.js
+++ b/commerce-frontend-taglib/src/main/resources/META-INF/resources/quantity_selector/QuantitySelector.es.js
@@ -6,6 +6,7 @@ class QuantitySelector extends Component {
attached() {
this.quantity = this.quantity || this.minQuantity;
+ return this._updateQuantity(this.quantity);
}
syncQuantity() {
|
COMMERCE-<I> quantity selector not aligned on product card
|
diff --git a/pywb/static/wombat.js b/pywb/static/wombat.js
index <HASH>..<HASH> 100644
--- a/pywb/static/wombat.js
+++ b/pywb/static/wombat.js
@@ -447,6 +447,12 @@ var wombat_internal = function($wbwindow) {
this._parser = make_parser(href);
}
+ //Special case for href="." assignment
+ if (prop == "href" && typeof(value) == "string" && value[0] == ".") {
+ this._parser.href = $wbwindow.document.baseURI;
+ value = this._parser.href;
+ }
+
try {
this._parser[prop] = value;
} catch (e) {
|
wobmat rewrite: support "a.href = '.'" properly even if trailing / missing
|
diff --git a/ciscosparkapi/api/memberships.py b/ciscosparkapi/api/memberships.py
index <HASH>..<HASH> 100644
--- a/ciscosparkapi/api/memberships.py
+++ b/ciscosparkapi/api/memberships.py
@@ -260,7 +260,8 @@ class MembershipsAPI(object):
value = utf8(value)
put_data[utf8(param)] = value
# API request
- json_obj = self.session.post('memberships', json=put_data)
+ json_obj = self.session.post('memberships/'+membershipId,
+ json=put_data)
# Return a Membership object created from the response JSON data
return Membership(json_obj)
diff --git a/ciscosparkapi/api/rooms.py b/ciscosparkapi/api/rooms.py
index <HASH>..<HASH> 100644
--- a/ciscosparkapi/api/rooms.py
+++ b/ciscosparkapi/api/rooms.py
@@ -229,7 +229,7 @@ class RoomsAPI(object):
value = utf8(value)
put_data[utf8(param)] = value
# API request
- json_obj = self.session.post('rooms', json=put_data)
+ json_obj = self.session.post('rooms/'+roomId, json=put_data)
# Return a Room object created from the response JSON data
return Room(json_obj)
|
Squash bugs
Add missing ID suffixes to URLs on update methods.
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -61,7 +61,7 @@ release = "1.0"
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
|
Set language to "en" for documentation
|
diff --git a/lib/eye/patch/version.rb b/lib/eye/patch/version.rb
index <HASH>..<HASH> 100644
--- a/lib/eye/patch/version.rb
+++ b/lib/eye/patch/version.rb
@@ -1,5 +1,5 @@
module Eye
module Patch
- VERSION = "0.0.5"
+ VERSION = "0.0.6"
end
end
|
Bump gem version to include load changes on deploy
|
diff --git a/app/models/no_cms/menus/menu.rb b/app/models/no_cms/menus/menu.rb
index <HASH>..<HASH> 100644
--- a/app/models/no_cms/menus/menu.rb
+++ b/app/models/no_cms/menus/menu.rb
@@ -2,7 +2,7 @@ module NoCms::Menus
class Menu < ActiveRecord::Base
translates :name
- has_many :menu_items
+ has_many :menu_items, dependent: :destroy
accepts_nested_attributes_for :menu_items, allow_destroy: true
validates :name, :uid, presence: true
|
We destroy menu_items when the menu is destroyed
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.