diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/elytron/src/main/java/org/wildfly/extension/elytron/ModifiableKeyStoreDecorator.java b/elytron/src/main/java/org/wildfly/extension/elytron/ModifiableKeyStoreDecorator.java
index <HASH>..<HASH> 100644
--- a/elytron/src/main/java/org/wildfly/extension/elytron/ModifiableKeyStoreDecorator.java
+++ b/elytron/src/main/java/org/wildfly/extension/elytron/ModifiableKeyStoreDecorator.java
@@ -61,7 +61,7 @@ import static org.wildfly.extension.elytron._private.ElytronSubsystemMessages.RO
*
* @author <a href="mailto:jkalina@redhat.com">Jan Kalina</a>
*/
-public class ModifiableKeyStoreDecorator extends DelegatingResourceDefinition {
+class ModifiableKeyStoreDecorator extends DelegatingResourceDefinition {
static ResourceDefinition wrap(ResourceDefinition resourceDefinition) {
return new ModifiableKeyStoreDecorator(resourceDefinition);
|
[WFCORE-<I>] The class ModifiableKeyStoreDecorator should not be public.
|
diff --git a/colin/utils/cont.py b/colin/utils/cont.py
index <HASH>..<HASH> 100644
--- a/colin/utils/cont.py
+++ b/colin/utils/cont.py
@@ -91,13 +91,17 @@ class Image(object):
atomic_source = "docker:" + image_name.name
e = os.environ.copy()
- e["ATOMIC_OSTREE_REPO"] = self.ostree_path
# must not exist, ostree will create it
- out = subprocess.check_output(
- ["atomic", "--debug", "pull", "--storage", "ostree", atomic_source],
- env=e)
- logger.debug("output of atomic command:")
- logger.debug(out)
+ e["ATOMIC_OSTREE_REPO"] = self.ostree_path
+ cmd = ["atomic", "pull", "--storage", "ostree", atomic_source]
+ try:
+ out = subprocess.check_output(cmd, env=e, stderr=subprocess.STDOUT)
+ except subprocess.CalledProcessError:
+ logger.error("Failed to pull selected container image. Does it exist?")
+ raise
+ else:
+ logger.debug("output of atomic command:")
+ logger.debug(out)
archive_file_name = "archive.tar"
archive_path = os.path.join(self.tmpdir, archive_file_name)
|
nicer error message when an image can't be pulled
|
diff --git a/Fields/MulticheckboxField.php b/Fields/MulticheckboxField.php
index <HASH>..<HASH> 100644
--- a/Fields/MulticheckboxField.php
+++ b/Fields/MulticheckboxField.php
@@ -85,8 +85,14 @@ class MulticheckboxField extends Field
$checked = array();
- foreach ($values as $name => $one) {
- $checked[$this->nameFor($name)] = true;
+ if ( $this->is_numeric_array( $values ) ) {
+ foreach ( $values as $name ) {
+ $checked[ $this->nameFor( $name ) ] = true;
+ }
+ } else {
+ foreach ( $values as $name => $one ) {
+ $checked[ $this->nameFor( $name ) ] = true;
+ }
}
foreach ($this->checkboxes as $checkbox) {
@@ -97,6 +103,21 @@ class MulticheckboxField extends Field
}
}
}
+
+ protected function is_numeric_array( $array ) {
+
+ $i = 0;
+
+ foreach ( $array as $key => $_ ) {
+ if ( $i !== $key ) {
+ return false;
+ }
+
+ $i++;
+ }
+
+ return true;
+ }
public function getValue()
{
|
Make MulticheckboxField getValue and setValue compatible
Previously, `setValue` expected an array of options to `true`. However, `getValue` returns an array of options. The previous behavior is retained for compatibility with PHP `$_POST` and manual usage of `setValue`.
|
diff --git a/db/migrate/20150605151945_create_pd_regime_bags.rb b/db/migrate/20150605151945_create_pd_regime_bags.rb
index <HASH>..<HASH> 100644
--- a/db/migrate/20150605151945_create_pd_regime_bags.rb
+++ b/db/migrate/20150605151945_create_pd_regime_bags.rb
@@ -1,9 +1,9 @@
class CreatePDRegimeBags < ActiveRecord::Migration
def change
create_table :pd_regime_bags do |t|
- t.integer :pd_regime_id
- t.integer :bag_type_id, null: false
- t.integer :volume, null: false
+ t.references :pd_regime, null: false, foreign_key: true
+ t.references :bag_type, null: false, foreign_key: true
+ t.integer :volume, null: false
t.integer :per_week
t.boolean :monday
t.boolean :tuesday
|
Added missing null: false for pd_regime_bags migration required fields.
|
diff --git a/pysc2/bin/replay_actions.py b/pysc2/bin/replay_actions.py
index <HASH>..<HASH> 100755
--- a/pysc2/bin/replay_actions.py
+++ b/pysc2/bin/replay_actions.py
@@ -371,7 +371,7 @@ def main(unused_argv):
replay_queue_thread.daemon = True
replay_queue_thread.start()
- for i in range(FLAGS.parallel):
+ for i in range(min(len(replay_list), FLAGS.parallel)):
p = ReplayProcessor(i, run_config, replay_queue, stats_queue)
p.daemon = True
p.start()
|
Faster startup time if you're only checking a few replays.
PiperOrigin-RevId: <I>
|
diff --git a/src/MediaObserver.php b/src/MediaObserver.php
index <HASH>..<HASH> 100644
--- a/src/MediaObserver.php
+++ b/src/MediaObserver.php
@@ -10,7 +10,9 @@ class MediaObserver
{
public function creating(Media $media)
{
- $media->setHighestOrderNumber();
+ if ($media->shouldSortWhenCreating()) {
+ $media->setHighestOrderNumber();
+ }
}
public function updating(Media $media)
|
add missing condition - should sort when creating (#<I>)
|
diff --git a/pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/dataproperties/RequestedLocalProperties.java b/pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/dataproperties/RequestedLocalProperties.java
index <HASH>..<HASH> 100644
--- a/pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/dataproperties/RequestedLocalProperties.java
+++ b/pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/dataproperties/RequestedLocalProperties.java
@@ -20,7 +20,6 @@ import java.util.Arrays;
import eu.stratosphere.pact.common.contract.Ordering;
import eu.stratosphere.pact.common.util.FieldList;
import eu.stratosphere.pact.common.util.FieldSet;
-import eu.stratosphere.pact.compiler.CompilerException;
import eu.stratosphere.pact.compiler.plan.OptimizerNode;
import eu.stratosphere.pact.compiler.plan.candidate.Channel;
import eu.stratosphere.pact.compiler.util.Utils;
|
Removed unnecessary import from RequestedLocalProperties.
|
diff --git a/packages/generator/hub-widget/index.js b/packages/generator/hub-widget/index.js
index <HASH>..<HASH> 100644
--- a/packages/generator/hub-widget/index.js
+++ b/packages/generator/hub-widget/index.js
@@ -117,6 +117,10 @@ module.exports = class HubWidgetGenerator extends Generator {
dependencies: Object.assign({}, packageJson.dependencies, {
'hub-dashboard-addons': this.props.hubDashboardAddons,
'@jetbrains/hub-widget-ui': this.props.jetbrainsHubWidgetUi
+ }),
+ scripts: Object.assign({}, packageJson.scripts, {
+ build: 'webpack -p', // Widgets with sourcemaps take to much space
+ dist: `npm run build && rm -f ${this.props.projectName}.zip && zip -r -j ${this.props.projectName}.zip ./dist`
})
});
return JSON.stringify(newPackageJson, null, INDENT);
|
Include "dist" script to Yoman-generated widgets
|
diff --git a/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
index <HASH>..<HASH> 100644
--- a/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
+++ b/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
@@ -1454,7 +1454,8 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
}
/** Utility method for a work-around to MSHARED-998 */
- private Artifact findClassifierArtifactInAllDeps(final Iterable<ArtifactResult> allDeps, final ArtifactCoordinate theCoord) {
+ private Artifact findClassifierArtifactInAllDeps(final Iterable<ArtifactResult> allDeps, final ArtifactCoordinate theCoord)
+ throws DependencyNotFoundException {
Artifact result = null;
for (final ArtifactResult res : allDeps) {
if (sameArtifact(res, theCoord)) {
@@ -1462,6 +1463,10 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
break;
}
}
+ if (result == null) {
+ throw new DependencyNotFoundException(String.format("Expected dependency not found in resolved artifacts for "
+ + "dependency %s", theCoord));
+ }
return result;
}
|
Add an accidentally forgotten throw of DependencyNotFoundException when the artifact cannot be resolved
|
diff --git a/src/logic/DomainVariationsGenerator.php b/src/logic/DomainVariationsGenerator.php
index <HASH>..<HASH> 100644
--- a/src/logic/DomainVariationsGenerator.php
+++ b/src/logic/DomainVariationsGenerator.php
@@ -8,7 +8,7 @@
* @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
*/
-namespace hipanel\modules\domain\logic;
+namespace hipanel\modules\domain\logic;
use hipanel\helpers\ArrayHelper;
use hipanel\modules\domain\forms\CheckForm;
@@ -78,7 +78,15 @@ class DomainVariationsGenerator
{
$domains = $this->generateVariations();
if (Yii::$app->user->can('test.beta')) {
- $domains = array_merge($domains, $this->generateSuggestions());
+ $suggestions = $this->generateSuggestions();
+ foreach ($suggestions as $suggestion) {
+ $key = array_search(strtolower($suggestion['fqdn']), $domains);
+ if ($key === false) {
+ array_push($domains, $suggestion);
+ } else {
+ $domains[$key] = array_map('strtolower', $suggestion);
+ }
+ }
}
$this->orderVariations($domains);
|
Remove dupliactes for domain suggestions
|
diff --git a/lib/modules/workspace_commands.rb b/lib/modules/workspace_commands.rb
index <HASH>..<HASH> 100644
--- a/lib/modules/workspace_commands.rb
+++ b/lib/modules/workspace_commands.rb
@@ -30,6 +30,7 @@ module Bcome::WorkspaceCommands
if attribute_value
desc += "\t#{key}".cyan
desc += "\s" * (12 - key.length)
+ attribute_value = (value == :identifier) ? attribute_value.underline : attribute_value
desc += attribute_value.green + "\n"
end
end
diff --git a/patches/string.rb b/patches/string.rb
index <HASH>..<HASH> 100644
--- a/patches/string.rb
+++ b/patches/string.rb
@@ -32,6 +32,10 @@ class String
return "\e[1m#{self}\033[0m"
end
+ def underline
+ return "\e[4m#{self}\e[0m"
+ end
+
def method_missing(method_sym, *arguments, &black)
unless colour_code = colour_codes[method_sym]
super
|
Added underline string method,and underlined node names
|
diff --git a/tests/test_mp3.py b/tests/test_mp3.py
index <HASH>..<HASH> 100644
--- a/tests/test_mp3.py
+++ b/tests/test_mp3.py
@@ -3,5 +3,5 @@ import unittest
import base
-class Mp3TestCase(base.BaseParserTestCase, unittest.TestCase):
+class Mp3TestCase(base.ShellParserTestCase, unittest.TestCase):
extension = 'mp3'
diff --git a/tests/test_ogg.py b/tests/test_ogg.py
index <HASH>..<HASH> 100644
--- a/tests/test_ogg.py
+++ b/tests/test_ogg.py
@@ -3,5 +3,5 @@ import unittest
import base
-class OggTestCase(base.BaseParserTestCase, unittest.TestCase):
+class OggTestCase(base.ShellParserTestCase, unittest.TestCase):
extension = 'ogg'
|
switched to ShellParserTestCase
|
diff --git a/dist/lib/listeners.js b/dist/lib/listeners.js
index <HASH>..<HASH> 100644
--- a/dist/lib/listeners.js
+++ b/dist/lib/listeners.js
@@ -276,6 +276,7 @@
function onUnmount() {
_deleteInstance(this);
_unbindClicks();
+ if (_focusedInstance === this) _focus(null);
}
exports.setBinding = setBinding;
|
add compiled bug fix for dist
|
diff --git a/src/Orchestra/Auth/Guard.php b/src/Orchestra/Auth/Guard.php
index <HASH>..<HASH> 100644
--- a/src/Orchestra/Auth/Guard.php
+++ b/src/Orchestra/Auth/Guard.php
@@ -1,7 +1,5 @@
<?php namespace Orchestra\Auth;
-use Closure;
-
class Guard extends \Illuminate\Auth\Guard
{
/**
@@ -14,10 +12,10 @@ class Guard extends \Illuminate\Auth\Guard
/**
* Setup roles event listener.
*
- * @param Closure $event
+ * @param \Closure|string $event
* @return void
*/
- public function setup(Closure $event)
+ public function setup($event)
{
$this->userRoles = null;
$this->events->forget('orchestra.auth: roles');
|
Auth::setup() should be able to take string as well.
|
diff --git a/IPython/html/static/widgets/js/init.js b/IPython/html/static/widgets/js/init.js
index <HASH>..<HASH> 100644
--- a/IPython/html/static/widgets/js/init.js
+++ b/IPython/html/static/widgets/js/init.js
@@ -23,5 +23,5 @@ define([
}
}
- return WidgetManager;
+ return {'WidgetManager': WidgetManager};
});
diff --git a/IPython/html/static/widgets/js/widget.js b/IPython/html/static/widgets/js/widget.js
index <HASH>..<HASH> 100644
--- a/IPython/html/static/widgets/js/widget.js
+++ b/IPython/html/static/widgets/js/widget.js
@@ -4,7 +4,7 @@
define(["widgets/js/manager",
"underscore",
"backbone"],
-function(WidgetManager, _, Backbone){
+function(widgetmanager, _, Backbone){
var WidgetModel = Backbone.Model.extend({
constructor: function (widget_manager, model_id, comm) {
@@ -261,7 +261,7 @@ function(WidgetManager, _, Backbone){
},
});
- WidgetManager.register_widget_model('WidgetModel', WidgetModel);
+ widgetmanager.WidgetManager.register_widget_model('WidgetModel', WidgetModel);
var WidgetView = Backbone.View.extend({
|
Fix imports of "modules",
required after converting everything into dictionary returns.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -103,5 +103,5 @@ def version_can_handle_msgpack_result; 12 end
def version_cannot_handle_non_delivery_result; 12 end
def version_can_handle_non_delivery_result; 13 end
-def version_cannot_handle_http_result; 22 end
-def version_can_handle_http_result; 23 end
+def version_cannot_handle_http; 22 end
+def version_can_handle_http; 23 end
|
IV-<I> Fix version handling names in spec_helper
|
diff --git a/integrations/server_test.go b/integrations/server_test.go
index <HASH>..<HASH> 100644
--- a/integrations/server_test.go
+++ b/integrations/server_test.go
@@ -69,8 +69,8 @@ func TestServer(t *testing.T) {
},
},
wants: wants{
- statusCode: 401,
- body: `{"code":401,"message":"User is not authorized"}`,
+ statusCode: 403,
+ body: `{"code":403,"message":"User is not authorized"}`,
},
},
{
|
Repair go integration spec - we return <I>s now
|
diff --git a/login.php b/login.php
index <HASH>..<HASH> 100644
--- a/login.php
+++ b/login.php
@@ -50,9 +50,10 @@ $password = WT_Filter::post('password');
$timediff = WT_Filter::postInteger('timediff', -43200, 50400, 0); // Same range as date('Z')
// These parameters may come from the URL which is emailed to users.
-if (empty($action)) $action = WT_Filter::get('action');
-if (empty($user_name)) $user_name = WT_Filter::get('user_name', WT_REGEX_USERNAME);
-if (empty($user_hashcode)) $user_hashcode = WT_Filter::get('user_hashcode');
+if (!$action) $action = WT_Filter::get('action');
+if (!$user_name) $user_name = WT_Filter::get('user_name', WT_REGEX_USERNAME);
+if (!$user_hashcode) $user_hashcode = WT_Filter::get('user_hashcode');
+if (!$url) $url = WT_Filter::getUrl('url');
// This parameter may come from generated login links
if (!$url) {
|
Fix: url parameter being lost during login
|
diff --git a/builtin/providers/aws/resource_aws_redshift_cluster_test.go b/builtin/providers/aws/resource_aws_redshift_cluster_test.go
index <HASH>..<HASH> 100644
--- a/builtin/providers/aws/resource_aws_redshift_cluster_test.go
+++ b/builtin/providers/aws/resource_aws_redshift_cluster_test.go
@@ -844,6 +844,8 @@ func testAccAWSRedshiftClusterConfig_notPubliclyAccessible(rInt int) string {
cluster_subnet_group_name = "${aws_redshift_subnet_group.foo.name}"
publicly_accessible = false
skip_final_snapshot = true
+
+ depends_on = ["aws_internet_gateway.foo"]
}`, rInt, rInt)
}
@@ -902,6 +904,8 @@ func testAccAWSRedshiftClusterConfig_updatePubliclyAccessible(rInt int) string {
cluster_subnet_group_name = "${aws_redshift_subnet_group.foo.name}"
publicly_accessible = true
skip_final_snapshot = true
+
+ depends_on = ["aws_internet_gateway.foo"]
}`, rInt, rInt)
}
|
provider/aws: Add an explicit depends on for the internet gateway, should help this test pass
|
diff --git a/logr.go b/logr.go
index <HASH>..<HASH> 100644
--- a/logr.go
+++ b/logr.go
@@ -365,10 +365,16 @@ type LogSink interface {
// This is an optional interface and implementations are not required to
// support it.
type CallDepthLogSink interface {
- // WithCallDepth returns a Logger that will offset the call stack by the
- // specified number of frames when logging call site information. If depth
- // is 0 the attribution should be to the direct caller of this method. If
- // depth is 1 the attribution should skip 1 call frame, and so on.
+ // WithCallDepth returns a LogSink that will offset the call
+ // stack by the specified number of frames when logging call
+ // site information.
+ //
+ // If depth is 0, the LogSink should skip exactly the number
+ // of call frames defined in RuntimeInfo.CallDepth when Info
+ // or Error are called, i.e. the attribution should be to the
+ // direct caller of Logger.Info or Logger.Error.
+ //
+ // If depth is 1 the attribution should skip 1 call frame, and so on.
// Successive calls to this are additive.
WithCallDepth(depth int) LogSink
}
|
CallDepthLogSink: clarify relationship with RuntimeInfo
Implementors of the interface might miss that they need to skip
additional levels because of logr's own helper function.
|
diff --git a/shared/chat/conversation/messages/attachment.js b/shared/chat/conversation/messages/attachment.js
index <HASH>..<HASH> 100644
--- a/shared/chat/conversation/messages/attachment.js
+++ b/shared/chat/conversation/messages/attachment.js
@@ -38,7 +38,7 @@ function PreviewImage ({message: {attachmentDurationMs, previewDurationMs, previ
position: 'relative',
alignItems: 'flex-end',
}
- const imgStyle = {...globalStyles.rounded, ...(previewSize ? {width: previewSize.width, height: previewSize.height} : {maxHeight: 320, maxWidth: 320})}
+ const imgStyle = {borderRadius: 4, ...(previewSize ? {width: previewSize.width, height: previewSize.height} : {maxHeight: 320, maxWidth: 320})}
switch (messageState) {
case 'uploading':
|
Increase attachment preview border radius to match mockups
|
diff --git a/images/app/controllers/refinery/admin/images_controller.rb b/images/app/controllers/refinery/admin/images_controller.rb
index <HASH>..<HASH> 100644
--- a/images/app/controllers/refinery/admin/images_controller.rb
+++ b/images/app/controllers/refinery/admin/images_controller.rb
@@ -149,7 +149,7 @@ module Refinery
def permitted_image_params
[
- { image: [] }, :image_size, :image_title, :image_alt
+ :image, :image_size, :image_title, :image_alt
]
end
|
Fix permitted params allowing new images to be uploaded
|
diff --git a/extensions/management/modelviz.py b/extensions/management/modelviz.py
index <HASH>..<HASH> 100644
--- a/extensions/management/modelviz.py
+++ b/extensions/management/modelviz.py
@@ -42,7 +42,6 @@ __contributors__ = [
import getopt, sys
from django.core.management import setup_environ
-from django.utils.encoding import mark_safe
try:
import settings
@@ -51,6 +50,7 @@ except ImportError:
else:
setup_environ(settings)
+from django.utils.safestring import mark_safe
from django.template import Template, Context
from django.db import models
from django.db.models import get_models
|
Adrians cleanup in Changeset <I> revailed an incorrect import.
thanks mariocesar.c<I> for the report!
|
diff --git a/handlers/new.go b/handlers/new.go
index <HASH>..<HASH> 100644
--- a/handlers/new.go
+++ b/handlers/new.go
@@ -4,6 +4,7 @@ import (
"crypto/rand"
"encoding/hex"
"errors"
+ "flag"
"fmt"
"log"
"net/http"
@@ -13,6 +14,8 @@ import (
"github.com/coreos/go-etcd/etcd"
)
+var baseURI = flag.String("host", "https://discovery.etcd.io", "base location for computed token URI")
+
func generateCluster() string {
b := make([]byte, 16)
_, err := rand.Read(b)
@@ -78,5 +81,5 @@ func NewTokenHandler(w http.ResponseWriter, r *http.Request) {
log.Println("New cluster created", token)
- fmt.Fprintf(w, "https://discovery.etcd.io/"+token)
+ fmt.Fprintf(w, "%s/%s", *baseURI, token)
}
|
http: Allow configuration of the URI from /new
This patch adds a new flag, `--host`, which permits runtime
configuration of the URI returned by the `/new` handler. The default
behavior is the current hardcoded behavior, which always directs clients
to <URL>
|
diff --git a/src/Illuminate/Mail/Mailer.php b/src/Illuminate/Mail/Mailer.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Mail/Mailer.php
+++ b/src/Illuminate/Mail/Mailer.php
@@ -236,7 +236,7 @@ class Mailer implements MailerContract, MailQueueContract
// message. This is primarily useful during local development in which each
// message should be delivered into a single mail address for inspection.
if (isset($this->to['address'])) {
- $this->setGlobalTo($message);
+ $this->setGlobalToAndRemoveCcAndBcc($message);
}
// Next we will determine if the message should be sent. We give the developer
@@ -347,7 +347,7 @@ class Mailer implements MailerContract, MailQueueContract
* @param \Illuminate\Mail\Message $message
* @return void
*/
- protected function setGlobalTo($message)
+ protected function setGlobalToAndRemoveCcAndBcc($message)
{
$message->to($this->to['address'], $this->to['name'], true);
$message->cc(null, null, true);
|
Rename `setGlobalTo` to `setGlobalToAndRemoveCcAndBcc` (#<I>)
It's really counter intuitive to have a setter destroy unrelated data,
best to be honest and complete about it.
|
diff --git a/menuconfig.py b/menuconfig.py
index <HASH>..<HASH> 100755
--- a/menuconfig.py
+++ b/menuconfig.py
@@ -318,7 +318,7 @@ _STYLES = {
separator=fg:white,bg:cyan,bold
help=path
frame=fg:white,bg:cyan,bold
- body=fg:brightwhite,bg:blue
+ body=fg:white,bg:blue
edit=fg:black,bg:white
"""
}
|
menuconfig: Avoid the non-ANSI 'brightwhite' color in the aquatic theme
Not available with TERM=xterm (as opposed to xterm-<I>color).
Use fg:white instead of fg:brightwhite for dialog box bodies. Not a huge
difference.
Came up in <URL>
|
diff --git a/src/test/java/net/openhft/performance/tests/network/SimpleServerAndClientTest.java b/src/test/java/net/openhft/performance/tests/network/SimpleServerAndClientTest.java
index <HASH>..<HASH> 100755
--- a/src/test/java/net/openhft/performance/tests/network/SimpleServerAndClientTest.java
+++ b/src/test/java/net/openhft/performance/tests/network/SimpleServerAndClientTest.java
@@ -30,10 +30,7 @@ import net.openhft.chronicle.wire.TextWire;
import net.openhft.chronicle.wire.Wire;
import net.openhft.chronicle.wire.WireType;
import org.jetbrains.annotations.NotNull;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
import java.io.IOException;
import java.nio.channels.SocketChannel;
@@ -62,6 +59,7 @@ public class SimpleServerAndClientTest {
}
@Test
+ @Ignore("Fails on Teamcity ")
public void test() throws IOException, TimeoutException {
// this the name of a reference to the host name and port,
// allocated automatically when to a free port on localhost
|
networkj#8 test passes locally but not in teamcity on the same machine.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -10,8 +10,7 @@ module.exports = function () {
var cmd = 'open';
var args = [
- '-a',
- 'ScreenSaverEngine'
+ '/System/Library/Frameworks/ScreenSaver.framework/Versions/A/Resources/ScreenSaverEngine.app'
];
return pify(execFile, Promise)(cmd, args);
|
Use alternative approach to start screensaver
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ setup_data = {
'name': 'pylibdmtx',
'version': pylibdmtx.__version__,
'author': 'Lawrence Hudson',
- 'author_email': 'l.hudson@nhm.ac.uk',
+ 'author_email': 'quicklizard@googlemail.com',
'url': URL,
'license': 'MIT',
'description': pylibdmtx.__doc__,
@@ -49,8 +49,9 @@ setup_data = {
},
'tests_require': [
# TODO How to specify OpenCV? 'cv2>=2.4.8',
- PILLOW,
+ 'mock>=2.0.0; python_version=="2.7"',
'numpy>=1.8.2',
+ PILLOW,
],
'include_package_data': True,
'classifiers': [
|
Correct email address. Add mock as test dependency
|
diff --git a/emoji/models.py b/emoji/models.py
index <HASH>..<HASH> 100644
--- a/emoji/models.py
+++ b/emoji/models.py
@@ -145,7 +145,10 @@ class Emoji(object):
name = e.name_for(character)
if name:
- character = e._image_string(name, alt=character)
+ if settings.EMOJI_ALT_AS_UNICODE:
+ character = e._image_string(name, alt=character)
+ else:
+ character = e._image_string(name)
output.append(character)
|
Unicode as alt as a configuration point
|
diff --git a/ext_emconf.php b/ext_emconf.php
index <HASH>..<HASH> 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -14,6 +14,7 @@ $EM_CONF[$_EXTKEY] = [
'constraints' => [
'depends' => [
+ 'typo3' => '6.2.0-7.6.99',
'configuration_object' => '1.0.0-1.99.99'
]
]
|
[TASK] Add TYPO3 version requirement
TER release could not be performed because of the TYPO3 version
requirement missing in `ext_emconf.php`.
|
diff --git a/src/validations.js b/src/validations.js
index <HASH>..<HASH> 100644
--- a/src/validations.js
+++ b/src/validations.js
@@ -37,18 +37,20 @@ export const login = joi.object({
session: joi.string().valid('token', 'cookie').default('token'),
}),
body: joi.object({
- email: userEmail.required(),
- // This is less strict than the password validation used in `register`,
- // because we check this against the DB anyway, and an error message
- // about mismatching passwords makes more sense when logging in than an
- // error message about the password being too short.
+ // This is less strict than the email and password validation used in
+ // `register`, because we check this against the DB anyway, and an
+ // error message about a nonexistent account or mismatching passwords
+ // makes more sense when logging in than an error message about the
+ // email being incorrectly formatted or the password being too short.
+ email: joi.string().required(),
password: joi.string().required(),
}),
});
export const requestPasswordReset = joi.object({
body: joi.object({
- email: userEmail.required(),
+ // Checked against DB like in `login`.
+ email: joi.string().required(),
}),
});
|
Loosen validation in login and password reset forms.
|
diff --git a/server/httphandler.js b/server/httphandler.js
index <HASH>..<HASH> 100644
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -93,6 +93,9 @@ var serveMagicLocale = function (request, response) {
} else {
negotiator = new Negotiator(request);
found_locale = negotiator.language(cached_available_locales);
+
+ // If a locale couldn't be negotiated, use the default
+ found_locale = found_locale || default_locale_id;
}
// Send a locale to the browser
|
Default locale if one couldn't be negotiated
|
diff --git a/api/webserver/main.go b/api/webserver/main.go
index <HASH>..<HASH> 100644
--- a/api/webserver/main.go
+++ b/api/webserver/main.go
@@ -82,6 +82,7 @@ func main() {
m.Put("/apps/:app/:team", AuthorizationRequiredHandler(app.GrantAccessToTeamHandler))
m.Del("/apps/:app/:team", AuthorizationRequiredHandler(app.RevokeAccessFromTeamHandler))
m.Get("/apps/:name/log", AuthorizationRequiredHandler(app.AppLog))
+ m.Post("/apps/:name/log", Handler(app.AddLogHandler))
m.Post("/users", Handler(auth.CreateUser))
m.Post("/users/:email/tokens", Handler(auth.Login))
|
Added route for add log handler.
Related to #<I>.
|
diff --git a/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php
index <HASH>..<HASH> 100644
--- a/includes/functions/functions_rtl.php
+++ b/includes/functions/functions_rtl.php
@@ -41,6 +41,18 @@ $numberPunctuation = '- ,.:/'; // Treat these like numbers when inside numeric s
$punctuation = ',.:;?!';
/**
+ * This function strips ‎ and ‏ from the input string. It should be used for all
+ * text that has been passed through the PrintReady() function before that text is stored
+ * in the database. The database should NEVER contain these characters.
+ *
+ * @param string The string from which the ‎ and ‏ characters should be stripped
+ * @return string The input string, with ‎ and ‏ stripped
+ */
+function stripLRMRLM($inputText) {
+ return str_replace(array(WT_UTF8_LRM, WT_UTF8_RLM, WT_UTF8_LRO, WT_UTF8_RLO, WT_UTF8_LRE, WT_UTF8_RLE, WT_UTF8_PDF, "‎", "‏", "&LRM;", "&RLM;"), "", $inputText);
+}
+
+/**
* This function encapsulates all texts in the input with <span dir='xxx'> and </span>
* according to the directionality specified.
*
|
function stripLRMRLM() deleted prematurely. It is still used by the PDF reports. Restore it.
|
diff --git a/lib/solargraph/diagnostics/rubocop.rb b/lib/solargraph/diagnostics/rubocop.rb
index <HASH>..<HASH> 100644
--- a/lib/solargraph/diagnostics/rubocop.rb
+++ b/lib/solargraph/diagnostics/rubocop.rb
@@ -6,6 +6,15 @@ module Solargraph
# This reporter provides linting through RuboCop.
#
class Rubocop < Base
+ # Conversion of RuboCop severity names to LSP constants
+ SEVERITIES = {
+ 'refactor' => 4,
+ 'convention' => 3,
+ 'warning' => 2,
+ 'error' => 1,
+ 'fatal' => 1
+ }
+
# The rubocop command
#
# @return [String]
@@ -43,14 +52,6 @@ module Solargraph
private
def make_array resp
- # Conversion of RuboCop severity names to LSP constants
- severities = {
- 'refactor' => 4,
- 'convention' => 3,
- 'warning' => 2,
- 'error' => 1,
- 'fatal' => 1
- }
diagnostics = []
resp['files'].each do |file|
file['offenses'].each do |off|
@@ -73,7 +74,7 @@ module Solargraph
}
},
# 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
- severity: severities[off['severity']],
+ severity: SEVERITIES[off['severity']],
source: off['cop_name'],
message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
}
|
Move RuboCop severities to constant.
|
diff --git a/publify_core/lib/publify_core.rb b/publify_core/lib/publify_core.rb
index <HASH>..<HASH> 100644
--- a/publify_core/lib/publify_core.rb
+++ b/publify_core/lib/publify_core.rb
@@ -5,7 +5,6 @@ require 'publify_core/version'
require 'publify_core/engine'
require 'publify_core/lang'
-require 'activerecord/session_store'
require 'bootstrap-sass'
require 'carrierwave'
require 'dynamic_form'
|
Do not require activerecord/session_store
|
diff --git a/core/api/src/main/java/com/alipay/sofa/rpc/config/ConsumerConfig.java b/core/api/src/main/java/com/alipay/sofa/rpc/config/ConsumerConfig.java
index <HASH>..<HASH> 100644
--- a/core/api/src/main/java/com/alipay/sofa/rpc/config/ConsumerConfig.java
+++ b/core/api/src/main/java/com/alipay/sofa/rpc/config/ConsumerConfig.java
@@ -882,7 +882,7 @@ public class ConsumerConfig<T> extends AbstractInterfaceConfig<T, ConsumerConfig
}
/**
- * Gets time out.
+ * Gets the timeout corresponding to the method name
*
* @param methodName the method name
* @return the time out
@@ -904,10 +904,10 @@ public class ConsumerConfig<T> extends AbstractInterfaceConfig<T, ConsumerConfig
}
/**
- * Gets time out.
+ * Gets the call type corresponding to the method name
*
* @param methodName the method name
- * @return the time out
+ * @return the call type
*/
public String getMethodInvokeType(String methodName) {
return (String) getMethodConfigValue(methodName, RpcConstants.CONFIG_KEY_INVOKE_TYPE,
|
Modify inappropriate comments in ConsumerConfig. (#<I>)
|
diff --git a/plugins/rcpt_to.ldap.js b/plugins/rcpt_to.ldap.js
index <HASH>..<HASH> 100644
--- a/plugins/rcpt_to.ldap.js
+++ b/plugins/rcpt_to.ldap.js
@@ -33,7 +33,7 @@ exports.ldap_rcpt = function(next, connection, params) {
var txn = connection.transaction;
if (!txn) return next();
- var rcpt = params[0];
+ var rcpt = txn.rcpt_to[txn.rcpt_to.length - 1];
if (!rcpt.host) {
txn.results.add(plugin, {fail: '!domain'});
return next();
|
Aliases plugin modifies transaction.rcpt_to
The aliases plugin modifies the transaction.rcpt_to array.
Look at the latest entry added to the rcpt_to array and
use that for looking up the destination LDAP account.
|
diff --git a/lib/rummageable.rb b/lib/rummageable.rb
index <HASH>..<HASH> 100644
--- a/lib/rummageable.rb
+++ b/lib/rummageable.rb
@@ -1,5 +1,4 @@
require "rest_client"
-require 'yajl'
require 'multi_json'
require "plek"
|
remove the hard dependency on yajl let multi json sort it
|
diff --git a/staging/src/k8s.io/apiserver/pkg/audit/request.go b/staging/src/k8s.io/apiserver/pkg/audit/request.go
index <HASH>..<HASH> 100644
--- a/staging/src/k8s.io/apiserver/pkg/audit/request.go
+++ b/staging/src/k8s.io/apiserver/pkg/audit/request.go
@@ -196,9 +196,11 @@ func LogResponseObject(ctx context.Context, obj runtime.Object, gv schema.GroupV
if status, ok := obj.(*metav1.Status); ok {
// selectively copy the bounded fields.
ae.ResponseStatus = &metav1.Status{
- Status: status.Status,
- Reason: status.Reason,
- Code: status.Code,
+ Status: status.Status,
+ Message: status.Message,
+ Reason: status.Reason,
+ Details: status.Details,
+ Code: status.Code,
}
}
|
Issue <I>: Add messages+details to audit logs response (#<I>)
|
diff --git a/blocks/dock.js b/blocks/dock.js
index <HASH>..<HASH> 100644
--- a/blocks/dock.js
+++ b/blocks/dock.js
@@ -101,12 +101,7 @@ M.core_dock.init = function(Y) {
} else {
dock.addClass(css.dock+'_'+this.cfg.position+'_'+this.cfg.orientation);
}
- this.holdingarea = Y.Node.create('<div></div>').setStyles({
- position:'absolute',
- top:'-1000px',
- left:'-1000px',
- display:'none'
- });
+ this.holdingarea = Y.Node.create('<div></div>').setStyles({display:'none'});
this.nodes.body.append(this.holdingarea);
if (Y.UA.ie > 0 && Y.UA.ie < 7) {
// Adjust for IE 6 (can't handle fixed pos)
|
javascript dock MDL-<I> Fixed regression in last commit to dock
|
diff --git a/lib/active_remote/rpc.rb b/lib/active_remote/rpc.rb
index <HASH>..<HASH> 100644
--- a/lib/active_remote/rpc.rb
+++ b/lib/active_remote/rpc.rb
@@ -53,6 +53,11 @@ module ActiveRemote
end
end
+ def remote_call(rpc_method, request_args)
+ self._execute(rpc_method, request_args)
+ self.last_response
+ end
+
private
# Return a protobuf request object for the given rpc call.
|
Added an instance version of the remote_call method.
|
diff --git a/openquake/calculators/base.py b/openquake/calculators/base.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/base.py
+++ b/openquake/calculators/base.py
@@ -472,7 +472,6 @@ class HazardCalculator(BaseCalculator):
self.exposure = readinput.get_exposure(self.oqparam)
arefs = numpy.array(self.exposure.asset_refs, hdf5.vstr)
self.datastore['asset_refs'] = arefs
- self.datastore.flush()
self.datastore.set_attrs('asset_refs', nbytes=arefs.nbytes)
self.cost_calculator = readinput.get_cost_calculator(self.oqparam)
self.sitecol, self.assets_by_site = (
|
Removed a flush [skip CI]
|
diff --git a/src/passes/Pass.js b/src/passes/Pass.js
index <HASH>..<HASH> 100644
--- a/src/passes/Pass.js
+++ b/src/passes/Pass.js
@@ -143,7 +143,6 @@ export class Pass {
* Indicates whether this pass is enabled.
*
* @type {Boolean}
- * @deprecated Use isEnabled() and setEnabled() instead.
*/
this.enabled = true;
@@ -204,6 +203,7 @@ export class Pass {
/**
* Indicates whether this pass is enabled.
*
+ * @deprecated Use enabled instead.
* @return {Boolean} Whether this pass is enabled.
*/
@@ -216,6 +216,7 @@ export class Pass {
/**
* Enables or disables this pass.
*
+ * @deprecated Use enabled instead.
* @param {Boolean} value - Whether the pass should be enabled.
*/
|
Deprecate isEnabled and setEnabled
and revert deprecation of enabled flag.
|
diff --git a/sandman/model/models.py b/sandman/model/models.py
index <HASH>..<HASH> 100644
--- a/sandman/model/models.py
+++ b/sandman/model/models.py
@@ -138,3 +138,8 @@ class Model(object):
class AdminModelViewWithPK(ModelView):
"""Mixin admin view class that displays primary keys on the admin form"""
column_display_pk = True
+
+class AuthenticatedAdminModelView(ModelView):
+
+ def is_accessible(self):
+ raise NotImplementedError('You must implement the \'is_accessible\' method to use authorization.')
|
Add support for authenticated AdminViews
|
diff --git a/gwpy/segments/flag.py b/gwpy/segments/flag.py
index <HASH>..<HASH> 100644
--- a/gwpy/segments/flag.py
+++ b/gwpy/segments/flag.py
@@ -805,7 +805,7 @@ class DataQualityDict(OrderedDict):
"""))
@classmethod
- def from_veto_definer_file(cls, fp, start=None, end=None):
+ def from_veto_definer_file(cls, fp, start=None, end=None, ifo=None):
"""Read a `DataQualityDict` from a LIGO_LW XML VetoDefinerTable.
"""
# open file
@@ -818,13 +818,15 @@ class DataQualityDict(OrderedDict):
veto_def_table = VetoDefTable.get_table(xmldoc)
out = cls()
for row in veto_def_table:
- if start and row.end_time < start:
+ if ifo and row.ifo != ifo:
+ continue
+ if start and 0 < row.end_time < start:
continue
elif start:
row.start_time = max(row.start_time, start)
if end and row.start_time > end:
continue
- elif end and row.end_time == 0:
+ elif end and not row.end_time:
row.end_time = end
elif end:
row.end_time = min(row.end_time, end)
|
DataQualityDict.from_veto_definer_file: added ifo=None
- also fixed bug in zero end time
|
diff --git a/lib/haml/engine.rb b/lib/haml/engine.rb
index <HASH>..<HASH> 100644
--- a/lib/haml/engine.rb
+++ b/lib/haml/engine.rb
@@ -135,7 +135,7 @@ module Haml
count, line = count_soft_tabs(line)
suppress_render = handle_multiline(count, line, index)
- if !suppress_render && count && line
+ if !suppress_render && count && line && (line.strip.size > 0)
count, line = process_line(count, line, index)
end
end
|
This fixes the "blank line is not ignored" bug that has been around for a while.
This was reported by Steve Ross.
git-svn-id: svn://hamptoncatlin.com/haml/branches/edge@<I> <I>b-<I>-<I>-af8c-cdc<I>e<I>b9
|
diff --git a/src/main/resources/SparkContext.js b/src/main/resources/SparkContext.js
index <HASH>..<HASH> 100644
--- a/src/main/resources/SparkContext.js
+++ b/src/main/resources/SparkContext.js
@@ -283,20 +283,20 @@ with (imported) {
*/
SparkContext.prototype.accumulator = function() {
var initialValue = arguments[0];
- var name = null;
+ var name;
var param = new FloatAccumulatorParam();
this.logger.debug("accumulator " + initialValue);
- if (typeof arguments[1] === "string" ) {
- name = arguments[1];
- if (arguments[2]) {
- param = arguments[2];
- }
- } else {
- if (arguments[1]) {
+ if (arguments[1]) {
+ if (typeof arguments[1] === "string") {
+ name = arguments[1];
+ if (arguments[2]) {
+ param = arguments[2];
+ }
+ } else {
param = arguments[1];
}
- }
+ }
return new Accumulator(initialValue, param, name);
};
|
#<I> name should be undefined instead of null
|
diff --git a/lang/en/quiz.php b/lang/en/quiz.php
index <HASH>..<HASH> 100644
--- a/lang/en/quiz.php
+++ b/lang/en/quiz.php
@@ -273,7 +273,7 @@ $string['penalty'] = 'Penalty';
$string['penaltyfactor'] = 'Penalty factor';
$string['penaltyscheme'] = 'Apply penalties';
$string['percentcorrect'] = 'Percent Correct';
-$string['popup'] = 'Show quiz in a \"secure\" window';
+$string['popup'] = 'Show quiz in a "secure" window';
$string['popupnotice'] = 'Students will see this quiz in a secure window';
$string['preview'] = 'Preview';
$string['previewquestion'] = 'Preview question';
|
These quotes were going into (quoted) HTML attributes and breaking XHTML.
|
diff --git a/lib/player.js b/lib/player.js
index <HASH>..<HASH> 100644
--- a/lib/player.js
+++ b/lib/player.js
@@ -433,10 +433,12 @@ shaka.Player.prototype.configure = function(config) {
for (var kind in chosen) {
if ((kind == 'audio' && audioLangChanged) ||
(kind == 'text' && textLangChanged)) {
- if (this.switchingPeriods_)
+ if (this.switchingPeriods_) {
this.deferredSwitches_[kind] = chosen[kind];
- else
- this.streamingEngine_.switch(kind, chosen[kind]);
+ } else {
+ this.streamingEngine_.switch(kind, chosen[kind],
+ /* clearBuffer */ true);
+ }
}
}
}
|
Always clear buffer when changing languages
Otherwise, language changes do not take effect immediately.
Change-Id: Idfd2ea<I>aa4d<I>bf0da9ab<I>f<I>
|
diff --git a/src/createDispatcher.js b/src/createDispatcher.js
index <HASH>..<HASH> 100644
--- a/src/createDispatcher.js
+++ b/src/createDispatcher.js
@@ -130,8 +130,7 @@ Dispatcher.prototype.next = function next(arg) {
const { middlewares, scheduler } = this
let agenda = toObservable(arg)
.subscribeOn(scheduler)
- .publishReplay()
- .refCount()
+ .share()
for (let i = 0; i < middlewares.length; i++) {
const middleware = middlewares[i]
@@ -143,7 +142,9 @@ Dispatcher.prototype.next = function next(arg) {
}
return this.rawNext(agenda
- .filter(Boolean))
+ .filter(Boolean)
+ .publishReplay()
+ .refCount())
}
export default function createDispatcher(opts, middlewares) {
|
Share middleware agenda and replay agendas
|
diff --git a/tests/Convert/Converters/AbstractConverters/AbstractConverterTest.php b/tests/Convert/Converters/AbstractConverters/AbstractConverterTest.php
index <HASH>..<HASH> 100644
--- a/tests/Convert/Converters/AbstractConverters/AbstractConverterTest.php
+++ b/tests/Convert/Converters/AbstractConverters/AbstractConverterTest.php
@@ -25,5 +25,16 @@ class AbstractConverterTest extends TestCase
{
$this->assertEquals('image/jpeg', AbstractConverter::getMimeType(self::$imgDir . '/test.jpg'));
$this->assertEquals('image/png', AbstractConverter::getMimeType(self::$imgDir . '/test.png'));
+
+ $mimeTypeMaybeDetected = AbstractConverter::getMimeType(self::$imgDir . '/png-without-extension');
+ if ($mimeTypeMaybeDetected === false) {
+ // It was not detected, and that is ok!
+ // - it is not possible to detect mime type on all platforms. In case it could not be detected,
+ // - and file extension could not be mapped either, the method returns false.
+ $this->addToAssertionCount(1);
+ } else {
+ $this->assertEquals('image/png', $mimeTypeMaybeDetected);
+ }
+
}
}
|
Added testing when mimetype might not be detected. #<I>
|
diff --git a/lib/discordrb/light/integrations.rb b/lib/discordrb/light/integrations.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/light/integrations.rb
+++ b/lib/discordrb/light/integrations.rb
@@ -20,10 +20,13 @@ module Discordrb::Light
# @!visibility private
def initialize(data, bot)
@bot = bot
+
@revoked = data['revoked']
@type = data['type']
@name = data['name']
@id = data['id']
+
+ @integrations = data['integrations'].map { |e| Integration.new(e, self, bot) }
end
end
|
Parse the integrations in the Connection initializer
|
diff --git a/lib/order.js b/lib/order.js
index <HASH>..<HASH> 100644
--- a/lib/order.js
+++ b/lib/order.js
@@ -38,7 +38,7 @@ Order.get = function(client, id, callback){
};
Order.list = function(client, query, callback){
- if(arguments.length === 1){
+ if(arguments.length === 2){
callback = query;
query = client;
client = new Client();
|
fix order listing issue (#<I>)
* fix order listing issue
* disable prettier
|
diff --git a/src/ORM/Query.php b/src/ORM/Query.php
index <HASH>..<HASH> 100644
--- a/src/ORM/Query.php
+++ b/src/ORM/Query.php
@@ -720,7 +720,7 @@ class Query extends DatabaseQuery implements JsonSerializable
}
$count = ['count' => $query->func()->count('*')];
- $complex = count($query->clause('group')) || $query->clause('distinct');
+ $complex = count($query->clause('group')) || $query->clause('distinct') || $query->clause('having');
$complex = $complex || count($query->clause('union'));
if (!$complex) {
|
Adding having clause as another complex condition
|
diff --git a/packages/runner/src/iframe/iframe-model.js b/packages/runner/src/iframe/iframe-model.js
index <HASH>..<HASH> 100644
--- a/packages/runner/src/iframe/iframe-model.js
+++ b/packages/runner/src/iframe/iframe-model.js
@@ -51,8 +51,8 @@ export default class IframeModel {
this.state.url = url
}
- _updateLoading = (loading) => {
- this.state.loading = loading
+ _updateLoading = (isLoading) => {
+ this.state.isLoading = isLoading
}
_clearMessage = () => {
|
runner: fix loading spinner not displaying correctly
|
diff --git a/tests/bitExpert/Http/Middleware/Psr7/Prophiler/ProphilerMiddlewareUnitTest.php b/tests/bitExpert/Http/Middleware/Psr7/Prophiler/ProphilerMiddlewareUnitTest.php
index <HASH>..<HASH> 100644
--- a/tests/bitExpert/Http/Middleware/Psr7/Prophiler/ProphilerMiddlewareUnitTest.php
+++ b/tests/bitExpert/Http/Middleware/Psr7/Prophiler/ProphilerMiddlewareUnitTest.php
@@ -154,8 +154,6 @@ class ProphilerMiddlewareUnitTest extends \PHPUnit_Framework_TestCase
->method('getHeaderLine')
->will($this->returnValue('text/html'));
-
$this->middleware->__invoke($this->request, $this->response);
-
}
}
|
Fixed Codesniffer issues.
|
diff --git a/generators/generator-constants.js b/generators/generator-constants.js
index <HASH>..<HASH> 100644
--- a/generators/generator-constants.js
+++ b/generators/generator-constants.js
@@ -66,7 +66,7 @@ const DOCKER_COUCHBASE = 'couchbase:6.6.0';
const DOCKER_CASSANDRA = 'cassandra:3.11.9';
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04';
const DOCKER_NEO4J = 'neo4j:4.2.1';
-const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2020.10';
+const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2020.12';
const DOCKER_MEMCACHED = 'memcached:1.6.9-alpine';
const DOCKER_REDIS = 'redis:6.0.9';
const DOCKER_KEYCLOAK = 'jboss/keycloak:11.0.1'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
|
Update hazelcast/management-center docker image version to <I>
|
diff --git a/ProxyMiddleware/ProxyMiddleware.py b/ProxyMiddleware/ProxyMiddleware.py
index <HASH>..<HASH> 100644
--- a/ProxyMiddleware/ProxyMiddleware.py
+++ b/ProxyMiddleware/ProxyMiddleware.py
@@ -5,7 +5,7 @@
#
from functools import wraps
-from bottle import redirect, abort, request, HTTPError
+from bottle import redirect, abort, request, HTTPError, response
class ReverseProxied(object):
"""
@@ -73,3 +73,17 @@ def force_slash(fn):
else:
redirect(request.environ['SCRIPT_NAME'] + request.environ['PATH_INFO'] + '/')
return wrapped
+
+class ClickJackingPlugin(object):
+ name = "ClickJackingPlugin"
+ api = 2
+ keyword = "clickjack"
+
+ def setup(self, app):
+ pass
+
+ def apply(self, callback, route):
+ def wrapper(*args, **kwargs):
+ response.set_header('X-Frame-Options', "SAMEORIGIN")
+ return callback(*args, **kwargs)
+ return wrapper
|
Added Anticlickjacking bottle plugin
This whole module is bottle dependent who am i kidding
|
diff --git a/server/src/main/java/io/atomix/copycat/server/state/AbstractAppender.java b/server/src/main/java/io/atomix/copycat/server/state/AbstractAppender.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/io/atomix/copycat/server/state/AbstractAppender.java
+++ b/server/src/main/java/io/atomix/copycat/server/state/AbstractAppender.java
@@ -335,7 +335,7 @@ abstract class AbstractAppender implements AutoCloseable {
resetNextIndex(member);
// If there are more entries to send then attempt to send another commit.
- if (hasMoreEntries(member)) {
+ if (response.logIndex() != request.logIndex() && hasMoreEntries(member)) {
appendEntries(member);
}
}
|
Prevent infinite recursion in failed AppendRequest responses.
|
diff --git a/lib/specjour/dispatcher.rb b/lib/specjour/dispatcher.rb
index <HASH>..<HASH> 100644
--- a/lib/specjour/dispatcher.rb
+++ b/lib/specjour/dispatcher.rb
@@ -117,9 +117,7 @@ module Specjour
raise Timeout::Error
end
rescue Timeout::Error
- if replies.any?
- replies.each {|r| resolve_reply(r)}
- end
+ replies.each {|r| resolve_reply(r)}
end
def local_manager_needed?
|
Get clever with arrays. Don't check, just run!
|
diff --git a/code/extensions/RichLinksExtension.php b/code/extensions/RichLinksExtension.php
index <HASH>..<HASH> 100644
--- a/code/extensions/RichLinksExtension.php
+++ b/code/extensions/RichLinksExtension.php
@@ -40,8 +40,8 @@ class RichLinksExtension extends Extension {
}
// Inject extra attributes into the external links.
- $pattern = '/(<a.*)(href=\"http:\/\/[^\"]*\"[^>]*>.*<\/a>)/iU';
- $replacement = '$1class="external" rel="external" $2';
+ $pattern = '/(<a.*)(href=\"http:\/\/[^\"]*\"[^>]*>.*)(<\/a>)/iU';
+ $replacement = '$1class="external" rel="external" $2 <span class="nonvisual-indicator">(external link)</span> $3';
$content = preg_replace($pattern, $replacement, $content, -1);
return $content;
|
Added non-CSS display of external links
|
diff --git a/x10_any.py b/x10_any.py
index <HASH>..<HASH> 100644
--- a/x10_any.py
+++ b/x10_any.py
@@ -18,6 +18,8 @@ class X10InvalidHouseCode(X10BaseException):
def normalize_housecode(house_code):
if house_code is None:
raise X10InvalidHouseCode('%r is not a valid house code' % house_code)
+ if len(house_code) != 1:
+ raise X10InvalidHouseCode('%r is not a valid house code' % house_code)
house_code = house_code.upper()
if not ('A' <= house_code <= 'P'):
raise X10InvalidHouseCode('%r is not a valid house code' % house_code)
|
Validation of house code ready for larger testing/use
|
diff --git a/pyt/__main__.py b/pyt/__main__.py
index <HASH>..<HASH> 100644
--- a/pyt/__main__.py
+++ b/pyt/__main__.py
@@ -65,11 +65,9 @@ def retrieve_nosec_lines(
def main(command_line_args=sys.argv[1:]): # noqa: C901
args = parse_args(command_line_args)
- ui_mode = UImode.NORMAL
+ ui_mode = UImode.TRIM
if args.interactive:
ui_mode = UImode.INTERACTIVE
- elif args.trim_reassigned_in:
- ui_mode = UImode.TRIM
files = discover_files(
args.targets,
|
Removed reference to UImode.NORMAL
|
diff --git a/openquake/calculators/base.py b/openquake/calculators/base.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/base.py
+++ b/openquake/calculators/base.py
@@ -31,8 +31,9 @@ import numpy
from openquake.hazardlib.geo import geodetic
from openquake.baselib import general, hdf5
from openquake.baselib.performance import Monitor
+from openquake.risklib import riskinput, __version__
from openquake.commonlib import readinput, riskmodels, datastore, source
-from openquake.commonlib.oqvalidation import OqParam, __version__
+from openquake.commonlib.oqvalidation import OqParam
from openquake.commonlib.parallel import starmap, executor
from openquake.commonlib.views import view, rst_table, stats
from openquake.baselib.python3compat import with_metaclass
|
Fixed an import
Former-commit-id: <I>e1a<I>efea6b2f<I>ae<I>b<I>e6a<I>bc<I>
|
diff --git a/core/server/api/v0.1/oembed.js b/core/server/api/v0.1/oembed.js
index <HASH>..<HASH> 100644
--- a/core/server/api/v0.1/oembed.js
+++ b/core/server/api/v0.1/oembed.js
@@ -44,7 +44,8 @@ const oembed = {
function unknownProvider() {
return Promise.reject(new common.errors.ValidationError({
- message: common.i18n.t('errors.api.oembed.unknownProvider')
+ message: common.i18n.t('errors.api.oembed.unknownProvider'),
+ context: url
}));
}
diff --git a/core/server/api/v2/oembed.js b/core/server/api/v2/oembed.js
index <HASH>..<HASH> 100644
--- a/core/server/api/v2/oembed.js
+++ b/core/server/api/v2/oembed.js
@@ -52,7 +52,8 @@ module.exports = {
function unknownProvider() {
return Promise.reject(new common.errors.ValidationError({
- message: common.i18n.t('errors.api.oembed.unknownProvider')
+ message: common.i18n.t('errors.api.oembed.unknownProvider'),
+ context: url
}));
}
|
Add url as context to oembed unknownProvider error
- This is so that we can use logs to see urls that turn up with this error
|
diff --git a/lib/dante/version.rb b/lib/dante/version.rb
index <HASH>..<HASH> 100644
--- a/lib/dante/version.rb
+++ b/lib/dante/version.rb
@@ -1,3 +1,3 @@
module Dante
- VERSION = "0.1.5"
+ VERSION = "0.2.0"
end
|
Bump to <I> release!
|
diff --git a/tests/test_cls_file.py b/tests/test_cls_file.py
index <HASH>..<HASH> 100644
--- a/tests/test_cls_file.py
+++ b/tests/test_cls_file.py
@@ -44,6 +44,8 @@ class TestClassFile(unittest.TestCase):
#f.delete()
-
+ def test_99_main(self):
+ cl.TEST()
+
if __name__ == '__main__':
unittest.main()
|
cls_file test calls TEST
|
diff --git a/bw-util-xml/src/main/java/org/bedework/util/xml/tagdefs/BedeworkServerTags.java b/bw-util-xml/src/main/java/org/bedework/util/xml/tagdefs/BedeworkServerTags.java
index <HASH>..<HASH> 100644
--- a/bw-util-xml/src/main/java/org/bedework/util/xml/tagdefs/BedeworkServerTags.java
+++ b/bw-util-xml/src/main/java/org/bedework/util/xml/tagdefs/BedeworkServerTags.java
@@ -79,6 +79,10 @@ public class BedeworkServerTags {
public static final QName maxWebCalPeriod = new QName(bedeworkCaldavNamespace,
"maxWebCalPeriod");
+ /** */
+ public static final QName synchAdminCreateEpropsProperty = new QName(bedeworkCaldavNamespace,
+ "org.bedework.synchAdminCreateEprops");
+
/* used for property index */
/** */
|
Add a switch to admin client ui to control ability to create event properties (loc, contact, category) through the input stream. A number of changes to web support and caldav to support this.
|
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -29,12 +29,12 @@ module ActiveRecord
relation
end
- def select(*args)
+ def select(value = nil)
if block_given?
to_a.select {|*block_args| yield(*block_args) }
else
relation = clone
- relation.select_values += args if args.present?
+ relation.select_values += [value] if value
relation
end
end
|
select does not need a *args
|
diff --git a/lib/restify/adapter/typhoeus.rb b/lib/restify/adapter/typhoeus.rb
index <HASH>..<HASH> 100644
--- a/lib/restify/adapter/typhoeus.rb
+++ b/lib/restify/adapter/typhoeus.rb
@@ -43,7 +43,8 @@ module Restify
req = convert(request, writer)
if sync?
- req.run
+ @hydra.queue(req)
+ @hydra.run
else
debug 'request:add',
tag: request.object_id,
|
Use hydra for sync requests
The typhoeus adapter has a `sync: true` options that runs requests
inline in blocking fashion. This CL changes the internal implementation
to also use the existing hydra object for these requests. Options that
are set for hydra therefore apply to such requests too.
|
diff --git a/salt/states/svn.py b/salt/states/svn.py
index <HASH>..<HASH> 100644
--- a/salt/states/svn.py
+++ b/salt/states/svn.py
@@ -213,14 +213,14 @@ def export(name,
ret,
('{0} doesn\'t exist and is set to be checked out.').format(target))
svn_cmd = 'svn.list'
- opts += ('-r', 'HEAD')
+ rev = 'HEAD'
out = __salt__[svn_cmd](cwd, target, user, username, password, *opts)
return _neutral_test(
ret,
('{0}').format(out))
if rev:
- opts += ('-r', str(rev))
+ rev = 'HEAD'
if force:
opts += ('--force',)
@@ -231,7 +231,7 @@ def export(name,
if trust:
opts += ('--trust-server-cert',)
- out = __salt__[svn_cmd](cwd, name, basename, user, username, password, *opts)
+ out = __salt__[svn_cmd](cwd, name, basename, user, username, password, rev, *opts)
ret['changes'] = name + ' was Exported to ' + target
return ret
|
changed salt call to modules/svn.py svn.export function, added revision field to function call argument list
|
diff --git a/pyqode/core/api/utils.py b/pyqode/core/api/utils.py
index <HASH>..<HASH> 100644
--- a/pyqode/core/api/utils.py
+++ b/pyqode/core/api/utils.py
@@ -334,6 +334,8 @@ class TextHelper(object):
"""
Removes trailing whitespaces and ensure one single blank line at the
end of the QTextDocument.
+
+ ..deprecated: since pyqode 2.6.3, document is cleaned on disk only.
"""
editor = self._editor
value = editor.verticalScrollBar().value()
@@ -359,16 +361,16 @@ class TextHelper(object):
removed.add(line + j)
editor._modified_lines -= removed
- # # ensure there is only one blank line left at the end of the file
- # i = self.line_count()
- # while i:
- # line = self.line_text(i - 1)
- # if line.strip():
- # break
- # self.remove_last_line()
- # i -= 1
- # if self.line_text(self.line_count() - 1):
- # editor.appendPlainText('')
+ # ensure there is only one blank line left at the end of the file
+ i = self.line_count()
+ while i:
+ line = self.line_text(i - 1)
+ if line.strip():
+ break
+ self.remove_last_line()
+ i -= 1
+ if self.line_text(self.line_count() - 1):
+ editor.appendPlainText('')
# restore cursor and scrollbars
text_cursor = editor.textCursor()
|
Mark clean_document as deprecated
|
diff --git a/lib/plugin.template.js b/lib/plugin.template.js
index <HASH>..<HASH> 100755
--- a/lib/plugin.template.js
+++ b/lib/plugin.template.js
@@ -19,8 +19,9 @@ const adsbygoogle = {
'data-analytics-uacct': this.analyticsUacct ? this.analyticsUacct : null,
'data-analytics-domain-name': this.analyticsDomainName ? this.analyticsDomainName : null,
'data-adtest': <%= options.test ? '\'on\'' : 'null' %>,
- 'data-adsbygoogle-status': this.show ? null : ''
- },
+ 'data-adsbygoogle-status': this.show ? null : '',
+ 'data-full-width-responsive': this.fullWidthResponsive || null,
+ },
domProps: {
innerHTML: this.show ? '' : ' '
},
@@ -68,6 +69,10 @@ const adsbygoogle = {
includeQuery: {
type: Boolean,
default: <%= options.includeQuery %>
+ },
+ fullWidthResponsive: {
+ type: Boolean,
+ default: false
}
},
data () {
|
feat: Add support for full width responsive prop (#<I>)
|
diff --git a/test/unit/test_service_models.py b/test/unit/test_service_models.py
index <HASH>..<HASH> 100644
--- a/test/unit/test_service_models.py
+++ b/test/unit/test_service_models.py
@@ -398,9 +398,7 @@ class HostCollectionTest(
)
self.host_factory_mock = self.host_factory_patcher.start()
- side_effect = lru_cache()(
- host_collection_host_factory
- )
+ side_effect = host_collection_host_factory
self.host_factory_mock.side_effect = side_effect
self.tested_instance = HostCollection('test_host_collection',
self.classification)
|
Remove lru_cache decorator host_factory_mock used in HostCollectionTest
Making sure host_collection_host_factory always returns the same instance of
Mock for given host value is not necessary.
|
diff --git a/reef-common/src/main/java/com/microsoft/reef/util/EnvironmentUtils.java b/reef-common/src/main/java/com/microsoft/reef/util/EnvironmentUtils.java
index <HASH>..<HASH> 100644
--- a/reef-common/src/main/java/com/microsoft/reef/util/EnvironmentUtils.java
+++ b/reef-common/src/main/java/com/microsoft/reef/util/EnvironmentUtils.java
@@ -38,7 +38,8 @@ public final class EnvironmentUtils {
* @return A set of classpath entries as strings.
*/
public static Set<String> getAllClasspathJars() {
- return getAllClasspathJars("JAVA_HOME", "YARN_HOME", "HADOOP_HOME");
+ return getAllClasspathJars("JAVA_HOME", "YARN_HOME", "HADOOP_HOME",
+ "HADOOP_YARN_HOME", "HADOOP_COMMON_HOME", "HADOOP_MAPRED_HOME", "HADOOP_HDFS_HOME");
}
/**
|
exclude more hadoop paths - used when uploading jars to the remote nodes
|
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index <HASH>..<HASH> 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -41,11 +41,21 @@ class Piwik_Goals extends Piwik_Plugin
'API.getReportMetadata.end' => 'getReportMetadata',
'WidgetsList.add' => 'addWidgets',
'Menu.add' => 'addMenus',
+ 'SitesManager.deleteSite' => 'deleteSiteGoals',
);
return $hooks;
}
/**
+ * Delete goals recorded for this site
+ */
+ function deleteSiteGoals($notification )
+ {
+ $idSite = &$notification->getNotificationObject();
+ Piwik_Query("DELETE FROM ".Piwik_Common::prefixTable('goal') . " WHERE idsite = ? ", array($idSite));
+ }
+
+ /**
* Returns the Metadata for the Goals plugin API.
* The API returns general Goal metrics: conv, conv rate and revenue globally
* and for each goal.
|
Fixes #<I> Now, every entity linked to a site is deleted when a site is deleted.
Only the logs and archives are not deleted, because it could result in severe data loss. Better deal with this later on..
git-svn-id: <URL>
|
diff --git a/atlassian/rest_client.py b/atlassian/rest_client.py
index <HASH>..<HASH> 100644
--- a/atlassian/rest_client.py
+++ b/atlassian/rest_client.py
@@ -52,11 +52,11 @@ class AtlassianRestAPI(object):
try:
import kerberos as kerb
except ImportError as e:
- log.error(e)
+ log.debug(e)
try:
import kerberos_sspi as kerb
except ImportError:
- log.info("Please, fix issue with dependency of kerberos")
+ log.error("Please, fix issue with dependency of kerberos")
return
__, krb_context = kerb.authGSSClientInit(kerberos_service)
kerb.authGSSClientStep(krb_context, "")
|
Loglevel of package imports adjusted.
|
diff --git a/rgcompare.py b/rgcompare.py
index <HASH>..<HASH> 100755
--- a/rgcompare.py
+++ b/rgcompare.py
@@ -247,7 +247,9 @@ class RobotComparison(Tk.Tk):
self.mainloop()
except KeyboardInterrupt:
self.abort()
-
+ finally:
+ for i,p in enumerate(self.processes):
+ self.task_queue.put('STOP')
def initialize(self):
print "Initialising with players",str(self.players)
|
Reverted accidental removal that resulted in zombie processes. (Thanks Sh4rK)
|
diff --git a/BimServer/src/org/bimserver/database/DatabaseSession.java b/BimServer/src/org/bimserver/database/DatabaseSession.java
index <HASH>..<HASH> 100644
--- a/BimServer/src/org/bimserver/database/DatabaseSession.java
+++ b/BimServer/src/org/bimserver/database/DatabaseSession.java
@@ -1496,7 +1496,7 @@ public class DatabaseSession implements LazyLoader, OidProvider {
buffer.putShort(cid);
IdEObject idEObject = (IdEObject) value;
if (idEObject.getOid() == -1) {
- ((IdEObjectImpl)idEObject).setOid(newOid());
+ ((IdEObjectImpl)idEObject).setOid(newOid(object.eClass()));
((IdEObjectImpl)idEObject).setPid(object.getPid());
((IdEObjectImpl)idEObject).setRid(object.getRid());
}
|
Merge conflict with myself ?!?
|
diff --git a/src/main/java/org/gitlab4j/api/ProjectApi.java b/src/main/java/org/gitlab4j/api/ProjectApi.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/gitlab4j/api/ProjectApi.java
+++ b/src/main/java/org/gitlab4j/api/ProjectApi.java
@@ -1127,9 +1127,8 @@ public class ProjectApi extends AbstractApi implements Constants {
* @param projectId the project ID to get team member for
* @param userId the user ID of the member
* @return the member specified by the project ID/user ID pair
- * @throws GitLabApiException if any exception occurs
*/
- public Optional<Member> getOptionalMember(Integer projectId, Integer userId) throws GitLabApiException {
+ public Optional<Member> getOptionalMember(Integer projectId, Integer userId) {
try {
return (Optional.ofNullable(getMember(projectId, userId)));
} catch (GitLabApiException glae) {
|
Removed throws clause fro getOptionalMember() (#<I>).
|
diff --git a/gui.go b/gui.go
index <HASH>..<HASH> 100644
--- a/gui.go
+++ b/gui.go
@@ -84,8 +84,8 @@ func NewGui(mode OutputMode) (*Gui, error) {
g.maxX, g.maxY = termbox.Size()
- g.BgColor, g.FgColor = ColorBlack, ColorWhite
- g.SelBgColor, g.SelFgColor = ColorBlack, ColorWhite
+ g.BgColor, g.FgColor = ColorDefault, ColorDefault
+ g.SelBgColor, g.SelFgColor = ColorDefault, ColorDefault
return g, nil
}
|
Use ColorDefault as default bg and fg color
|
diff --git a/interp/interp_test.go b/interp/interp_test.go
index <HASH>..<HASH> 100644
--- a/interp/interp_test.go
+++ b/interp/interp_test.go
@@ -3713,6 +3713,8 @@ func TestElapsedString(t *testing.T) {
true,
"610.00",
},
+ {31 * time.Second, false, "0m31.000s"},
+ {102 * time.Second, false, "1m42.000s"},
}
for _, tc := range tests {
t.Run(tc.in.String(), func(t *testing.T) {
diff --git a/interp/runner.go b/interp/runner.go
index <HASH>..<HASH> 100644
--- a/interp/runner.go
+++ b/interp/runner.go
@@ -709,7 +709,7 @@ func elapsedString(d time.Duration, posix bool) string {
return fmt.Sprintf("%.2f", d.Seconds())
}
min := int(d.Minutes())
- sec := math.Remainder(d.Seconds(), 60.0)
+ sec := math.Mod(d.Seconds(), 60.0)
return fmt.Sprintf("%dm%.3fs", min, sec)
}
|
interp: avoid negative elapsed durations in the time builtin
Change the operation to calculate the elapsed seconds from Remainder to Mod,
as Remainder can return negative values.
Fixes #<I>.
|
diff --git a/ecs-init/volumes/efs_mount_helper.go b/ecs-init/volumes/efs_mount_helper.go
index <HASH>..<HASH> 100644
--- a/ecs-init/volumes/efs_mount_helper.go
+++ b/ecs-init/volumes/efs_mount_helper.go
@@ -92,7 +92,9 @@ func getPath(binary string) (string, error) {
var runUnmount = runUnmountCommand
func runUnmountCommand(path string, target string) error {
- umountCmd := exec.Command(path, target)
+ // In case of awsvpc network mode, when we unmount the volume, task network namespace has been deleted
+ // and nfs server is no longer reachable, so umount will hang. Hence doing lazy unmount here.
+ umountCmd := exec.Command(path, "-l", target)
return runCmd(umountCmd)
}
|
Lazy unmount efs volume.
In case of awsvpc network mode, when we unmount the volume, task network namespace has been deleted and nfs server is no longer reachable, so umount will hang. Hence doing lazy unmount.
|
diff --git a/client/index.js b/client/index.js
index <HASH>..<HASH> 100644
--- a/client/index.js
+++ b/client/index.js
@@ -79,7 +79,8 @@ var onSocketMsg = {
},
"log-level": function(level) {
var hotCtx = require.context("webpack/hot", false, /^\.\/log$/);
- if(hotCtx.keys().length > 0) {
+ var contextKeys = hotCtx.keys();
+ if(contextKeys.length && contextKeys["./log"]) {
hotCtx("./log").setLogLevel(level);
}
switch(level) {
|
Proposed fix for ./log module not found (#<I>)
* Proposed fix for ./log module not found
* Fixed code
* Replaces spaces with tabs..
|
diff --git a/lib/ohai/mixin/os.rb b/lib/ohai/mixin/os.rb
index <HASH>..<HASH> 100644
--- a/lib/ohai/mixin/os.rb
+++ b/lib/ohai/mixin/os.rb
@@ -73,7 +73,7 @@ module Ohai
# if it was not caught above, we MUST translate whatever train uses as the 'os' into the proper ruby host_os
# string. If it is not unix and not caught above we assume it is something like a REST API which cannot run
# ruby. If these assumptions are incorrect then it is a bug, which should be submitted to fix it, and the
- # values should not be relied upon until that bug is fixed. The train os is NEVER considered authoritataive
+ # values should not be relied upon until that bug is fixed. The train os is NEVER considered authoritative
# for any target which can run ruby.
#
when transport_connection.os.unix?
|
Update lib/ohai/mixin/os.rb
|
diff --git a/src/main/java/com/hmsonline/trident/cql/incremental/CassandraCqlIncrementalState.java b/src/main/java/com/hmsonline/trident/cql/incremental/CassandraCqlIncrementalState.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/hmsonline/trident/cql/incremental/CassandraCqlIncrementalState.java
+++ b/src/main/java/com/hmsonline/trident/cql/incremental/CassandraCqlIncrementalState.java
@@ -39,7 +39,13 @@ public class CassandraCqlIncrementalState<K, V> implements State {
Statement readStatement = mapper.read(entry.getKey());
ResultSet resultSet = clientFactory.getSession().execute(readStatement);
V persistedValue = mapper.currentValue(resultSet);
- V combinedValue = aggregator.combine(entry.getValue(), persistedValue);
+ V combinedValue;
+ // TODO: more elegant solution to this issue
+ // Must be careful here as the first persisted value might not exist yet!
+ if ( persistedValue != null )
+ combinedValue = aggregator.combine(entry.getValue(), persistedValue);
+ else
+ combinedValue = entry.getValue();
Statement updateStatement = mapper.update(entry.getKey(), combinedValue);
clientFactory.getSession().execute(updateStatement);
}
|
Checked for null persisted value for new dbs
|
diff --git a/src/Growl.php b/src/Growl.php
index <HASH>..<HASH> 100644
--- a/src/Growl.php
+++ b/src/Growl.php
@@ -47,17 +47,16 @@ class Growl
}
/**
- * Implement the __call magic method to provide an expressive way of setting
- * options for commands.
+ * Set options for Builders with a key/value.
*
- * @param string $name The name of the method called.
- * @param array $args An array of the supplied arguments.
+ * @param string $key The key.
+ * @param array $value The value of the key.
*
* @return $this
*/
- public function __call($name, $args)
+ public function set($key, $value)
{
- $this->options[$name] = $args[0];
+ $this->options[$key] = $value;
return $this;
}
|
Use set() method instead of __call magic method
|
diff --git a/lib/jsdom/browser/domtohtml.js b/lib/jsdom/browser/domtohtml.js
index <HASH>..<HASH> 100644
--- a/lib/jsdom/browser/domtohtml.js
+++ b/lib/jsdom/browser/domtohtml.js
@@ -92,15 +92,15 @@ var stringifyElement = function(element) {
var formatHTML = function(html) {
var formatted = '',
reg = /(>)(<)(\/*)/g,
- html = html.replace(reg, '$1\r\n$2$3'),
pad = 0,
tags = [];
- for (i in singleTags) {
+ for (var i in singleTags) {
tags.push(i);
}
tags = '<' + tags.join('|<');
+ html = html.replace(/(<(\/?\w+).*?>)(?=<(?!\/\2))/gi, '$1\r\n');
html.split('\r\n').forEach(function(node, index) {
var indent = 0, padding = '', i;
|
Don't break and indent empty tags, especially <textarea></textarea> as the resulting whitespace would be interpreted as literal field-value by the browser.
|
diff --git a/satin/aapp1b.py b/satin/aapp1b.py
index <HASH>..<HASH> 100644
--- a/satin/aapp1b.py
+++ b/satin/aapp1b.py
@@ -72,9 +72,13 @@ def load_avhrr(satscene, options):
if len(file_list) > 1:
raise IOError("More than one l1b file matching!")
elif len(file_list) == 0:
- raise IOError("No l1b file matching!")
+ raise IOError("No l1b file matching!: "+
+ satscene.time_slot.strftime(filename))
+ filename = file_list[0]
+
+ LOG.debug("Loading from " + filename)
avh = avhrr.avhrr(filename)
avh.get_unprojected()
|
Cosmetics: enhanced error description and debug message in aapp1b, giving names to loaded/missing files.
|
diff --git a/Cake/Utility/Inflector.php b/Cake/Utility/Inflector.php
index <HASH>..<HASH> 100644
--- a/Cake/Utility/Inflector.php
+++ b/Cake/Utility/Inflector.php
@@ -715,7 +715,7 @@ class Inflector {
sprintf('/^[%s]+|[%s]+$/', $quotedReplacement, $quotedReplacement) => '',
);
- $string = str_replace(array_keys(self::$_transliteration), array_values(self::$_transliteration), $string);
+ $string = str_replace(array_keys(static::$_transliteration), array_values(static::$_transliteration), $string);
return preg_replace(array_keys($map), array_values($map), $string);
}
|
changes calls from self:: to static:: in Inflector::slug
|
diff --git a/lib/prey/agent.js b/lib/prey/agent.js
index <HASH>..<HASH> 100644
--- a/lib/prey/agent.js
+++ b/lib/prey/agent.js
@@ -158,7 +158,7 @@ var Agent = self = {
if (!err){
- program.connection_found = connected;
+ program.connection_found = true;
hooks.trigger('connection_found');
if (callback) callback(true);
|
Fixed program.connection_found setter.
|
diff --git a/lib/accesslib.php b/lib/accesslib.php
index <HASH>..<HASH> 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -3924,6 +3924,9 @@ function get_assignable_roles ($context, $field="name") {
$roles[$r->id] = $r->{$field};
}
}
+ foreach ($roles as $roleid => $rolename) {
+ $roles[$roleid] = strip_tags(format_string($rolename, true));
+ }
return $roles;
}
|
Make sure that the role names gets filtered in get_assignable_roles()
|
diff --git a/packages/react-dev-utils/formatWebpackMessages.js b/packages/react-dev-utils/formatWebpackMessages.js
index <HASH>..<HASH> 100644
--- a/packages/react-dev-utils/formatWebpackMessages.js
+++ b/packages/react-dev-utils/formatWebpackMessages.js
@@ -177,6 +177,11 @@ function formatWebpackMessages(json) {
// preceding a much more useful Babel syntax error.
result.errors = result.errors.filter(isLikelyASyntaxError);
}
+ // Only keep the first error. Others are often indicative
+ // of the same problem, but confuse the reader with noise.
+ if (result.errors.length > 1) {
+ result.errors.length = 1;
+ }
return result;
}
|
Only show first error (#<I>)
|
diff --git a/sos/sosreport.py b/sos/sosreport.py
index <HASH>..<HASH> 100644
--- a/sos/sosreport.py
+++ b/sos/sosreport.py
@@ -35,6 +35,7 @@ supplied for application-specific information
import sys
import traceback
import os
+import errno
import logging
from optparse import OptionParser, Option
from sos.plugins import import_plugin
@@ -903,17 +904,24 @@ class SoSReport(object):
self.soslog.error("%s\n%s" % (plugin_name, traceback.format_exc()))
def prework(self):
+ self.policy.pre_work()
try:
- self.policy.pre_work()
self.ui_log.info(_(" Setting up archive ..."))
self._set_archive()
self._make_archive_paths()
+ return
+ except OSError as e:
+ if e.errno in (errno.ENOSPC, errno.EROFS):
+ self.ui_log.error("")
+ self.ui_log.error(" %s while setting up archive" % e.strerror)
+ self.ui_log.error(" %s" % e.filename)
except Exception as e:
import traceback
+ self.ui_log.error("")
self.ui_log.error(" Unexpected exception setting up archive:")
traceback.print_exc(e)
self.ui_log.error(e)
- self._exit(1)
+ self._exit(1)
def setup(self):
self.ui_log.info(_(" Setting up plugins ..."))
|
Check for file system errors when setting up archive
Check for ENOSPC and EROFS when setting up the archive directory
structure and exit with failure and an error message.
|
diff --git a/examples/providers/factory_attribute_injections.py b/examples/providers/factory_attribute_injections.py
index <HASH>..<HASH> 100644
--- a/examples/providers/factory_attribute_injections.py
+++ b/examples/providers/factory_attribute_injections.py
@@ -17,7 +17,7 @@ class Container(containers.DeclarativeContainer):
client = providers.Factory(Client)
service = providers.Factory(Service)
- service.add_attributes(clent=client)
+ service.add_attributes(client=client)
if __name__ == '__main__':
|
Fixed a typo in Factory provider docs "service.add_attributes(clent=client)" #<I> (#<I>)
|
diff --git a/component/DateTimePicker.js b/component/DateTimePicker.js
index <HASH>..<HASH> 100644
--- a/component/DateTimePicker.js
+++ b/component/DateTimePicker.js
@@ -46,7 +46,7 @@ class DateTimePicker extends Component {
handleDateChange(date){
let {hour, minute, second} = this.state
// intialize default time
- if (!hour || !minute || !second) {
+ if (hour === undefined || minute === undefined || second === undefined) {
let nowDateObj = extractDate(new Date(), { showTime: true })
hour = nowDateObj.hour
minute = nowDateObj.minute
diff --git a/lib/DateTimePicker.js b/lib/DateTimePicker.js
index <HASH>..<HASH> 100644
--- a/lib/DateTimePicker.js
+++ b/lib/DateTimePicker.js
@@ -81,7 +81,7 @@ var DateTimePicker = function (_Component) {
second = _state.second;
// intialize default time
- if (!hour || !minute || !second) {
+ if (hour === undefined || minute === undefined || second === undefined) {
var nowDateObj = extractDate(new Date(), { showTime: true });
hour = nowDateObj.hour;
minute = nowDateObj.minute;
|
fixes #<I> Datetime picker initial value error when hour, minute or second is 0
|
diff --git a/lib/Core/Site/Values/Location.php b/lib/Core/Site/Values/Location.php
index <HASH>..<HASH> 100644
--- a/lib/Core/Site/Values/Location.php
+++ b/lib/Core/Site/Values/Location.php
@@ -216,8 +216,9 @@ final class Location extends APILocation
private function getContent()
{
if ($this->internalContent === null) {
- $this->internalContent = $this->site->getLoadService()->loadContent(
- $this->contentInfo->id
+ $this->internalContent = $this->domainObjectMapper->mapContent(
+ $this->innerVersionInfo,
+ $this->languageCode
);
}
|
Use DomainObjectMapper to obtain Location's Content
|
diff --git a/dist/chef/sa-monitoring/libraries/sa-monitoring.rb b/dist/chef/sa-monitoring/libraries/sa-monitoring.rb
index <HASH>..<HASH> 100644
--- a/dist/chef/sa-monitoring/libraries/sa-monitoring.rb
+++ b/dist/chef/sa-monitoring/libraries/sa-monitoring.rb
@@ -17,7 +17,7 @@ module SAM
config.merge!(databag)
- return config
+ JSON.pretty_generate(config)
end
end
|
config will be pretty generated json
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.