diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/discovery/gossiper.go b/discovery/gossiper.go
index <HASH>..<HASH> 100644
--- a/discovery/gossiper.go
+++ b/discovery/gossiper.go
@@ -251,6 +251,7 @@ func (d *AuthenticatedGossiper) SynchronizeNode(pub *btcec.PublicKey) error {
NodeID: node.PubKey,
Alias: alias,
Features: node.Features.RawFeatureVector,
+ RGBColor: node.Color,
}
announceMessages = append(announceMessages, ann) | discovery: properly set node's color when syncing graph state
This commit fixes an existing bug wherein we would blank out a node’s
color instead of properly setting the field when syncing graph state
with another node This would cause the node to reject the node
announcement and we would generate an we would invalidate the signature
of the node announcement. We fix this simply by properly setting the
node announcement. |
diff --git a/models/repo.go b/models/repo.go
index <HASH>..<HASH> 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -831,11 +831,11 @@ func GetCollaborativeRepos(uname string) ([]*Repository, error) {
repos := make([]*Repository, 0, 10)
for _, access := range accesses {
- if strings.HasPrefix(access.RepoName, uname) {
+ infos := strings.Split(access.RepoName, "/")
+ if infos[0] == uname {
continue
}
-
- infos := strings.Split(access.RepoName, "/")
+
u, err := GetUserByName(infos[0])
if err != nil {
return nil, err | Using strings.HasPrefix(...) will misjudgement
`strings.HasPrefix(access.RepoName, uname)` can't handle the situation which like following in access table.
user_name | repo_name
----------+-------------
toby | toby/blog
toby | toby/test
toby | tobyzxj/blog
toby | tobyzxj/test |
diff --git a/superset/assets/javascripts/SqlLab/reducers.js b/superset/assets/javascripts/SqlLab/reducers.js
index <HASH>..<HASH> 100644
--- a/superset/assets/javascripts/SqlLab/reducers.js
+++ b/superset/assets/javascripts/SqlLab/reducers.js
@@ -242,10 +242,9 @@ export const sqlLabReducer = function (state, action) {
let change = false;
for (const id in action.alteredQueries) {
const changedQuery = action.alteredQueries[id];
- if (
- state.queries[id].state !== 'stopped' &&
- (!state.queries.hasOwnProperty(id) ||
- state.queries[id].changedOn !== changedQuery.changedOn)) {
+ if (!state.queries.hasOwnProperty(id) ||
+ (state.queries[id].changedOn !== changedQuery.changedOn &&
+ state.queries[id].state !== 'stopped')) {
newQueries[id] = Object.assign({}, state.queries[id], changedQuery);
change = true;
} | Check if the query is in state first. (#<I>) |
diff --git a/src/Pingpong/Admin/AdminServiceProvider.php b/src/Pingpong/Admin/AdminServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/Pingpong/Admin/AdminServiceProvider.php
+++ b/src/Pingpong/Admin/AdminServiceProvider.php
@@ -97,7 +97,7 @@ class AdminServiceProvider extends ServiceProvider {
$this->registerFacades();
- $this->registerEvents();
+ $this->registerRoutes();
}
/**
@@ -105,7 +105,7 @@ class AdminServiceProvider extends ServiceProvider {
*
* @return void
*/
- public function registerEvents()
+ public function registerRoutes()
{
$this->app->booted(function ()
{ | Renamed registerEvents to registerRoutes |
diff --git a/Cheque.php b/Cheque.php
index <HASH>..<HASH> 100644
--- a/Cheque.php
+++ b/Cheque.php
@@ -16,10 +16,11 @@ use Propel\Runtime\Connection\ConnectionInterface;
use Thelia\Install\Database;
use Thelia\Model\MessageQuery;
use Thelia\Model\Order;
+use Thelia\Module\AbstractPaymentModule;
use Thelia\Module\BaseModule;
use Thelia\Module\PaymentModuleInterface;
-class Cheque extends BaseModule implements PaymentModuleInterface
+class Cheque extends AbstractPaymentModule
{
const MESSAGE_DOMAIN = "Cheque"; | Improvement on delivery events (#<I>) |
diff --git a/java/server/src/org/openqa/selenium/netty/server/RequestConverter.java b/java/server/src/org/openqa/selenium/netty/server/RequestConverter.java
index <HASH>..<HASH> 100644
--- a/java/server/src/org/openqa/selenium/netty/server/RequestConverter.java
+++ b/java/server/src/org/openqa/selenium/netty/server/RequestConverter.java
@@ -68,7 +68,7 @@ class RequestConverter extends SimpleChannelInboundHandler<HttpObject> {
return;
}
- if (nettyRequest.headers().contains("Sec-WebSocket-Version") ||
+ if (nettyRequest.headers().contains("Sec-WebSocket-Version") &&
"upgrade".equals(nettyRequest.headers().get("Connection"))) {
// Pass this on to later in the pipeline.
ReferenceCountUtil.retain(msg); | Update RequestConverter upgrade header handling. (#<I>) |
diff --git a/graph/api/src/main/java/org/jboss/windup/graph/service/FileService.java b/graph/api/src/main/java/org/jboss/windup/graph/service/FileService.java
index <HASH>..<HASH> 100644
--- a/graph/api/src/main/java/org/jboss/windup/graph/service/FileService.java
+++ b/graph/api/src/main/java/org/jboss/windup/graph/service/FileService.java
@@ -12,7 +12,6 @@ import org.jboss.windup.graph.GraphContext;
import org.jboss.windup.graph.TitanUtil;
import org.jboss.windup.graph.frames.FramedVertexIterable;
import org.jboss.windup.graph.model.WindupFrame;
-import org.jboss.windup.graph.model.WindupVertexFrame;
import org.jboss.windup.graph.model.resource.FileModel;
import org.jboss.windup.util.ExecutionStatistics;
@@ -42,6 +41,12 @@ public class FileService extends GraphService<FileModel>
entry.setParentFile(parentFile);
}
+ if (entry.getParentFile() == null && parentFile != null)
+ {
+ // Deal with an odd corner case, that probably only happens in my test environment.
+ entry.setParentFile(parentFile);
+ }
+
ExecutionStatistics.get().end("FileService.createByFilePath(parentFile, filePath)");
return entry;
} | Fixed a case where the fileservice doesn't behave well if a filemodel entry was precreated.
This really only occurs in odd ege cases. For example, if you were to analyze a source directory which contained a user rules directory. The configuration would create FileModels
for the rules directory, which would later be reused, but their parents wouldn't be setup correctly. |
diff --git a/rake-tasks/crazy_fun/mappings/visualstudio.rb b/rake-tasks/crazy_fun/mappings/visualstudio.rb
index <HASH>..<HASH> 100644
--- a/rake-tasks/crazy_fun/mappings/visualstudio.rb
+++ b/rake-tasks/crazy_fun/mappings/visualstudio.rb
@@ -369,7 +369,11 @@ module CrazyFunDotNet
if Rake::Task.task_defined? package_dependency_task
package_id = Rake::Task[package_dependency_task].out
else
- package_version = dep.fetch(package_id)
+ # For package dependencies, specify the *exact* version of
+ # the dependency, since we're tightly bound because we use
+ # csc.exe to build instead of loose versioning via Visual
+ # Studio.
+ package_version = "[#{dep.fetch(package_id)}]"
end
nuspec_task.dependency package_id, package_version
end | JimEvans: Change NuGet packages to depend on exact version references, rather than range. This fix will be deployed in the next NuGet package release. Fixes issue #<I>
r<I> |
diff --git a/lib/node-gyp.js b/lib/node-gyp.js
index <HASH>..<HASH> 100644
--- a/lib/node-gyp.js
+++ b/lib/node-gyp.js
@@ -83,6 +83,7 @@ proto.configDefs = {
, proxy: String // 'install'
, nodedir: String // 'configure'
, loglevel: String // everywhere
+ , python: String // 'configure'
}
/** | configure: add "python" to the nopt config definition
Makes "node-gyp rebuild --python /usr/bin/python<I>`
(with " " instead of "=") work properly. Fixes #<I>. |
diff --git a/src/block.js b/src/block.js
index <HASH>..<HASH> 100644
--- a/src/block.js
+++ b/src/block.js
@@ -52,7 +52,7 @@ Object.assign(Block.prototype, SimpleBlock.fn, require('./block-validations'), {
icon_name: 'default',
validationFailMsg: function() {
- return i18n.t('errors:validation_fail', { type: this.title });
+ return i18n.t('errors:validation_fail', { type: _.isFunction(this.title) ? this.title() : this.title });
},
editorHTML: '<div class="st-block__editor"></div>', | Fix error TypeError in validationFailMsg
If `this.title` is not function then method `validationFailMsg` throws exception:
```
TypeError: this.title is not a function(…)
```
If this error occurs on `on_post` form's event - browser reloaded and data magically way didn't saved. |
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -106,6 +106,10 @@ class RedisMock extends EventEmitter {
return mock;
}
+ duplicate() {
+ return this.createConnectedClient()
+ }
+
// eslint-disable-next-line class-methods-use-this
disconnect() {
const removeFrom = ({ instanceListeners }) => { | fix: Add duplicate function to support instance duplication for TypeScript mocks (#<I>) |
diff --git a/lib/responses/methods/index.js b/lib/responses/methods/index.js
index <HASH>..<HASH> 100644
--- a/lib/responses/methods/index.js
+++ b/lib/responses/methods/index.js
@@ -189,7 +189,15 @@ module.exports = {
var res = this.res;
var req = this.req;
- if (!data) data = {};
+ if (typeof data == 'string') {
+ res.addMessage('error', {
+ text: data
+ });
+
+ data = null;
+ } else if (!data) {
+ data = {};
+ }
res.status(403); | add suport to send messages in forbidden response |
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -118,6 +118,20 @@ describe Event do
Event.cleanup_expired!
expect(Event.find_by_id(event.id)).not_to be_nil
end
+
+ it "always keeps the latest Event regardless of its expires_at value only if the database is MySQL" do
+ Event.delete_all
+ event1 = agents(:jane_weather_agent).create_event expires_at: 1.minute.ago
+ event2 = agents(:bob_weather_agent).create_event expires_at: 1.minute.ago
+
+ Event.cleanup_expired!
+ case ActiveRecord::Base.connection
+ when ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
+ expect(Event.all.pluck(:id)).to eq([event2.id])
+ else
+ expect(Event.all.pluck(:id)).to be_empty
+ end
+ end
end
describe "after destroy" do | Add a spec for the change |
diff --git a/holoviews/core/element.py b/holoviews/core/element.py
index <HASH>..<HASH> 100644
--- a/holoviews/core/element.py
+++ b/holoviews/core/element.py
@@ -570,7 +570,8 @@ class AxisLayout(UniformNdMapping):
# NOTE: If further composite types supporting Overlaying and Layout these
# classes may be moved to core/composite.py
- key_dimensions = param.List(default=[Dimension(name="X"), Dimension(name="Y")], bounds=(2,2))
+ key_dimensions = param.List(default=[Dimension(name="X"), Dimension(name="Y")],
+ bounds=(1,2))
label = param.String(constant=True, doc="""
A short label used to indicate what kind of data is contained | Enabled one-dimensional AxisLayouts |
diff --git a/airflow/jobs.py b/airflow/jobs.py
index <HASH>..<HASH> 100644
--- a/airflow/jobs.py
+++ b/airflow/jobs.py
@@ -1162,8 +1162,8 @@ class SchedulerJob(BaseJob):
if task_concurrency is not None:
num_running = task_concurrency_map[((task_instance.dag_id, task_instance.task_id))]
if num_running >= task_concurrency:
- self.logger.info("Not executing %s since the task concurrency for this task"
- " has been reached.", task_instance)
+ self.log.info("Not executing %s since the task concurrency for"
+ " this task has been reached.", task_instance)
continue
else:
task_concurrency_map[(task_instance.dag_id, task_instance.task_id)] += 1 | [AIRFLOW-<I>] Fix invalid reference to logger
This should be log instead of logger. Somewhere it
went wrong with
the refactoring of the code.
This patch had conflicts when merged, resolved by
Committer: Ash Berlin-Taylor
<<EMAIL>>
Closes #<I> from Fokko/fd-fix-logger |
diff --git a/clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/session/coarse/CoarseSessionAttributes.java b/clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/session/coarse/CoarseSessionAttributes.java
index <HASH>..<HASH> 100644
--- a/clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/session/coarse/CoarseSessionAttributes.java
+++ b/clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/session/coarse/CoarseSessionAttributes.java
@@ -75,7 +75,12 @@ public class CoarseSessionAttributes extends CoarseImmutableSessionAttributes im
Object old = this.attributes.put(name, value);
this.mutator.mutate();
if (this.mutations != null) {
- this.mutations.remove(name);
+ // If the object is mutable, we need to indicate trigger a mutation on close
+ if (this.immutability.test(value)) {
+ this.mutations.remove(name);
+ } else {
+ this.mutations.add(name);
+ }
}
return old;
} | WFLY-<I> Mutations following HttpSession.setAttribute(...) lost on failover when using SESSION granularity distributed web session with a non-transactional cache |
diff --git a/logentry/logentry.go b/logentry/logentry.go
index <HASH>..<HASH> 100644
--- a/logentry/logentry.go
+++ b/logentry/logentry.go
@@ -43,7 +43,7 @@ type LogEntry struct {
}
// New constructs a new LogEntry
-func New(indexPrefix, typeName, JobType, WorkerName string, Code, ElapsedTime int) *LogEntry {
+func New(indexPrefix, typeName, JobType, WorkerName string, Code, ElapsedTime int, success ...bool) *LogEntry {
now := time.Now()
index := fmt.Sprintf("%v-%04d-%02d-%02d", indexPrefix, now.Year(), now.Month(), now.Day())
@@ -51,6 +51,10 @@ func New(indexPrefix, typeName, JobType, WorkerName string, Code, ElapsedTime in
request := Request{Metadata: requestMetadata}
Success := (Code < 500)
+ if len(success) > 0 {
+ Success = success[0]
+ }
+
responseMetadata := ResponseMetadata{Code: Code, Success: Success}
response := Response{Metadata: responseMetadata}
diff --git a/logentry/version.go b/logentry/version.go
index <HASH>..<HASH> 100644
--- a/logentry/version.go
+++ b/logentry/version.go
@@ -1,4 +1,4 @@
package logentry
// VERSION is the current library Version
-var VERSION = "1.0.0"
+var VERSION = "1.1.0" | allow override of status, <I> |
diff --git a/pkg/auth/nodeidentifier/default.go b/pkg/auth/nodeidentifier/default.go
index <HASH>..<HASH> 100644
--- a/pkg/auth/nodeidentifier/default.go
+++ b/pkg/auth/nodeidentifier/default.go
@@ -50,8 +50,6 @@ func (defaultNodeIdentifier) NodeIdentity(u user.Info) (string, bool) {
return "", false
}
- nodeName := strings.TrimPrefix(userName, nodeUserNamePrefix)
-
isNode := false
for _, g := range u.GetGroups() {
if g == user.NodesGroup {
@@ -63,5 +61,6 @@ func (defaultNodeIdentifier) NodeIdentity(u user.Info) (string, bool) {
return "", false
}
- return nodeName, isNode
+ nodeName := strings.TrimPrefix(userName, nodeUserNamePrefix)
+ return nodeName, true
} | Only do string trim when it's necessary
This will enhance performance a little bit. |
diff --git a/auditlog_tests/test_settings.py b/auditlog_tests/test_settings.py
index <HASH>..<HASH> 100644
--- a/auditlog_tests/test_settings.py
+++ b/auditlog_tests/test_settings.py
@@ -57,3 +57,5 @@ STATIC_URL = "/static/"
ROOT_URLCONF = "auditlog_tests.urls"
USE_TZ = True
+
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField" | Add DEFAULT_AUTO_FIELD to test settings. |
diff --git a/proto/src/templates/primitives.py b/proto/src/templates/primitives.py
index <HASH>..<HASH> 100644
--- a/proto/src/templates/primitives.py
+++ b/proto/src/templates/primitives.py
@@ -21,9 +21,8 @@ class _TemplateField(object):
def encode(self, paramdict, parent, name=None, little_endian=False):
value = self._get_element_value_and_remove_from_params(paramdict, name)
- return Field(self.type,self._get_name(name),
- *self._encode_value(value, parent, little_endian=little_endian),
- little_endian=little_endian)
+ field_name, field_value = self._encode_value(value, parent, little_endian=little_endian)
+ return Field(self.type,self._get_name(name), field_name, field_value, little_endian=little_endian)
def decode(self, value, message, name=None, little_endian=False):
length, aligned_length = self.length.decode_lengths(message) | Refactor setting field_name and field_value in primitives to support Python <I> |
diff --git a/src/Response.php b/src/Response.php
index <HASH>..<HASH> 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -208,6 +208,8 @@ class Response implements ResponseInterface
$response->body->useGlobally();
}
+ $response->isStale = false;
+
return $response;
}
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
index <HASH>..<HASH> 100644
--- a/tests/ResponseTest.php
+++ b/tests/ResponseTest.php
@@ -166,6 +166,8 @@ class ResponseTest extends PHPUnit_Framework_TestCase
$this->assertInstanceof(Response::class, $response);
$this->assertNotSame($this->baseResponse, $response);
+
+ $this->assertFalse($response->isStale());
}
public function testReviveNonStale() | The response from `Response::revive()` should not be marked as stale. |
diff --git a/treeherder/etl/buildbot.py b/treeherder/etl/buildbot.py
index <HASH>..<HASH> 100644
--- a/treeherder/etl/buildbot.py
+++ b/treeherder/etl/buildbot.py
@@ -15,7 +15,7 @@ RESULT_DICT = {
#
# PLATFORMS_BUILDERNAME, BUILD_TYPE_BUILDERNAME
#
-# http://mxr.mozilla.org/build/source/buildapi/buildapi/model/util.py
+# https://dxr.mozilla.org/build-central/source/buildapi/buildapi/model/util.py
#
# PIPEDREAM: Once these attributes are available as build properties in the
# pulse stream these structures can be removed. | Bug <I> - Switch a link from mxr to dxr in a comment (#<I>) r=emorley |
diff --git a/builder/lxc/step_wait_init.go b/builder/lxc/step_wait_init.go
index <HASH>..<HASH> 100644
--- a/builder/lxc/step_wait_init.go
+++ b/builder/lxc/step_wait_init.go
@@ -92,6 +92,9 @@ func (s *StepWaitInit) waitForInit(state multistep.StateBag, cancel <-chan struc
if currentRunlevel == targetRunlevel {
log.Printf("Container finished init.")
break
+ } else if currentRunlevel > targetRunlevel {
+ log.Printf("Expected Runlevel %d, Got Runlevel %s, continuing", targetRunlevel, currentRunlevel)
+ break
}
/*log.Println("Attempting SSH connection...") | [lxc] Ubuntu likes runlevel 5 |
diff --git a/switcheo/test_switcheo_client.py b/switcheo/test_switcheo_client.py
index <HASH>..<HASH> 100644
--- a/switcheo/test_switcheo_client.py
+++ b/switcheo/test_switcheo_client.py
@@ -17,6 +17,8 @@ class TestSwitcheoClient(unittest.TestCase):
'address': 'fea2b883725ef2d194c9060f606cd0a0468a2c59',
'pair': 'SWTH_NEO',
'side': 'buy',
+ 'price': '0.00001',
+ 'quantity': '1000000000000',
'offer_asset_id': 'c56f33fc6ecfcd0c225c4ab356fee59390af8560be0e930faebe74a6daff7c9b',
'want_asset_id': 'ab38352559b8b203bde5fddfa0b07d8b2525e132',
'offer_amount': '6000000', | Adding new keys to the Order History API Return |
diff --git a/js/chartbuilder.js b/js/chartbuilder.js
index <HASH>..<HASH> 100644
--- a/js/chartbuilder.js
+++ b/js/chartbuilder.js
@@ -104,7 +104,7 @@ ChartBuilder = {
.split("€").join("")
.split("%").join("");
- if(value == "null" || value == "" || (/^\s+$/).test(value) || (/^\#[A-Z\\\d\/]+\!$/).test(value)) {
+ if(value == "null" || value == "" || (/^\s+$/).test(value) || (/^\#[A-Z\\\d\/]+!{0,}$/).test(value)) {
//allow for nulls, blank, whitespace only cells (if somehow trim didn't work), and excel errors
value = null
} | fixed parsing regex to allow for #N/A cells from excel |
diff --git a/sexpr/grammar.py b/sexpr/grammar.py
index <HASH>..<HASH> 100644
--- a/sexpr/grammar.py
+++ b/sexpr/grammar.py
@@ -14,16 +14,15 @@ _str_format = '''
class Grammar(Matcher):
def __init__(self, source, options = None):
- self.yaml = source
- rules = source.get('rules', {})
-
self.options = options or {}
+ self.yaml = source.get('rules', {})
self.path = self.options.get('path', None)
- self.rules = self.compile_rules(rules)
+ self.rules = self.compile_rules(self.yaml)
try:
self.root = self.options.get('root', None)
- self.root = self.root or list(rules.items())[0][0]
+ self.root = self.root or list(self.yaml.items())[0][0]
+ self.top_tags = self.yaml.get(self.root, [])
except IndexError:
raise ValueError('Cannot load root node. Grammar is ill-formed.') | Add public attribute for top-level tags (#3) |
diff --git a/middleware/appsload.js b/middleware/appsload.js
index <HASH>..<HASH> 100644
--- a/middleware/appsload.js
+++ b/middleware/appsload.js
@@ -59,7 +59,7 @@ function create(options) {
var files = [], remoteCounter = 0;
for (var i in list) {
var m = /^(?:\/(text|raw);)?([\w\/+-]+(?:\.[\w\/+-]+)*)$/.exec(list[i]),
- isTZ = m[2].slice(0, tzModule.length) === tzModule;
+ isTZ = m && m[2].slice(0, tzModule.length) === tzModule;
if (!m) {
files.push(invalid(list[i]));
continue; | Moved last libs to 3rd.party |
diff --git a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/GinqExpression.java b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/GinqExpression.java
index <HASH>..<HASH> 100644
--- a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/GinqExpression.java
+++ b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/GinqExpression.java
@@ -115,7 +115,7 @@ public class GinqExpression extends AbstractGinqExpression {
@Override
public String getText() {
return fromExpression.getText() + " "
- + joinExpressionList.stream().map(e -> e.getText()).collect(Collectors.joining(" ")) + " "
+ + (joinExpressionList.isEmpty() ? "" : joinExpressionList.stream().map(e -> e.getText()).collect(Collectors.joining(" ")) + " ")
+ (null == whereExpression ? "" : whereExpression.getText() + " ")
+ (null == groupExpression ? "" : groupExpression.getText() + " ")
+ (null == orderExpression ? "" : orderExpression.getText() + " ") | Tweak text of GINQ expression further |
diff --git a/src/motor-html/base.js b/src/motor-html/base.js
index <HASH>..<HASH> 100644
--- a/src/motor-html/base.js
+++ b/src/motor-html/base.js
@@ -166,8 +166,9 @@ export function initMotorHTMLBase() {
// being called from the reciprocal API. See the constructor in
// motor/Node.js to get see the idea.
// TODO: renewable promise after unmount.
- this.ready = Promise.resolve()
+ this._imperativeCounterpartPromise = Promise.resolve()
.then(() => this._associateImperativeNode())
+ this.ready = this._imperativeCounterpartPromise
.then(() => this.imperativeCounterpart.mountPromise)
} | Oops, forgot to commit this with the last commit. Needed for the
MotorHTMLScene to wait for the imperativeCounterpart. |
diff --git a/src/ploneintranet/workspace/workspacecontainer.py b/src/ploneintranet/workspace/workspacecontainer.py
index <HASH>..<HASH> 100644
--- a/src/ploneintranet/workspace/workspacecontainer.py
+++ b/src/ploneintranet/workspace/workspacecontainer.py
@@ -15,3 +15,12 @@ class WorkspaceContainer(Container):
A folder to contain WorkspaceFolders
"""
grok.implements(IWorkspaceContainer)
+
+try:
+ from ploneintranet.attachments.attachments import IAttachmentStoragable
+except ImportError:
+ IAttachmentStoragable = None
+
+if IAttachmentStoragable is not None:
+ from zope import interface
+ interface.classImplements(WorkspaceContainer, IAttachmentStoragable) | also allow temporary attachments on WorkspaceContainer |
diff --git a/lib/houston/roadmaps/railtie.rb b/lib/houston/roadmaps/railtie.rb
index <HASH>..<HASH> 100644
--- a/lib/houston/roadmaps/railtie.rb
+++ b/lib/houston/roadmaps/railtie.rb
@@ -1,4 +1,3 @@
-require "houston/tickets"
require "houston/roadmaps/milestone_ext"
require "houston/roadmaps/project_ext"
require "houston/roadmaps/team_ext" | [skip] Removed require of houston/tickets (1m)
It caused errors here |
diff --git a/lib/base_controller.js b/lib/base_controller.js
index <HASH>..<HASH> 100644
--- a/lib/base_controller.js
+++ b/lib/base_controller.js
@@ -629,6 +629,14 @@ controller.BaseController.prototype = new (function () {
callback(content);
});
+ // Mix in controller instance-vars -- don't overwrite
+ // data properties, and don't use inherited props
+ for (var p in this) {
+ if (this.hasOwnProperty(p) && !data[p]) {
+ data[p] = this[p];
+ }
+ };
+
templater.render(data, {
layout: this.layout
, template: this.template | Mix controller instance-vars into view-data |
diff --git a/app/search_builders/hyrax/catalog_search_builder.rb b/app/search_builders/hyrax/catalog_search_builder.rb
index <HASH>..<HASH> 100644
--- a/app/search_builders/hyrax/catalog_search_builder.rb
+++ b/app/search_builders/hyrax/catalog_search_builder.rb
@@ -1,3 +1,31 @@
+##
+# The default Blacklight catalog `search_builder_class` for Hyrax.
+#
+# Use of this builder is configured in the `CatalogController` generated by
+# Hyrax's install task.
+#
+# If you plan to customize the base catalog search builder behavior (e.g. by
+# adding a mixin module provided by a blacklight extension gem), inheriting this
+# class, customizing behavior, and reconfiguring `CatalogController` is the
+# preferred mechanism.
+#
+# @example extending and customizing SearchBuilder
+# class MyApp::CustomCatalogSearchBuilder < Hyrax::CatalogSearchBuilder
+# include BlacklightRangeLimit::RangeLimitBuilder
+# # and/or other extensions
+# end
+#
+# class CatalogController < ApplicationController
+# # ...
+# configure_blacklight do |config|
+# config.search_builder_class = MyApp::CustomCatalogSearchBuilder
+# # ...
+# end
+# # ...
+# end
+#
+# @see Blacklight::SearchBuilder
+# @see Hyrax::SearchFilters
class Hyrax::CatalogSearchBuilder < Hyrax::SearchBuilder
self.default_processor_chain += [
:add_access_controls_to_solr_params, | Add class level documentation for `Hyrax::CatalogSearchBuilder`
Some folks were thinking about ways to extend this class, but had missed that
Blacklight provides an extension mechanism. Adding some class level docs should
help folks find the right extension points. |
diff --git a/lib/generators/init-generator.js b/lib/generators/init-generator.js
index <HASH>..<HASH> 100644
--- a/lib/generators/init-generator.js
+++ b/lib/generators/init-generator.js
@@ -31,7 +31,11 @@ module.exports = class InitGenerator extends Generator {
constructor(args, opts) {
super(args, opts);
this.isProd = false;
- this.dependencies = ["webpack", "uglifyjs-webpack-plugin"];
+ this.dependencies = [
+ "webpack",
+ "webpack-cli",
+ "uglifyjs-webpack-plugin"
+ ];
this.configuration = {
config: {
webpackOptions: {}, | cli(init): add webpack-cli dep (#<I>) |
diff --git a/python_modules/dagster/dagster/cli/new_repo.py b/python_modules/dagster/dagster/cli/new_repo.py
index <HASH>..<HASH> 100644
--- a/python_modules/dagster/dagster/cli/new_repo.py
+++ b/python_modules/dagster/dagster/cli/new_repo.py
@@ -2,13 +2,17 @@ import os
import click
from dagster.generate import generate_new_repo
+from dagster.utils.backcompat import experimental
@click.command(name="new-repo")
@click.argument("path", type=click.Path())
+@experimental
def new_repo_command(path: str):
"""
- Creates a new Dagster repository and generates boilerplate code.
+ Creates a new Dagster repository and generates boilerplate code. ``dagster new-repo`` is an
+ experimental command and it may generate different files in future versions, even between dot
+ releases.
PATH: Location of the new Dagster repository in your filesystem.
""" | Marks ``dagster new-repo`` as experimental.
Summary: In ancitipation of feedback and changes in the near future, `dagster new-repo` is marked as an experimental feature.
Test Plan: buildkite
Reviewers: catherinewu, schrockn
Reviewed By: catherinewu
Differential Revision: <URL> |
diff --git a/src/utils/get-extension-info.js b/src/utils/get-extension-info.js
index <HASH>..<HASH> 100644
--- a/src/utils/get-extension-info.js
+++ b/src/utils/get-extension-info.js
@@ -19,7 +19,7 @@ function getManifestJSON (src) {
try {
return require(resolve(src, 'manifest.json'))
} catch (error) {
- throw new Error(`You need to provide a valid 'manifest.json'`)
+ throw new Error('You need to provide a valid \'manifest.json\'')
}
} | Fix Standard errors
Strings must use singlequote |
diff --git a/src/Illuminate/Notifications/Channels/MailChannel.php b/src/Illuminate/Notifications/Channels/MailChannel.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Notifications/Channels/MailChannel.php
+++ b/src/Illuminate/Notifications/Channels/MailChannel.php
@@ -184,8 +184,12 @@ class MailChannel
$recipients = [$recipients];
}
- return collect($recipients)->map(function ($recipient) {
- return is_string($recipient) ? $recipient : $recipient->email;
+ return collect($recipients)->mapWithKeys(function ($recipient, $email) {
+ if (! is_numeric($email)) {
+ return [$email => $recipient];
+ }
+
+ return [(is_string($recipient) ? $recipient : $recipient->email)];
})->all();
} | Allow passing of recipient name in Mail notifications |
diff --git a/resources/config/default.php b/resources/config/default.php
index <HASH>..<HASH> 100644
--- a/resources/config/default.php
+++ b/resources/config/default.php
@@ -12,6 +12,7 @@ $config->CM_Render->cdnResource = false;
$config->CM_Render->cdnUserContent = false;
$config->CM_Mail = new stdClass();
+$config->CM_Mail->send = true;
$config->CM_Site_Abstract = new stdClass();
$config->CM_Site_Abstract->class = 'CM_Site_CM'; | Set `$config->CM_Mail->send` to `true`. It _is_ actually a change, but I think it shouldn't hurt. |
diff --git a/src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java b/src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java
index <HASH>..<HASH> 100644
--- a/src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java
+++ b/src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java
@@ -27,6 +27,7 @@ public class EcjTreeConverter extends EcjTreeVisitor {
return params.containsKey(key);
}
+ @SuppressWarnings("unused")
private Object getFlag(FlagKey key) {
return params.get(key);
}
@@ -53,6 +54,7 @@ public class EcjTreeConverter extends EcjTreeVisitor {
this.result = result;
}
+ @SuppressWarnings("unused")
private void set(ASTNode node, List<? extends Node> values) {
if (values.isEmpty()) System.err.printf("Node '%s' (%s) did not produce any results\n", node, node.getClass().getSimpleName()); | Added @SuppressWarnings(unused) where needed so the project is warning free. |
diff --git a/Challenge/Dns/LibDnsResolver.php b/Challenge/Dns/LibDnsResolver.php
index <HASH>..<HASH> 100644
--- a/Challenge/Dns/LibDnsResolver.php
+++ b/Challenge/Dns/LibDnsResolver.php
@@ -87,11 +87,15 @@ class LibDnsResolver implements DnsResolverInterface
public function getTxtEntries($domain)
{
$nsDomain = implode('.', array_slice(explode('.', rtrim($domain, '.')), -2));
- $nameServers = $this->request(
- $nsDomain,
- ResourceTypes::NS,
- $this->nameServer
- );
+ try {
+ $nameServers = $this->request(
+ $nsDomain,
+ ResourceTypes::NS,
+ $this->nameServer
+ );
+ } catch (\Exception $e) {
+ throw new AcmeDnsResolutionException(sprintf('Unable to find domain %s on nameserver %s', $domain, $this->nameServer), $e);
+ }
$this->logger->debug('Fetched NS in charge of domain', ['nsDomain' => $nsDomain, 'servers' => $nameServers]);
if (empty($nameServers)) { | Wrap external call in try/catch block |
diff --git a/framework/yii/console/controllers/MigrateController.php b/framework/yii/console/controllers/MigrateController.php
index <HASH>..<HASH> 100644
--- a/framework/yii/console/controllers/MigrateController.php
+++ b/framework/yii/console/controllers/MigrateController.php
@@ -584,7 +584,7 @@ class MigrateController extends Controller
->from($this->migrationTable)
->orderBy('version DESC')
->limit($limit)
- ->createCommand()
+ ->createCommand($this->db)
->queryAll();
$history = ArrayHelper::map($rows, 'version', 'apply_time');
unset($history[self::BASE_MIGRATION]); | Fix Issue #<I>
Fixes issue #<I>. Command is created for the selected database, not the default database. |
diff --git a/app/assets/javascripts/caboose/placeholder.js b/app/assets/javascripts/caboose/placeholder.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/caboose/placeholder.js
+++ b/app/assets/javascripts/caboose/placeholder.js
@@ -2,7 +2,6 @@
$(document).ready(function() {
$('[placeholder]').focus(function() {
- console.log("PH");
var input = $(this);
if (input.val() == input.attr('placeholder')) {
input.val(''); | Remove console.log from placeholder js |
diff --git a/client/my-sites/themes/index.node.js b/client/my-sites/themes/index.node.js
index <HASH>..<HASH> 100644
--- a/client/my-sites/themes/index.node.js
+++ b/client/my-sites/themes/index.node.js
@@ -38,7 +38,10 @@ export default function( router ) {
'/themes/:site?/filter/:filter',
'/themes/:site?/filter/:filter/type/:tier(free|premium)'
], redirectFilterAndType );
- router( '/themes/:site?/:theme/:section(support)?', redirectToThemeDetails );
+ router( [
+ '/themes/:theme/:section(support)?',
+ '/themes/:site/:theme/:section(support)?'
+ ], redirectToThemeDetails );
// The following route definition is needed so direct hits on `/themes/<mysite>` don't result in a 404.
router( '/themes/*', fetchThemeData, loggedOut, makeLayout );
} | Use unambiguous routes for support urls. (#<I>) |
diff --git a/src/Service/Filler.php b/src/Service/Filler.php
index <HASH>..<HASH> 100644
--- a/src/Service/Filler.php
+++ b/src/Service/Filler.php
@@ -306,7 +306,8 @@ class Filler extends FillerPlugin
'Music' => 'Music video',
'Special' => 'TV-special',
];
- $type = isset($rename[$body['kind']]) ? $rename[$body['kind']] : $body['kind'];
+ $type = ucfirst($body['kind']);
+ $type = isset($rename[$type]) ? $rename[$type] : $type;
return $item->setType(
$this | correct case for type #<I> |
diff --git a/src/main/java/org/nanopub/NanopubImpl.java b/src/main/java/org/nanopub/NanopubImpl.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/nanopub/NanopubImpl.java
+++ b/src/main/java/org/nanopub/NanopubImpl.java
@@ -209,6 +209,9 @@ public class NanopubImpl implements NanopubWithNs, Serializable {
}
private void init() throws MalformedNanopubException {
+ if (statements.isEmpty()) {
+ throw new MalformedNanopubException("No content received for nanopub");
+ }
collectNanopubUri(statements);
if (nanopubUri == null || headUri == null) {
throw new MalformedNanopubException("No nanopub URI found"); | Special error message when set of statements is empty |
diff --git a/builder/parser/line_parsers.go b/builder/parser/line_parsers.go
index <HASH>..<HASH> 100644
--- a/builder/parser/line_parsers.go
+++ b/builder/parser/line_parsers.go
@@ -279,7 +279,7 @@ func parseMaybeJSON(rest string) (*Node, map[string]bool, error) {
}
// parseMaybeJSONToList determines if the argument appears to be a JSON array. If
-// so, passes to parseJSON; if not, attmpts to parse it as a whitespace
+// so, passes to parseJSON; if not, attempts to parse it as a whitespace
// delimited string.
func parseMaybeJSONToList(rest string) (*Node, map[string]bool, error) {
node, attrs, err := parseJSON(rest) | Fix a typo in comment of parseMaybeJSONToList |
diff --git a/spyder_kernels/customize/spyderpdb.py b/spyder_kernels/customize/spyderpdb.py
index <HASH>..<HASH> 100755
--- a/spyder_kernels/customize/spyderpdb.py
+++ b/spyder_kernels/customize/spyderpdb.py
@@ -15,8 +15,8 @@ import traceback
from collections import namedtuple
from IPython.core.autocall import ZMQExitAutocall
-from IPython.core.getipython import get_ipython
from IPython.core.debugger import Pdb as ipyPdb
+from IPython.core.getipython import get_ipython
from spyder_kernels.comms.frontendcomm import CommError, frontend_request
from spyder_kernels.customize.utils import path_is_library
@@ -92,6 +92,10 @@ class SpyderPdb(ipyPdb, object): # Inherits `object` to call super() in PY2
self._pdb_breaking = False
self._frontend_notified = False
+ # Don't report hidden frames for IPython 7.24+. This attribute
+ # has no effect in previous versions.
+ self.report_skipped = False
+
# --- Methods overriden for code execution
def print_exclamation_warning(self):
"""Print pdb warning for exclamation mark.""" | Debugger: Don't report skipped frames for IPython <I>+ |
diff --git a/pkg/nodediscovery/nodediscovery.go b/pkg/nodediscovery/nodediscovery.go
index <HASH>..<HASH> 100644
--- a/pkg/nodediscovery/nodediscovery.go
+++ b/pkg/nodediscovery/nodediscovery.go
@@ -297,7 +297,10 @@ func (n *NodeDiscovery) updateLocalNode() {
controller.NewManager().UpdateController("propagating local node change to kv-store",
controller.ControllerParams{
DoFunc: func(ctx context.Context) error {
- err := n.Registrar.UpdateLocalKeySync(&n.localNode)
+ n.localNodeLock.Lock()
+ localNode := n.localNode.DeepCopy()
+ n.localNodeLock.Unlock()
+ err := n.Registrar.UpdateLocalKeySync(localNode)
if err != nil {
log.WithError(err).Error("Unable to propagate local node change to kvstore")
} | pkg/nodediscovery: protect variable against concurrent access
This variable can be accessed concurrently since controllers run on a
separate go routine. Using its mutex and performing a DeepCopy will
help protecting it against concurrent access.
Fixes: e<I>fe1d<I>d1c ("nodediscovery: Make LocalNode object private") |
diff --git a/examples/project_create_script.rb b/examples/project_create_script.rb
index <HASH>..<HASH> 100644
--- a/examples/project_create_script.rb
+++ b/examples/project_create_script.rb
@@ -14,6 +14,10 @@ cname = gets.chomp
client_search_results = harvest.clients.all.select { |c| c.name.downcase.include?(cname) }
case client_search_results.length
+when 0
+ puts "No client found. Please try again."
+ puts
+ abort
when 1
#Result is exactly 1. We got the client.
client_index = 0
@@ -26,12 +30,8 @@ when 1..15
end
client_index = gets.chomp.to_i - 1
-when 16..(1.0 / 0.0) #16 to infinity
- puts "Too many client matches. Please try a more specific search term."
- puts
- abort
else
- puts "No client found. Please try again."
+ puts "Too many client matches. Please try a more specific search term."
puts
abort
end | Better case statement to not have to use hacky ```(<I>/<I>)``` to get infinity. |
diff --git a/discord/ext/commands/errors.py b/discord/ext/commands/errors.py
index <HASH>..<HASH> 100644
--- a/discord/ext/commands/errors.py
+++ b/discord/ext/commands/errors.py
@@ -261,7 +261,7 @@ class MaxConcurrencyReached(CommandError):
suffix = 'per %s' % name if per.name != 'default' else 'globally'
plural = '%s times %s' if number > 1 else '%s time %s'
fmt = plural % (number, suffix)
- super().__init__('Too many people using this command. It can only be used {}.'.format(fmt))
+ super().__init__('Too many people using this command. It can only be used {} concurrently.'.format(fmt))
class MissingRole(CheckFailure):
"""Exception raised when the command invoker lacks a role to run a command. | [commands] Be more clear in the default error for MaxConcurrencyReached |
diff --git a/libraries/joomla/session/storage/xcache.php b/libraries/joomla/session/storage/xcache.php
index <HASH>..<HASH> 100644
--- a/libraries/joomla/session/storage/xcache.php
+++ b/libraries/joomla/session/storage/xcache.php
@@ -13,7 +13,7 @@ defined('JPATH_PLATFORM') or die;
* XCache session storage handler
*
* @package Joomla.Platform
- * @subpackage Cache
+ * @subpackage Session
* @since 11.1
*/
class JSessionStorageXcache extends JSessionStorage | Fix a docblock in the session package. |
diff --git a/spec/support/actor_examples.rb b/spec/support/actor_examples.rb
index <HASH>..<HASH> 100644
--- a/spec/support/actor_examples.rb
+++ b/spec/support/actor_examples.rb
@@ -395,6 +395,19 @@ shared_examples "Celluloid::Actor examples" do |included_module, task_klass|
actor.should_not be_alive
end
+ it "is not dead when it's alive" do
+ actor = actor_class.new 'Bill Murray'
+ actor.should be_alive
+ actor.should_not be_dead
+ end
+
+ it "is dead when it's not alive" do
+ actor = actor_class.new 'Bill Murray'
+ actor.terminate
+ actor.should_not be_alive
+ actor.should be_dead
+ end
+
it "raises DeadActorError if called after terminated" do
actor = actor_class.new "Arnold Schwarzenegger"
actor.terminate | Add specs for alive/dead |
diff --git a/fscache.go b/fscache.go
index <HASH>..<HASH> 100644
--- a/fscache.go
+++ b/fscache.go
@@ -37,8 +37,12 @@ func New(dir string, expiry int) (*Cache, error) {
expiry: time.Duration(expiry) * expiryPeriod,
files: make(map[string]*cachedFile),
}
- time.AfterFunc(reaperPeriod, c.reaper)
- return c, c.load()
+ err = c.load()
+ if err != nil {
+ return nil, err
+ }
+ c.reaper()
+ return c, nil
}
func (c *Cache) reaper() { | reaper runs right after load to remove expired items from the cache |
diff --git a/code/GoogleGeocoding.php b/code/GoogleGeocoding.php
index <HASH>..<HASH> 100644
--- a/code/GoogleGeocoding.php
+++ b/code/GoogleGeocoding.php
@@ -26,6 +26,10 @@ class GoogleGeocoding {
'region' => $region,
'key' => $key
));
+ if (!$service->request()->getBody()) {
+ // If blank response, ignore to avoid XML parsing errors.
+ return false;
+ }
$response = $service->request()->simpleXML();
if ($response->status != 'OK') { | fix(EmptyResponse): If the response is empty, avoid parsing with XML as it will throw an exception. |
diff --git a/yamcs-client/yamcs/tmtc/model.py b/yamcs-client/yamcs/tmtc/model.py
index <HASH>..<HASH> 100644
--- a/yamcs-client/yamcs/tmtc/model.py
+++ b/yamcs-client/yamcs/tmtc/model.py
@@ -202,7 +202,7 @@ class IssuedCommand(object):
:type: :class:`~datetime.datetime`
"""
if self._proto.HasField('generationTime'):
- return parse_isostring(self._proto.generationTime)
+ return self._proto.generationTime.ToDatetime()
return None
@property | fixed the datetime conversion broken since the field has been changed to
Timestamp |
diff --git a/scapy/layers/tls/keyexchange.py b/scapy/layers/tls/keyexchange.py
index <HASH>..<HASH> 100644
--- a/scapy/layers/tls/keyexchange.py
+++ b/scapy/layers/tls/keyexchange.py
@@ -746,7 +746,7 @@ class ClientDiffieHellmanPublic(_GenericTLSSessionInheritance):
if s.client_kx_privkey and s.server_kx_pubkey:
pms = s.client_kx_privkey.exchange(s.server_kx_pubkey)
- s.pre_master_secret = pms
+ s.pre_master_secret = pms.lstrip(b"\x00")
if not s.extms or s.session_hash:
# If extms is set (extended master secret), the key will
# need the session hash to be computed. This is provided
@@ -780,7 +780,7 @@ class ClientDiffieHellmanPublic(_GenericTLSSessionInheritance):
if s.server_kx_privkey and s.client_kx_pubkey:
ZZ = s.server_kx_privkey.exchange(s.client_kx_pubkey)
- s.pre_master_secret = ZZ
+ s.pre_master_secret = ZZ.lstrip(b"\x00")
if not s.extms or s.session_hash:
s.compute_ms_and_derive_keys() | Fix an error in the PMS derivation for DHE key exchange in TLS.
The RFC states that the leading zero bytes must be stripped when storing the
Pre Master Secret. This is bad practice, since it leads to exploitable timing
attacks such as the Raccoon Attack (<URL>). However, this is the standard and the current
implementation leads to handshake failure with a probability of 1/<I>.
The leading zero injunction does NOT apply to ECDHE. |
diff --git a/zimsoap/client.py b/zimsoap/client.py
index <HASH>..<HASH> 100644
--- a/zimsoap/client.py
+++ b/zimsoap/client.py
@@ -1397,8 +1397,10 @@ not {0}'.format(type(ids)))
def get_folder_grant(self, **kwargs):
folder = self.get_folder(**kwargs)
-
- return folder['folder']['acl']
+ if 'acl' in folder['folder']:
+ return folder['folder']['acl']
+ else:
+ return None
def modify_folder_grant(
self, | Return None when no acl found |
diff --git a/control.js b/control.js
index <HASH>..<HASH> 100644
--- a/control.js
+++ b/control.js
@@ -7,4 +7,4 @@ exports.task = task.task;
exports.begin = task.begin;
exports.perform = task.perform;
exports.hosts = host.hosts;
-exports.host = host.perform;
+exports.host = host.host | Fixes export of host() method. |
diff --git a/aiohttp/connector.py b/aiohttp/connector.py
index <HASH>..<HASH> 100644
--- a/aiohttp/connector.py
+++ b/aiohttp/connector.py
@@ -460,19 +460,20 @@ class TCPConnector(BaseConnector):
sslcontext = None
hosts = yield from self._resolve_host(req.host, req.port)
+ exc = None
- while hosts:
- hinfo = hosts.pop()
+ for hinfo in hosts:
try:
return (yield from self._loop.create_connection(
self._factory, hinfo['host'], hinfo['port'],
ssl=sslcontext, family=hinfo['family'],
proto=hinfo['proto'], flags=hinfo['flags'],
server_hostname=hinfo['hostname'] if sslcontext else None))
- except OSError as exc:
- if not hosts:
- raise ClientOSError('Can not connect to %s:%s' %
- (req.host, req.port)) from exc
+ except OSError as e:
+ exc = e
+ else:
+ raise ClientOSError('Can not connect to %s:%s' %
+ (req.host, req.port)) from exc
class ProxyConnector(TCPConnector): | Refactor TCPConnector._create_connection a bit |
diff --git a/liquibase-core/src/main/java/liquibase/database/core/HsqlDatabase.java b/liquibase-core/src/main/java/liquibase/database/core/HsqlDatabase.java
index <HASH>..<HASH> 100644
--- a/liquibase-core/src/main/java/liquibase/database/core/HsqlDatabase.java
+++ b/liquibase-core/src/main/java/liquibase/database/core/HsqlDatabase.java
@@ -432,7 +432,6 @@ public class HsqlDatabase extends AbstractJdbcDatabase {
"SCRIPT",
"SCRIPTFORMAT",
"SEMICOLON",
- "SEQUENCE",
"SHUTDOWN",
"TEMP",
"TEXT", | CORE-<I> Sequence is not a reserved object name in HSQLDB |
diff --git a/cf/commands/application/start_test.go b/cf/commands/application/start_test.go
index <HASH>..<HASH> 100644
--- a/cf/commands/application/start_test.go
+++ b/cf/commands/application/start_test.go
@@ -83,8 +83,8 @@ var _ = Describe("start command", func() {
ui = new(testterm.FakeUI)
cmd := NewStart(ui, config, displayApp, appRepo, appInstancesRepo, logRepo)
- cmd.StagingTimeout = 50 * time.Millisecond
- cmd.StartupTimeout = 100 * time.Millisecond
+ cmd.StagingTimeout = 100 * time.Millisecond
+ cmd.StartupTimeout = 200 * time.Millisecond
cmd.PingerThrottle = 50 * time.Millisecond
testcmd.RunCommand(cmd, args, requirementsFactory) | Bump timeouts in the start_test |
diff --git a/app/controllers/stripe_event/webhook_controller.rb b/app/controllers/stripe_event/webhook_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/stripe_event/webhook_controller.rb
+++ b/app/controllers/stripe_event/webhook_controller.rb
@@ -7,12 +7,20 @@ module StripeEvent
end
end
end
-
+
def event
StripeEvent.instrument(params)
head :ok
- rescue StripeEvent::UnauthorizedError
+ rescue StripeEvent::UnauthorizedError => e
+ log_error(e)
head :unauthorized
end
+
+ private
+
+ def log_error(e)
+ logger.error e.message
+ e.backtrace.each { |line| logger.error " #{line}" }
+ end
end
end | Add error logging to WebhookController
For easier debugging.
Fixes #<I> |
diff --git a/notification-portlet-webcomponents/notification-component-icon/src/NotificationIcon.js b/notification-portlet-webcomponents/notification-component-icon/src/NotificationIcon.js
index <HASH>..<HASH> 100644
--- a/notification-portlet-webcomponents/notification-component-icon/src/NotificationIcon.js
+++ b/notification-portlet-webcomponents/notification-component-icon/src/NotificationIcon.js
@@ -21,6 +21,11 @@ const StyledDropdownMenu = styled(DropdownMenu)`
}
`;
const StyledDropdownToggle = styled(DropdownToggle)`
+ &:hover,
+ &:focus {
+ color: white;
+ }
+
&.up-notification--toggle {
background-color: inherit;
}
@@ -191,9 +196,9 @@ class NotificationIcon extends Component {
const {t, seeAllNotificationsUrl} = this.props;
const {notifications, isDropdownOpen} = this.state;
- const dropdownClasses = ['up-notification--toggle'];
+ let dropdownClasses = 'up-notification--toggle';
if (notifications.length !== 0) {
- dropdownClasses.push('up-active');
+ dropdownClasses += ' up-active';
}
return ( | fix: ensure notification button shows are red when there are unread |
diff --git a/src/locale/tk.js b/src/locale/tk.js
index <HASH>..<HASH> 100644
--- a/src/locale/tk.js
+++ b/src/locale/tk.js
@@ -1,5 +1,5 @@
//! moment.js locale configuration
-//! locale : Turkmen [trk]
+//! locale : Turkmen [tk]
//! author : Atamyrat Abdyrahmanov : https://github.com/atamyratabdy
import moment from '../moment'; | [locale] tk: fix country code (#<I>) |
diff --git a/src/request_handlers/status_request_handler.js b/src/request_handlers/status_request_handler.js
index <HASH>..<HASH> 100644
--- a/src/request_handlers/status_request_handler.js
+++ b/src/request_handlers/status_request_handler.js
@@ -30,17 +30,18 @@ var ghostdriver = ghostdriver || {};
ghostdriver.StatusReqHand = function() {
// private:
var
+ _system = require("system"),
_protoParent = ghostdriver.StatusReqHand.prototype,
- _statusObj = { //< TODO Report real status
+ _statusObj = {
"build" : {
- "version" : "0.1a",
- "revision" : "none",
- "time" : "20120320"
+ "version" : "1.0-dev",
+ "revision" : "unknown",
+ "time" : "unknown"
},
"os" : {
- "arch" : "x86",
- "name" : "osx",
- "version" : "10.7.2"
+ "name" : _system.os.name,
+ "version" : _system.os.version,
+ "arch" : _system.os.architecture
}
}, | Completed command "/status" |
diff --git a/src/test/java/io/github/bonigarcia/test/docker/DockerHtmlVncJupiterTest.java b/src/test/java/io/github/bonigarcia/test/docker/DockerHtmlVncJupiterTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/io/github/bonigarcia/test/docker/DockerHtmlVncJupiterTest.java
+++ b/src/test/java/io/github/bonigarcia/test/docker/DockerHtmlVncJupiterTest.java
@@ -45,6 +45,7 @@ public class DockerHtmlVncJupiterTest {
void setup() {
SeleniumJupiter.config().setVnc(true);
SeleniumJupiter.config().setVncRedirectHtmlPage(true);
+ SeleniumJupiter.config().useSurefireOutputFolder();
}
@AfterAll
@@ -61,7 +62,8 @@ public class DockerHtmlVncJupiterTest {
assertThat(driver.getTitle(),
containsString("A JUnit 5 extension for Selenium WebDriver"));
- htmlFile = new File("testHtmlVnc_arg0_CHROME_64.0_"
+ String folder = "target/surefire-reports/io.github.bonigarcia.test.docker.DockerHtmlVncJupiterTest";
+ htmlFile = new File(folder, "testHtmlVnc_arg0_CHROME_64.0_"
+ driver.getSessionId() + ".html");
} | Use surefire-reports folder in test |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -11,7 +11,8 @@ module.exports = (function (array) {
while (length) {
value = parseInt(number.charAt(--length), 10)
- sum += (bit ^= 1) ? array[value] : value
+ bit ^= 1
+ sum += bit ? array[value] : value
}
return !!sum && sum % 10 === 0 | avoid assigning in conidition of ternary |
diff --git a/grade/edit/scale/edit.php b/grade/edit/scale/edit.php
index <HASH>..<HASH> 100644
--- a/grade/edit/scale/edit.php
+++ b/grade/edit/scale/edit.php
@@ -107,6 +107,7 @@ if ($mform->is_cancelled()) {
if (empty($scale->id)) {
$data->description = $data->description_editor['text'];
+ $data->descriptionformat = $data->description_editor['format'];
grade_scale::set_properties($scale, $data);
if (!has_capability('moodle/grade:manage', $systemcontext)) {
$data->standard = 0; | gradebook MDL-<I> now saves scale description format when you create a new scale |
diff --git a/multiplex.go b/multiplex.go
index <HASH>..<HASH> 100644
--- a/multiplex.go
+++ b/multiplex.go
@@ -170,7 +170,7 @@ func (mp *Multiplex) sendMsg(ctx context.Context, header uint64, data []byte) er
if err != nil && written > 0 {
// Bail. We've written partial message and can't do anything
// about this.
- mp.con.Close()
+ mp.closeNoWait()
return err
} | close the session, not just the connection if we fail to write |
diff --git a/src/bezierizer.core.js b/src/bezierizer.core.js
index <HASH>..<HASH> 100644
--- a/src/bezierizer.core.js
+++ b/src/bezierizer.core.js
@@ -104,10 +104,14 @@ Bezierizer.prototype.getHandlePositions = function () {
Bezierizer.prototype.setHandlePositions = function (points) {
$.extend(this._points, points);
- this._$handles.eq(0).css('left', this._points.x1);
- this._$handles.eq(0).css('top', this._points.y1);
- this._$handles.eq(1).css('left', this._points.x2);
- this._$handles.eq(1).css('top', this._points.y2);
+ this._$handles.eq(0).css({
+ left: this._points.x1
+ ,top: this._points.y1
+ });
+ this._$handles.eq(1).css({
+ left: this._points.x2
+ ,top: this._points.y2
+ });
this.redraw();
}; | Refactors some calls to .css. |
diff --git a/lib/merb-core/bootloader.rb b/lib/merb-core/bootloader.rb
index <HASH>..<HASH> 100644
--- a/lib/merb-core/bootloader.rb
+++ b/lib/merb-core/bootloader.rb
@@ -124,9 +124,8 @@ end
class Merb::BootLoader::DropPidFile < Merb::BootLoader
class << self
-
def run
- Merb::Server.store_pid(Merb::Config[:port])
+ Merb::Server.store_pid(Merb::Config[:port]) unless Merb::Config[:daemonize] || Merb::Config[:cluster]
end
end
end
diff --git a/lib/merb-core/logger.rb b/lib/merb-core/logger.rb
index <HASH>..<HASH> 100644
--- a/lib/merb-core/logger.rb
+++ b/lib/merb-core/logger.rb
@@ -196,7 +196,7 @@ module Merb
# DOC
def #{name}(message = nil, &block)
- self.<<(message, &block) if #{name}?
+ self.<<(message, &block) if #{number} >= level
end
# DOC | Do not drop PID file is not running as daemon or cluster
Avoid extra method call in logging |
diff --git a/lib/juici/callback.rb b/lib/juici/callback.rb
index <HASH>..<HASH> 100644
--- a/lib/juici/callback.rb
+++ b/lib/juici/callback.rb
@@ -10,7 +10,12 @@ module Juici
end
def process!
- Net::HTTP.post_form(url, build.to_form_hash)
+ Net::HTTP.start(url.host, url.port) do |http|
+ request = Net::HTTP::Post.new(url.request_uri)
+ request.body = build.to_callback_json
+
+ response = http.request request # Net::HTTPResponse object
+ end
end
end
diff --git a/lib/juici/models/build.rb b/lib/juici/models/build.rb
index <HASH>..<HASH> 100644
--- a/lib/juici/models/build.rb
+++ b/lib/juici/models/build.rb
@@ -1,3 +1,4 @@
+require 'json'
# status enum
# :waiting
# :started
@@ -114,12 +115,12 @@ module Juici
end
- def to_form_hash
+ def to_callback_json
{
"project" => self[:parent],
"status" => self[:status],
"url" => ""
- }
+ }.to_json
end
end | Refactor callbacks to use raw POST body |
diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record/connection_adapters/sqlserver/database_statements.rb
+++ b/lib/active_record/connection_adapters/sqlserver/database_statements.rb
@@ -33,10 +33,6 @@ module ActiveRecord
super(sql, name, binds).rows.first.first
end
- def supports_statement_cache?
- true
- end
-
def begin_db_transaction
do_execute 'BEGIN TRANSACTION'
end | Remove un-necessary adapter override |
diff --git a/aws/resource_aws_batch_job_queue_test.go b/aws/resource_aws_batch_job_queue_test.go
index <HASH>..<HASH> 100644
--- a/aws/resource_aws_batch_job_queue_test.go
+++ b/aws/resource_aws_batch_job_queue_test.go
@@ -100,11 +100,6 @@ func TestAccAWSBatchJobQueue_disappears(t *testing.T) {
),
ExpectNonEmptyPlan: true,
},
- {
- ResourceName: resourceName,
- ImportState: true,
- ImportStateVerify: true,
- },
},
})
} | tests/resource/aws_batch_job_queue: Remove extraneous import testing from disappears test
Output from acceptance testing:
```
--- PASS: TestAccAWSBatchJobQueue_disappears (<I>s)
``` |
diff --git a/lib/beepboop.js b/lib/beepboop.js
index <HASH>..<HASH> 100644
--- a/lib/beepboop.js
+++ b/lib/beepboop.js
@@ -3,8 +3,8 @@
var Resourcer = require(__dirname + '/resourcer.js')
module.exports = {
- start: function (config) {
- var resourcer = Resourcer(config)
+ start: function (options) {
+ var resourcer = Resourcer(options)
resourcer.connect()
return resourcer
}
diff --git a/lib/resourcer.js b/lib/resourcer.js
index <HASH>..<HASH> 100644
--- a/lib/resourcer.js
+++ b/lib/resourcer.js
@@ -19,6 +19,9 @@ const AUTH_MSG = {
const MSG_PREFIX = 'message'
module.exports = function Resourcer (options) {
+ // TODO add log level based on debug flag
+ options = parseOptions(options)
+
var ws = null
var resourcer = new EventEmitter2({wildcard: true})
@@ -31,6 +34,15 @@ module.exports = function Resourcer (options) {
.on('error', handledError)
}
+ function parseOptions (options) {
+ var opts = {}
+
+ // set supported options
+ opts.debug = !!opts.debug
+
+ return opts
+ }
+
// handle enables retry ws cleanup and mocking
function initWs (inWs) {
if (ws) { | Stub-in means of taking options into the resourcer. |
diff --git a/lib/ntlmrequest.js b/lib/ntlmrequest.js
index <HASH>..<HASH> 100644
--- a/lib/ntlmrequest.js
+++ b/lib/ntlmrequest.js
@@ -75,8 +75,8 @@ function ntlmRequest(opts) {
if (supportedAuthSchemes.indexOf('ntlm') !== -1) {
authHeader = ntlm.createType1Message();
- } else if (supportedAuthSchemes.indexOf('basic')) {
- authHeader = 'Basic ' + new Buffer(opts.username + ':' + opts.passsword).toString('base64');
+ } else if (supportedAuthSchemes.indexOf('basic') !== -1) {
+ authHeader = 'Basic ' + new Buffer(opts.username + ':' + opts.password).toString('base64');
ntlmState.status = 2;
} else {
return reject(new Error('Could not negotiate on an authentication scheme'));
@@ -128,4 +128,4 @@ function ntlmRequest(opts) {
return new Promise(sendRequest);
}
-module.exports = ntlmRequest;
\ No newline at end of file
+module.exports = ntlmRequest; | Fix basic auth check and password variable |
diff --git a/widgets/ActionBox.php b/widgets/ActionBox.php
index <HASH>..<HASH> 100644
--- a/widgets/ActionBox.php
+++ b/widgets/ActionBox.php
@@ -78,7 +78,7 @@ JS
}
public function renderSearchButton() {
- return AdvancedSearch::renderButton();
+ return AdvancedSearch::renderButton() . "\n";
}
public function beginSearchForm() { | Add additional gap while render AdvancedSearchButton |
diff --git a/lib/virtus/typecast/string.rb b/lib/virtus/typecast/string.rb
index <HASH>..<HASH> 100644
--- a/lib/virtus/typecast/string.rb
+++ b/lib/virtus/typecast/string.rb
@@ -127,6 +127,8 @@ module Virtus
end
end
+ private_class_method :to_numeric
+
# Parse the value or return it as-is if it is invalid
#
# @param [#parse] parser | Update String numeric parser utility method to be private |
diff --git a/TYPO3.Flow/Classes/MVC/Controller/F3_FLOW3_MVC_Controller_ActionController.php b/TYPO3.Flow/Classes/MVC/Controller/F3_FLOW3_MVC_Controller_ActionController.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Flow/Classes/MVC/Controller/F3_FLOW3_MVC_Controller_ActionController.php
+++ b/TYPO3.Flow/Classes/MVC/Controller/F3_FLOW3_MVC_Controller_ActionController.php
@@ -129,7 +129,7 @@ class ActionController extends F3::FLOW3::MVC::Controller::RequestHandlingContro
* @author Robert Lemke <robert@typo3.org>
*/
protected function indexAction() {
- return 'No default action has been implemented yet for this controller.';
+ return 'No index action has been implemented yet for this controller.';
}
}
?>
\ No newline at end of file | FLOW3: When no indexAction can be found in a controller, the message shown says so now.
Original-Commit-Hash: fb<I>c<I>d<I>ac4bee<I>a<I>f<I>a<I>df<I> |
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/SequencerAgent.java b/aeron-cluster/src/main/java/io/aeron/cluster/SequencerAgent.java
index <HASH>..<HASH> 100644
--- a/aeron-cluster/src/main/java/io/aeron/cluster/SequencerAgent.java
+++ b/aeron-cluster/src/main/java/io/aeron/cluster/SequencerAgent.java
@@ -248,7 +248,12 @@ class SequencerAgent implements Agent
ctx.snapshotCounter().incrementOrdered();
state(ConsensusModule.State.ACTIVE);
ClusterControl.ToggleState.reset(controlToggle);
- // TODO: Should session timestamps be reset in case of timeout
+
+ final long nowNs = epochClock.time();
+ for (final ClusterSession session : sessionByIdMap.values())
+ {
+ session.timeOfLastActivityMs(nowNs);
+ }
break;
case SHUTDOWN:
@@ -348,9 +353,7 @@ class SequencerAgent implements Agent
if (session.id() == clusterSessionId && session.state() == CHALLENGED)
{
final long nowMs = cachedEpochClock.time();
-
session.lastActivity(nowMs, correlationId);
-
authenticator.onChallengeResponse(clusterSessionId, credentialData, nowMs);
break;
} | [Java] Reset client activity timestamp after taking a snapshot to avoid session timeout. |
diff --git a/test_cipher.py b/test_cipher.py
index <HASH>..<HASH> 100644
--- a/test_cipher.py
+++ b/test_cipher.py
@@ -52,14 +52,14 @@ def test_internal():
def test_speed():
cipher = Cipher('0123456789abcdef', mode='ecb')
- start_time = time.clock()
+ start_time = time.time()
txt = '0123456789abcdef'
for i in xrange(50000):
txt = cipher.encrypt(txt)
for i in xrange(50000):
txt = cipher.decrypt(txt)
assert txt == '0123456789abcdef', 'speed test is wrong: %r' % txt
- print 'Ran in %.2fps' % (10000 * (time.clock() - start_time))
+ print 'Ran in %.2fns' % ((time.time() - start_time) * 1000000000 / 100000)
def test_openssl(): | Cherry pick timing from 5c9d<I>e. |
diff --git a/source/rafcon/gui/mygaphas/canvas.py b/source/rafcon/gui/mygaphas/canvas.py
index <HASH>..<HASH> 100644
--- a/source/rafcon/gui/mygaphas/canvas.py
+++ b/source/rafcon/gui/mygaphas/canvas.py
@@ -60,8 +60,6 @@ class MyCanvas(gaphas.canvas.Canvas):
def remove(self, item):
from rafcon.gui.mygaphas.items.state import StateView
from rafcon.gui.mygaphas.items.connection import ConnectionView, ConnectionPlaceholderView, DataFlowView
- print "remove view", item, hex(id(item))
- print "for model", item.model, hex(id(item.model))
if isinstance(item, (StateView, ConnectionView)) and not isinstance(item, ConnectionPlaceholderView):
self._remove_view_maps(item)
super(MyCanvas, self).remove(item) | chore(canvas): clean prints of Franz |
diff --git a/lib/appsignal/transmitter.rb b/lib/appsignal/transmitter.rb
index <HASH>..<HASH> 100644
--- a/lib/appsignal/transmitter.rb
+++ b/lib/appsignal/transmitter.rb
@@ -78,7 +78,6 @@ module Appsignal
client.tap do |http|
if uri.scheme == "https"
http.use_ssl = true
- http.ssl_version = :TLSv1
http.verify_mode = OpenSSL::SSL::VERIFY_PEER
ca_file = config[:ca_file_path] | Remove SSL version lock in transmitter (#<I>)
By removing the version lock we will no longer be limited to TLSv1, this
has known security issues.
By not specifying it, it will work with TLS<I> as well.
The `ssl_version` option itself is also deprecated. Instead we could use
the `min_option` version, but we think the Ruby default should be good
enough and more future proof. |
diff --git a/periphery/mmio.py b/periphery/mmio.py
index <HASH>..<HASH> 100644
--- a/periphery/mmio.py
+++ b/periphery/mmio.py
@@ -305,7 +305,7 @@ class MMIO(object):
:type: ctypes.c_void_p
"""
- return ctypes.cast(ctypes.pointer(ctypes.c_uint8.from_buffer(self.mapping, 0)), ctypes.c_void_p)
+ return ctypes.cast(ctypes.pointer(ctypes.c_uint8.from_buffer(self.mapping, self._adjust_offset(0))), ctypes.c_void_p)
# String representation | mmio: fix memory offset of pointer property
the pointer property was returning a unoffset pointer to the beginning
of the mapped memory region, which is not at the MMIO object base
address when the base address is not page aligned. |
diff --git a/spec/main-spec.js b/spec/main-spec.js
index <HASH>..<HASH> 100644
--- a/spec/main-spec.js
+++ b/spec/main-spec.js
@@ -177,7 +177,7 @@ describe('execNode', function() {
await promise
expect(false).toBe(true)
} catch (error) {
- expect(error.message).toBe('Process exited with non-zero code: null')
+ expect(error.message.startsWith('Process exited with non-zero code')).toBe(true)
}
})
}) | :white_check_mark: Make a spec more cross platform |
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ setup(
author_email='tim@takeflight.com.au',
url='https://bitbucket.org/takeflight/wagtailnews',
- install_requires=['wagtail>=1.0b2'],
+ install_requires=['wagtail>=1.0'],
zip_safe=False,
license='BSD License', | Bump required Wagtail version to <I> |
diff --git a/spec/lib/exception_notifier_spec.rb b/spec/lib/exception_notifier_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/exception_notifier_spec.rb
+++ b/spec/lib/exception_notifier_spec.rb
@@ -80,7 +80,7 @@ describe Crashbreak::ExceptionNotifier do
end
context 'github integration' do
- let(:error_hash) { Hash[id: 1, deploy_revision: 'test', similar: false] }
+ let(:error_hash) { Hash['id' => 1, 'deploy_revision' => 'test', 'similar' => false] }
it 'passes error hash from request to github integration service' do
Crashbreak.configure.github_repo_name = 'user/repo'
@@ -92,7 +92,7 @@ describe Crashbreak::ExceptionNotifier do
end
it 'skips github integration if error is similar' do
- allow_any_instance_of(Crashbreak::ExceptionsRepository).to receive(:create).and_return(error_hash.merge(similar: true))
+ allow_any_instance_of(Crashbreak::ExceptionsRepository).to receive(:create).and_return(error_hash.merge('similar' => true))
expect_any_instance_of(Crashbreak::GithubIntegrationService).to_not receive(:initialize)
subject.notify | Use string as keys when stubbing server resposne |
diff --git a/salt/grains/core.py b/salt/grains/core.py
index <HASH>..<HASH> 100644
--- a/salt/grains/core.py
+++ b/salt/grains/core.py
@@ -1779,12 +1779,14 @@ def ip_fqdn():
ret[key] = []
else:
try:
+ start_time = datetime.datetime.utcnow()
info = socket.getaddrinfo(_fqdn, None, socket_type)
ret[key] = list(set(item[4][0] for item in info))
except socket.error:
- if __opts__['__role'] == 'master':
- log.warning('Unable to find IPv{0} record for "{1}" causing a 10 second timeout when rendering grains. '
- 'Set the dns or /etc/hosts for IPv{0} to clear this.'.format(ipv_num, _fqdn))
+ timediff = datetime.datetime.utcnow() - start_time
+ if timediff.seconds > 5 and __opts__['__role'] == 'master':
+ log.warning('Unable to find IPv{0} record for "{1}" causing a {2} second timeout when rendering grains. '
+ 'Set the dns or /etc/hosts for IPv{0} to clear this.'.format(ipv_num, _fqdn, timediff))
ret[key] = []
return ret | require large timediff for ipv6 warning |
diff --git a/lib/solargraph/source.rb b/lib/solargraph/source.rb
index <HASH>..<HASH> 100644
--- a/lib/solargraph/source.rb
+++ b/lib/solargraph/source.rb
@@ -340,6 +340,7 @@ module Solargraph
def parse
node, comments = inner_parse(@fixed, filename)
@node = node
+ @comments = comments
process_parsed node, comments
@parsed = true
end
@@ -348,6 +349,7 @@ module Solargraph
@fixed = @code.gsub(/[^\s]/, ' ')
node, comments = inner_parse(@fixed, filename)
@node = node
+ @comments = comments
process_parsed node, comments
@parsed = false
end | Expose Source#comments for fragments. |
diff --git a/biodata-models/src/main/java/org/opencb/biodata/models/variant/annotation/ConsequenceTypeMappings.java b/biodata-models/src/main/java/org/opencb/biodata/models/variant/annotation/ConsequenceTypeMappings.java
index <HASH>..<HASH> 100644
--- a/biodata-models/src/main/java/org/opencb/biodata/models/variant/annotation/ConsequenceTypeMappings.java
+++ b/biodata-models/src/main/java/org/opencb/biodata/models/variant/annotation/ConsequenceTypeMappings.java
@@ -62,6 +62,7 @@ public class ConsequenceTypeMappings {
tmpTermToAccession.put("incomplete_terminal_codon_variant", 1626);
tmpTermToAccession.put("synonymous_variant", 1819);
tmpTermToAccession.put("stop_retained_variant", 1567);
+ tmpTermToAccession.put("start_retained_variant", 2019);
tmpTermToAccession.put("coding_sequence_variant", 1580);
tmpTermToAccession.put("miRNA", 276);
tmpTermToAccession.put("miRNA_target_site", 934); | feature-vep-comparison: stop_retained_variant added to ConsequenceTypeMappings |
diff --git a/src/Helpers/CrudApi.php b/src/Helpers/CrudApi.php
index <HASH>..<HASH> 100644
--- a/src/Helpers/CrudApi.php
+++ b/src/Helpers/CrudApi.php
@@ -45,7 +45,14 @@ class CrudApi
public function getModel()
{
- $fqModel = $this->getAppNamespace() . $this->model;
+ $namespace = $this->getAppNamespace();
+ $fqModel = $namespace . $this->model;
+ if (!class_exists($fqModel)) {
+ $fqModel = $namespace . "Models\\" . $this->model;
+ if (!class_exists($fqModel)) {
+ return false;
+ }
+ }
return $fqModel;
} | If model is not found in App\ also look in App\Models\ |
diff --git a/lib/mj-single.js b/lib/mj-single.js
index <HASH>..<HASH> 100644
--- a/lib/mj-single.js
+++ b/lib/mj-single.js
@@ -586,7 +586,7 @@ function GetSVG(result) {
//
if (data.speakText) {
ID++; var id = "MathJax-SVG-"+ID;
- svg.setAttribute("role","math");
+ svg.setAttribute("role","img");
svg.setAttribute("aria-labelledby",id+"-Title "+id+"-Desc");
for (var i=0, m=svg.childNodes.length; i < m; i++)
svg.childNodes[i].setAttribute("aria-hidden",true); | SVG+SRE: change role from math to img
Fixes #<I> |
diff --git a/errors.go b/errors.go
index <HASH>..<HASH> 100644
--- a/errors.go
+++ b/errors.go
@@ -50,6 +50,10 @@ var (
// ErrProcNotFound is an error encountered when the the process cannot be found
ErrProcNotFound = syscall.Errno(0x7f)
+
+ // ErrVmcomputeOperationAccessIsDenied is an error which can be encountered when enumerating compute systems in RS1/RS2
+ // builds when the underlying silo might be in the process of terminating. HCS was fixed in RS3.
+ ErrVmcomputeOperationAccessIsDenied = syscall.Errno(0x5)
)
// ProcessError is an error encountered in HCS during an operation on a Process object | Add 'Access is denied' error |
diff --git a/tpl/tplimpl/template.go b/tpl/tplimpl/template.go
index <HASH>..<HASH> 100644
--- a/tpl/tplimpl/template.go
+++ b/tpl/tplimpl/template.go
@@ -598,10 +598,16 @@ func (t *templateHandler) applyBaseTemplate(overlay, base templateInfo) (tpl.Tem
}
}
- templ, err = templ.Parse(overlay.template)
+ templ, err = texttemplate.Must(templ.Clone()).Parse(overlay.template)
if err != nil {
return nil, overlay.errWithFileContext("parse failed", err)
}
+
+ // The extra lookup is a workaround, see
+ // * https://github.com/golang/go/issues/16101
+ // * https://github.com/gohugoio/hugo/issues/2549
+ // templ = templ.Lookup(templ.Name())
+
return templ, nil
} | tpl: Fix race condition in text template baseof
Copy most of the htmltemplate cloning to the textemplate implementation
in the same function. |
diff --git a/test/OfferCommandHandlerTestTrait.php b/test/OfferCommandHandlerTestTrait.php
index <HASH>..<HASH> 100644
--- a/test/OfferCommandHandlerTestTrait.php
+++ b/test/OfferCommandHandlerTestTrait.php
@@ -160,7 +160,6 @@ trait OfferCommandHandlerTestTrait
]
)
->when(
-
new $commandClass($id, $image)
)
->then([new $eventClass($id, $image)]); | III-<I>: Fix coding standard violation |
diff --git a/tests/Fixer/LanguageConstruct/ClassKeywordRemoveFixerTest.php b/tests/Fixer/LanguageConstruct/ClassKeywordRemoveFixerTest.php
index <HASH>..<HASH> 100644
--- a/tests/Fixer/LanguageConstruct/ClassKeywordRemoveFixerTest.php
+++ b/tests/Fixer/LanguageConstruct/ClassKeywordRemoveFixerTest.php
@@ -215,6 +215,16 @@ DateTime:: # a
}
',
],
+ [
+ '<?php
+ namespace Foo\\Bar;
+ var_dump(Foo\\Bar\\Baz);
+ ',
+ '<?php
+ namespace Foo\Bar;
+ var_dump(Baz::class);
+ '
+ ]
];
} | add a failed condition for issue #<I> |
diff --git a/server/auth_test.go b/server/auth_test.go
index <HASH>..<HASH> 100644
--- a/server/auth_test.go
+++ b/server/auth_test.go
@@ -66,6 +66,19 @@ func TestUserClonePermissionsNoLists(t *testing.T) {
}
}
+func TestUserCloneNoPermissions(t *testing.T) {
+ user := &User{
+ Username: "foo",
+ Password: "bar",
+ }
+
+ clone := user.clone()
+
+ if clone.Permissions != nil {
+ t.Fatalf("Expected Permissions to be nil, got: %v", clone.Permissions)
+ }
+}
+
func TestUserCloneNil(t *testing.T) {
user := (*User)(nil)
clone := user.clone() | Add User clone test for nil Permissions |
diff --git a/src/fx/fx.js b/src/fx/fx.js
index <HASH>..<HASH> 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -415,7 +415,8 @@ jQuery.extend({
// Get the current size
z.cur = function(){
- return parseFloat( jQuery.curCSS(z.el, prop) ) || z.max();
+ var r = parseFloat( jQuery.curCSS(z.el, prop) );
+ return r && r > -10000 ? r : z.max();
};
// Start an animation from one number to another | Fixed the giant negative number issue that Opera was having. |
diff --git a/client.js b/client.js
index <HASH>..<HASH> 100644
--- a/client.js
+++ b/client.js
@@ -1,4 +1,4 @@
-pipe.on('search::render', function render(pagelet) {
+pipe.on('search:render', function render(pagelet) {
'use strict';
var placeholders = $(pagelet.placeholders); | [migrate] Support bigpipe <I> |
diff --git a/cassiopeia/dto/matchapi.py b/cassiopeia/dto/matchapi.py
index <HASH>..<HASH> 100644
--- a/cassiopeia/dto/matchapi.py
+++ b/cassiopeia/dto/matchapi.py
@@ -1,7 +1,7 @@
import cassiopeia.dto.requests
import cassiopeia.type.dto.match
-def get_match(id_):
+def get_match(id_, includeTimeline=True):
"""https://developer.riotgames.com/api/methods#!/1014/3442
id_ int the ID of the match to get
@@ -9,4 +9,4 @@ def get_match(id_):
return MatchDetail the match
"""
request = "{version}/match/{id_}".format(version=cassiopeia.dto.requests.api_versions["match"], id_=id_)
- return cassiopeia.type.dto.match.MatchDetail(cassiopeia.dto.requests.get(request, {"includeTimeline": True}))
\ No newline at end of file
+ return cassiopeia.type.dto.match.MatchDetail(cassiopeia.dto.requests.get(request, {"includeTimeline": includeTimeline}))
\ No newline at end of file | Exposed the option to get the timeline to the api |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.