diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/Storage/Collection/LazyCollection.php b/src/Storage/Collection/LazyCollection.php
index <HASH>..<HASH> 100644
--- a/src/Storage/Collection/LazyCollection.php
+++ b/src/Storage/Collection/LazyCollection.php
@@ -33,7 +33,7 @@ class LazyCollection extends ArrayCollection
$output = [];
foreach ($this as $element) {
$proxy = $element->getProxy();
- $output[] = spl_object_hash($proxy);
+ $output[] = $proxy->getContenttype() . '/' . $proxy->getSlug();
}
return $output;
|
use ct and slug to reference relations
|
diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
index <HASH>..<HASH> 100644
--- a/tests/IntegrationTest.php
+++ b/tests/IntegrationTest.php
@@ -32,6 +32,7 @@ class IntegrationTest extends \PHPUnit_Framework_TestCase
/**
* @medium
+ * @requires extension pcntl
*/
function test_timeout()
{
|
Timeout test needs pcntl extension.
|
diff --git a/storm/__init__.py b/storm/__init__.py
index <HASH>..<HASH> 100644
--- a/storm/__init__.py
+++ b/storm/__init__.py
@@ -69,7 +69,6 @@ class Storm(object):
if order:
config_data = sorted(config_data, key=itemgetter("host"))
-
return config_data
def delete_all_entries(self):
@@ -109,7 +108,6 @@ class Storm(object):
options.update({
key: value,
})
-
return options
def is_host_in(self, host):
diff --git a/storm/__main__.py b/storm/__main__.py
index <HASH>..<HASH> 100644
--- a/storm/__main__.py
+++ b/storm/__main__.py
@@ -18,6 +18,7 @@ from storm import web as _web
from storm.kommandr import *
from termcolor import colored
+from types import ListType
storm_ = Storm()
@@ -166,8 +167,11 @@ def list():
extra = True
if isinstance(value, collections.Sequence):
- value = ",".join(value)
-
+ if isinstance(value, ListType):
+ value = ",".join(value)
+ else:
+ value = value
+
result += "{0}={1} ".format(key, value)
if extra:
result = result[0:-1]
|
re #<I> fixing problem with custom options not displaying correctly
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,7 +8,7 @@ module.exports = function (grunt) {
// Configurable paths
config: {
lintFiles: [
- '**/*.js'
+ 'angular-bind-html-compile.js'
]
},
jshint: {
|
Disabled jshint for minified version.
|
diff --git a/src/common/storage/storageclasses/editorstorage.js b/src/common/storage/storageclasses/editorstorage.js
index <HASH>..<HASH> 100644
--- a/src/common/storage/storageclasses/editorstorage.js
+++ b/src/common/storage/storageclasses/editorstorage.js
@@ -377,7 +377,7 @@ define([
commitData = branch.getFirstCommit(false);
webSocket.makeCommit(commitData, function (err, result) {
if (err) {
- throw new Error(err);
+ logger.error('makeCommit failed', err);
}
// This is for when e.g. a plugin makes a commit to the same branch as the
diff --git a/test-karma/client/js/branchstatus.spec.js b/test-karma/client/js/branchstatus.spec.js
index <HASH>..<HASH> 100644
--- a/test-karma/client/js/branchstatus.spec.js
+++ b/test-karma/client/js/branchstatus.spec.js
@@ -66,7 +66,11 @@ describe('branch status', function () {
});
afterEach(function (done) {
- client.deleteBranch(projectName, currentBranchName, currentBranchHash, done);
+ client.selectBranch('master', null, function (err) {
+ client.deleteBranch(projectName, currentBranchName, currentBranchHash, function (err2) {
+ done(err || err2);
+ });
+ });
});
function createSelectBranch (branchName, callback) {
|
Switch back to master branch after tests.
Former-commit-id: dae<I>aadc5a7d<I>ea<I>eb<I>a<I>c<I>b3
|
diff --git a/kafka_consumer/check.py b/kafka_consumer/check.py
index <HASH>..<HASH> 100644
--- a/kafka_consumer/check.py
+++ b/kafka_consumer/check.py
@@ -496,8 +496,6 @@ class KafkaCheck(AgentCheck):
partitions = client.cluster.available_partitions_for_topic(topic)
tps[topic] = tps[unicode(topic)].union(set(partitions))
- # TODO: find reliable way to decide what API version to use for
- # OffsetFetchRequest.
consumer_offsets = {}
if coord_id is not None and coord_id >= 0:
broker_ids = [coord_id]
|
[kafka_consumer] removing stale comment.
|
diff --git a/lib/rack/i18n_locale_switcher.rb b/lib/rack/i18n_locale_switcher.rb
index <HASH>..<HASH> 100644
--- a/lib/rack/i18n_locale_switcher.rb
+++ b/lib/rack/i18n_locale_switcher.rb
@@ -20,7 +20,7 @@ module Rack
private
def is_available?(locale)
- not locale.nil? and not locale.empty? and I18n.available_locales.include?(locale.to_sym)
+ not locale.to_s.empty? and I18n.available_locales.include?(locale.to_sym)
end
def extract_locale_from_params(request)
|
There is no .empty? method on nil in <I>
|
diff --git a/python/ray/rllib/eval.py b/python/ray/rllib/eval.py
index <HASH>..<HASH> 100644
--- a/python/ray/rllib/eval.py
+++ b/python/ray/rllib/eval.py
@@ -7,6 +7,7 @@ from __future__ import print_function
import argparse
import gym
import json
+import os
import ray
from ray.rllib.agent import get_agent_class
@@ -42,11 +43,19 @@ parser.add_argument(
help="Run evaluation of the agent forever.")
parser.add_argument(
"--config", default="{}", type=json.loads,
- help="Algorithm-specific configuration (e.g. env, hyperparams), ")
+ help="Algorithm-specific configuration (e.g. env, hyperparams). "
+ "Surpresses loading of configuration from checkpoint.")
if __name__ == "__main__":
args = parser.parse_args()
+ if not args.config:
+ # Load configuration from file
+ config_dir = os.path.dirname(args.checkpoint)
+ config_path = os.path.join(config_dir, "params.json")
+ with open(config_path) as f:
+ args.config = json.load(f)
+
if not args.env:
if not args.config.get("env"):
parser.error("the following arguments are required: --env")
|
Load evaluation configuration from checkpoint (#<I>)
|
diff --git a/admin/user/user_bulk_enrol.php b/admin/user/user_bulk_enrol.php
index <HASH>..<HASH> 100644
--- a/admin/user/user_bulk_enrol.php
+++ b/admin/user/user_bulk_enrol.php
@@ -7,7 +7,7 @@ die('this needs to be rewritten to use new enrol framework, sorry'); //TODO: MD
require_once('../../config.php');
require_once($CFG->libdir.'/adminlib.php');
-$processed = optional_param('processed', '', PARAM_CLEAN);
+$processed = optional_param('processed', '', PARAM_BOOL);
$sort = optional_param('sort', 'fullname', PARAM_ALPHA); //Sort by full name
$dir = optional_param('dir', 'asc', PARAM_ALPHA); //Order to sort (ASC)
|
MDL-<I> fixed wrong PARAM_CLEAN
|
diff --git a/gittar/__init__.py b/gittar/__init__.py
index <HASH>..<HASH> 100644
--- a/gittar/__init__.py
+++ b/gittar/__init__.py
@@ -6,6 +6,7 @@ import os
import stat
import time
from urlparse import urlparse
+import sys
from dateutil.tz import tzlocal
from datetime import datetime
@@ -93,6 +94,8 @@ def main():
for source_url in args.sources:
src = SOURCES[source_url.scheme](source_url)
+ sys.stderr.write(source_url.geturl())
+ sys.stderr.write('\n')
tree = Tree()
for path, mode, blob in src:
@@ -102,6 +105,12 @@ def main():
# tree entry
tree.add(path, mode, blob.id)
+ sys.stderr.write(path)
+ sys.stderr.write('\n')
+
+ sys.stderr.write('\n')
+
+
repo.object_store.add_object(tree)
def get_user():
|
Write files to stderr.
|
diff --git a/tg_react/api/accounts/views.py b/tg_react/api/accounts/views.py
index <HASH>..<HASH> 100644
--- a/tg_react/api/accounts/views.py
+++ b/tg_react/api/accounts/views.py
@@ -52,6 +52,16 @@ class UserDetails(generics.RetrieveUpdateAPIView):
def get_object(self):
return self.request.user
+ def update(self, request, *args, **kwargs):
+ partial = kwargs.pop('partial', False)
+ instance = self.get_object()
+ serializer = self.get_serializer(instance, data=request.data, partial=partial)
+ if serializer.is_valid():
+ self.perform_update(serializer)
+ return Response(serializer.data)
+ else:
+ return Response({'errors': serializer.errors}, status=status.HTTP_400_BAD_REQUEST)
+
class AuthenticationView(APIView):
class UnsafeSessionAuthentication(SessionAuthentication):
|
Errors were not returned in desired form
|
diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go
index <HASH>..<HASH> 100644
--- a/nodeup/pkg/model/kube_apiserver.go
+++ b/nodeup/pkg/model/kube_apiserver.go
@@ -296,10 +296,9 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) {
kubeAPIServer.ServiceAccountSigningKeyFile = &s
}
}
-
- kubeAPIServer.ClientCAFile = filepath.Join(b.PathSrvKubernetes(), "ca.crt")
- if b.Cluster.Spec.KubeAPIServer.ClientCAFile != "" {
- kubeAPIServer.ClientCAFile = b.Cluster.Spec.KubeAPIServer.ClientCAFile
+ // If clientCAFile is not specified, set it to the default value ${PathSrvKubernetes}/ca.crt
+ if kubeAPIServer.ClientCAFile == "" {
+ kubeAPIServer.ClientCAFile = filepath.Join(b.PathSrvKubernetes(), "ca.crt")
}
kubeAPIServer.TLSCertFile = filepath.Join(b.PathSrvKubernetes(), "server.crt")
kubeAPIServer.TLSPrivateKeyFile = filepath.Join(b.PathSrvKubernetes(), "server.key")
|
Update the logic to set kubeAPIServer.ClientCAFile
|
diff --git a/src/NamelessCoder/Gizzle/JsonDataMapper.php b/src/NamelessCoder/Gizzle/JsonDataMapper.php
index <HASH>..<HASH> 100644
--- a/src/NamelessCoder/Gizzle/JsonDataMapper.php
+++ b/src/NamelessCoder/Gizzle/JsonDataMapper.php
@@ -42,7 +42,7 @@ abstract class JsonDataMapper {
} elseif (NULL === $propertyClass) {
$propertyValue = $propertyValue;
} elseif ('DateTime' === $propertyClass) {
- $propertyValue = new \DateTime($propertyValue);
+ $propertyValue = \DateTime::createFromFormat('U', $propertyValue);
} elseif (FALSE === strpos($propertyClass, '[]')) {
$propertyValue = new $propertyClass($propertyValue);
} elseif (NULL !== $propertyClass) {
|
[BUGFIX] Create DateTimes using format U, not constructor
Format of transmitted date times is unixtime, requiring construction using DateTime::createFromFormat('U', $value)
|
diff --git a/jlib-core/src/main/java/org/jlib/core/nullable/NullableUtility.java b/jlib-core/src/main/java/org/jlib/core/nullable/NullableUtility.java
index <HASH>..<HASH> 100644
--- a/jlib-core/src/main/java/org/jlib/core/nullable/NullableUtility.java
+++ b/jlib-core/src/main/java/org/jlib/core/nullable/NullableUtility.java
@@ -32,10 +32,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
*/
public final class NullableUtility {
- /** no visible constructor */
- private NullableUtility() {
- }
-
/**
* Compares the specified Objects for mutual equality. Two Objects {@code object1}, {@code object2} are considered
* equal if {@code object1 == object2 == null} or {@code object1.equals(object2)}.
@@ -85,4 +81,6 @@ public final class NullableUtility {
object.hashCode() :
0;
}
+
+ private NullableUtility() {}
}
|
NullableUtility: reordered
|
diff --git a/gandi/cli/core/params.py b/gandi/cli/core/params.py
index <HASH>..<HASH> 100644
--- a/gandi/cli/core/params.py
+++ b/gandi/cli/core/params.py
@@ -81,7 +81,8 @@ class DiskImageParamType(click.Choice):
def __init__(self):
""" Initialize choices list. """
gandi = GandiContextHelper()
- choices = [item['label'] for item in gandi.image.list()]
+ choices = [item['label'] for item in gandi.image.list()] + \
+ [item['name'] for item in gandi.disk.list()]
self.choices = choices
def convert(self, value, param, ctx):
|
add disks to the list of possible source images
|
diff --git a/src/functions/viewClassFactory.js b/src/functions/viewClassFactory.js
index <HASH>..<HASH> 100644
--- a/src/functions/viewClassFactory.js
+++ b/src/functions/viewClassFactory.js
@@ -4,7 +4,7 @@ function viewClassFactory(ctor, defaultOptions)
{
return function(options)
{
- return new ctor(mixins({}, defaultOptions || {}, options || {}));
+ return new ctor(mixins({}, (typeof defaultOptions === 'function' ? defaultOptions() : defaultOptions) || {}, options || {}));
}
}
|
feat(viewClassFactory): default options could be a function returning options object
This will enable use of lazy initialization of view options, i.e. shared singleton services
|
diff --git a/lib/py/src/transport/TSocket.py b/lib/py/src/transport/TSocket.py
index <HASH>..<HASH> 100644
--- a/lib/py/src/transport/TSocket.py
+++ b/lib/py/src/transport/TSocket.py
@@ -94,7 +94,7 @@ class TSocket(TSocketBase):
def flush(self):
pass
-class TServerSocket(TServerTransportBase, TSocketBase):
+class TServerSocket(TSocketBase, TServerTransportBase):
"""Socket implementation of TServerTransport base."""
def __init__(self, port=9090, unix_socket=None):
|
THRIFT-<I>. python: Make TServerSocket.close() work properly
Changing the order of inheritance makes "close" refer to the
(correct) TSocketBase method, rather than the (stub)
TServerTransportBase method.
git-svn-id: <URL>
|
diff --git a/lib/active_record_doctor/version.rb b/lib/active_record_doctor/version.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record_doctor/version.rb
+++ b/lib/active_record_doctor/version.rb
@@ -1,3 +1,3 @@
module ActiveRecordDoctor
- VERSION = "0.0.1"
+ VERSION = "1.0.0"
end
|
Bump the version number to <I>
|
diff --git a/example/article/admin.py b/example/article/admin.py
index <HASH>..<HASH> 100644
--- a/example/article/admin.py
+++ b/example/article/admin.py
@@ -1,14 +1,8 @@
from django.contrib import admin
from django.forms import ModelForm
+from django.utils.timezone import now
from article.models import Article
-# The timezone support was introduced in Django 1.4, fallback to standard library for 1.3.
-try:
- from django.utils.timezone import now
-except ImportError:
- from datetime import datetime
- now = datetime.now
-
class ArticleAdminForm(ModelForm):
|
Remove old Django compatibility code
|
diff --git a/dispatch/theme/widgets.py b/dispatch/theme/widgets.py
index <HASH>..<HASH> 100644
--- a/dispatch/theme/widgets.py
+++ b/dispatch/theme/widgets.py
@@ -82,10 +82,9 @@ class Zone(object):
zone.data = validated_data['data']
# Call widget before-save hook on nested widgets
- for i in range(len(list(zone.data.keys()))):
- current_key = zone.data.keys()[i]
- if isinstance(zone.data[current_key], dict) and ('id' in zone.data[current_key].keys()) and ('data' in zone.data[current_key].keys()):
- zone.data[current_key]['data'] = self.before_save(zone.data[current_key]['id'], zone.data[current_key]['data'])
+ for key in list(zone.data.keys()):
+ if isinstance(zone.data[key], dict) and ('id' in zone.data[key].keys()) and ('data' in zone.data[key].keys()):
+ zone.data[key]['data'] = self.before_save(zone.data[key]['id'], zone.data[key]['data'])
# Call widget before-save hook
zone.data = self.before_save(zone.widget_id, zone.data)
|
Clean up before-save hook for nested widgets
|
diff --git a/includes/os/class.SSH.inc.php b/includes/os/class.SSH.inc.php
index <HASH>..<HASH> 100644
--- a/includes/os/class.SSH.inc.php
+++ b/includes/os/class.SSH.inc.php
@@ -471,7 +471,12 @@ class SSH extends GNU
break;
case 'GNU':
case 'Linux':
- parent::_uptime();
+ if (CommonFunctions::executeProgram('cat', '/proc/uptime', $resulte, false) && ($resulte !== "")) {
+ $ar_buf = preg_split('/ /', $resulte);
+ $this->sys->setUptime(trim($ar_buf[0]));
+ } else {
+ parent::_uptime();
+ }
}
}
|
cat /proc/uptime
|
diff --git a/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackend.java b/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackend.java
index <HASH>..<HASH> 100644
--- a/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackend.java
+++ b/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackend.java
@@ -248,6 +248,7 @@ public class RocksDBStateBackend extends AbstractStateBackend {
} else {
dirs.add(f);
}
+ testDir.delete();
}
if (dirs.isEmpty()) {
|
[FLINK-<I>] Remove Testing Files in RocksDB Backend
We create random files on initialization to check whether we can write
to the data directory. These files are also removed now.
|
diff --git a/datafs/core/data_file.py b/datafs/core/data_file.py
index <HASH>..<HASH> 100644
--- a/datafs/core/data_file.py
+++ b/datafs/core/data_file.py
@@ -167,7 +167,6 @@ def open_file(authority, cache, update, service_path, latest_version_check, *arg
fs_wrapper.setwritefs(write_fs)
-
try:
f = fs_wrapper.open(service_path, *args, **kwargs)
@@ -252,7 +251,7 @@ def get_local_path(authority, cache, update, service_path, latest_version_check)
allow_recreate=True)
- if use_cache and cache.fs.isfile(service_path):
+ if use_cache and cache.fs.isfile(service_path) and latest_version_check(cache.fs.getsyspath(service_path)):
fs.utils.movefile(cache.fs, service_path, write_fs, service_path)
elif fs_wrapper.isfile(service_path):
@@ -272,6 +271,7 @@ def get_local_path(authority, cache, update, service_path, latest_version_check)
else:
raise OSError('Local file removed during execution. Archive not updated.')
+
finally:
@@ -279,4 +279,4 @@ def get_local_path(authority, cache, update, service_path, latest_version_check)
finally:
- shutil.rmtree(tmp)
\ No newline at end of file
+ shutil.rmtree(tmp)
|
cached get_local_file isn't updating on read
|
diff --git a/glue/pipeline.py b/glue/pipeline.py
index <HASH>..<HASH> 100644
--- a/glue/pipeline.py
+++ b/glue/pipeline.py
@@ -441,17 +441,11 @@ class CondorJob:
subfile.write( 'arguments = "' )
for c in self.__options.keys():
if self.__options[c]:
- if ' ' in self.__options[c] and '$(macro' not in self.__options[c]:
- # option has space, add single quotes around it
- self.__options[c] = ''.join([ "'", self.__options[c], "'" ])
subfile.write( ' --' + c + ' ' + self.__options[c] )
else:
subfile.write( ' --' + c )
for c in self.__short_options.keys():
if self.__short_options[c]:
- if ' ' in self.__short_options[c] and '$(macro' not in self.__short_options[c]:
- # option has space, add single quotes around it
- self.__short_options[c] = ''.join([ "'", self.__short_options[c], "'" ])
subfile.write( ' -' + c + ' ' + self.__short_options[c] )
else:
subfile.write( ' -' + c )
|
Fix PR<I>
partially revert <I>
|
diff --git a/lib/usersRepository.js b/lib/usersRepository.js
index <HASH>..<HASH> 100644
--- a/lib/usersRepository.js
+++ b/lib/usersRepository.js
@@ -43,7 +43,7 @@ module.exports = (reporter, admin) => {
})
}
- reporter.documentStore.collection('users').beforeInsertListeners.add('users', async (doc) => {
+ reporter.documentStore.collection('users').beforeInsertListeners.add('users', async (doc, req) => {
if (!doc.username) {
throw reporter.createError('username is required', {
statusCode: 400
@@ -77,7 +77,7 @@ module.exports = (reporter, admin) => {
doc.password = passwordHash.generate(doc.password)
}
- const users = await reporter.documentStore.collection('users').find({ username: doc.username })
+ const users = await reporter.documentStore.collection('users').find({ username: doc.username }, req)
if (users.length > 0) {
throw reporter.createError('User already exists', {
|
fix not using req in the beforeInsertListeners that validates duplicated user
this fix bug about can not insert duplicated user when doing full import-export and user is already on store and also on the export zip
|
diff --git a/tests/_support/Page/bill/Update.php b/tests/_support/Page/bill/Update.php
index <HASH>..<HASH> 100644
--- a/tests/_support/Page/bill/Update.php
+++ b/tests/_support/Page/bill/Update.php
@@ -24,9 +24,9 @@ class Update extends Create
$I = $this->tester;
$I->click("//tr[@data-key=$billId]/td/div/button");
- $I->click('//a[contains(text(),\'Update\')]');
+ $I->click("a[href='/finance/bill/update?id=$billId']");
- $I->seeInCurrentUrl('finance/bill/update?id');
+ $I->seeInCurrentUrl('finance/bill/update?id=' . $billId);
}
/**
|
bill update refinement (#<I>)
* asserts module was denied
* bill update refinement
|
diff --git a/src/prompts/questions.js b/src/prompts/questions.js
index <HASH>..<HASH> 100644
--- a/src/prompts/questions.js
+++ b/src/prompts/questions.js
@@ -80,5 +80,5 @@ export async function promptForVcsHostDetails(hosts, visibility, decisions) {
], decisions);
const host = hosts[answers[questionNames.REPO_HOST]];
- return {...answers, ...host && await host.prompt()};
+ return {...answers, ...host && await host.prompt({decisions})};
}
diff --git a/test/unit/prompts/questions-test.js b/test/unit/prompts/questions-test.js
index <HASH>..<HASH> 100644
--- a/test/unit/prompts/questions-test.js
+++ b/test/unit/prompts/questions-test.js
@@ -131,7 +131,7 @@ suite('project scaffolder prompts', () => {
);
const answersWithHostChoice = {...answers, [questionNames.REPO_HOST]: host};
const hostAnswers = any.simpleObject();
- hostPrompt.returns(hostAnswers);
+ hostPrompt.withArgs({decisions}).returns(hostAnswers);
conditionals.filterChoicesByVisibility.withArgs(hosts).returns(filteredHostChoices);
prompts.prompt
.withArgs([
|
feat(decisions): passed the decisions to the vcs-host scaffolder
|
diff --git a/spec/card_spec.rb b/spec/card_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/card_spec.rb
+++ b/spec/card_spec.rb
@@ -45,6 +45,16 @@ module Trello
end
end
+ context "updating" do
+ it "updating name does a put on the correct resource with the correct value" do
+ expected_new_name = "xxx"
+ expected_resource = "/card/#{@card.id}/name"
+
+ Client.should_receive(:put).once.with expected_resource, :value => expected_new_name
+ @card.name = expected_new_name
+ end
+ end
+
context "fields" do
it "gets its id" do
@card.id.should_not be_nil
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
include Trello
-describe Client,"and how it handles authorization" do
+describe Client, "and how it handles authorization" do
before do
fake_response = stub "A fake OK response"
fake_response.stub(:code).and_return 200
|
[METRIC_CHASING] About updating cards, updating name does a put on the correct resource with the correct value
|
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index <HASH>..<HASH> 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -614,17 +614,19 @@ function authenticate_user_login($username, $password) {
}
-function enrol_student($user, $course) {
+function enrol_student($userid, $courseid) {
/// Enrols a student in a given course
global $db;
- $record->userid = $user;
- $record->course = $course;
- $record->start = 0;
- $record->end = 0;
- $record->time = time();
-
- return insert_record("user_students", $record);
+ if (!record_exists("user_students", "userid", $userid, "course", $courseid)) {
+ $student->userid = $userid;
+ $student->course = $courseid;
+ $student->start = 0;
+ $student->end = 0;
+ $student->time = time();
+ return insert_record("user_students", $student);
+ }
+ return true;
}
function unenrol_student($user, $course=0) {
|
Don't enrol student if they are already enrolled.
|
diff --git a/lib/LineCol.php b/lib/LineCol.php
index <HASH>..<HASH> 100644
--- a/lib/LineCol.php
+++ b/lib/LineCol.php
@@ -80,10 +80,11 @@ final class LineCol
}
throw new OutOfBoundsException(sprintf(
- 'Position %s:%s is larger than text length %s',
+ 'Position %s:%s is larger than text length %s: %s',
$this->line(),
$this->col(),
- strlen($text)
+ strlen($text),
+ $text
));
}
diff --git a/lib/Util/LineAtOffset.php b/lib/Util/LineAtOffset.php
index <HASH>..<HASH> 100644
--- a/lib/Util/LineAtOffset.php
+++ b/lib/Util/LineAtOffset.php
@@ -26,7 +26,7 @@ final class LineAtOffset
$lastLine = '';
foreach ($lines as $line) {
$end = $start + strlen($line);
- if ($byteOffset >= $start && $byteOffset < $end) {
+ if ($byteOffset >= $start && $byteOffset <= $end) {
if (preg_match('{^(\r\n|\n|\r)$}', $line)) {
return $lastLine;
}
|
Fix bug with line-at-offset
|
diff --git a/test/test_helper.rb b/test/test_helper.rb
index <HASH>..<HASH> 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,6 +2,8 @@ require 'rubygems'
require 'test/unit'
$:.unshift File.expand_path('../../lib', __FILE__)
+ENV["TMUX"] = "true"
+
module FakeTmux
attr_reader :tmux_commands
|
Travis does not use tmux unfortunately :(
|
diff --git a/splinter/driver/webdriver/cookie_manager.py b/splinter/driver/webdriver/cookie_manager.py
index <HASH>..<HASH> 100644
--- a/splinter/driver/webdriver/cookie_manager.py
+++ b/splinter/driver/webdriver/cookie_manager.py
@@ -3,15 +3,10 @@
# Copyright 2012 splinter authors. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-import sys
+from urllib.parse import urlparse
from splinter.cookie_manager import CookieManagerAPI
-if sys.version_info[0] > 2:
- from urllib.parse import urlparse
-else:
- from urlparse import urlparse # NOQA
-
class CookieManager(CookieManagerAPI):
def add(self, cookie, **kwargs):
|
Remove useless py2x version check (#<I>)
|
diff --git a/ptest/screencapturer.py b/ptest/screencapturer.py
index <HASH>..<HASH> 100644
--- a/ptest/screencapturer.py
+++ b/ptest/screencapturer.py
@@ -290,11 +290,12 @@ def take_screenshots():
if system() == 'Darwin' and not pyobjc_installed:
screenshot["error"] = "The package pyobjc is necessary for taking screenshot of desktop, please install it."
else:
- output = BytesIO()
try:
+ output = BytesIO()
mss().save(output=output, screen=-1) # -1 means all monitors
+ value = output.getvalue()
with open(os.path.join(config.get_option("temp"), screenshot["path"]), mode="wb") as f:
- f.write(output.getvalue())
+ f.write(value)
except Exception as e:
screenshot["error"] = str(e).strip() or "\n".join([str(arg) for arg in e.args])
@@ -329,8 +330,9 @@ def take_screenshots():
pass
try:
+ value = web_driver.get_screenshot_as_png()
with open(os.path.join(config.get_option("temp"), screenshot["path"]), mode="wb") as f:
- f.write(web_driver.get_screenshot_as_png())
+ f.write(value)
except Exception as e:
screenshot["error"] = str(e).strip() or "\n".join([str(arg) for arg in e.args])
|
Fix empty screenshot when failed to capture screenshot.
|
diff --git a/eli5/formatters/image.py b/eli5/formatters/image.py
index <HASH>..<HASH> 100644
--- a/eli5/formatters/image.py
+++ b/eli5/formatters/image.py
@@ -46,6 +46,9 @@ def format_as_image(expl,
image = expl.image
heatmap = expl.heatmap
+ # We first 1. colorize 2. resize
+ # as opposed 1. resize 2. colorize
+
heatmap = colorize(heatmap, colormap=colormap)
# TODO: test colorize with a callable
diff --git a/eli5/keras.py b/eli5/keras.py
index <HASH>..<HASH> 100644
--- a/eli5/keras.py
+++ b/eli5/keras.py
@@ -103,7 +103,7 @@ def validate_doc(estimator, doc):
if len(input_sh) == 4:
# rank 4 with (batch, ...) shape
# check that we have only one image (batch size 1)
- single_batch = (1, *input_sh[1:])
+ single_batch = (1, input_sh[1], input_sh[2], input_sh[3])
if doc_sh != single_batch:
raise ValueError('Batch size does not match. '
'doc must be of shape: {}, '
|
Replace starred expression with manual indexing (py<I> build fix)
|
diff --git a/tinyrpc/protocols/jsonrpc.py b/tinyrpc/protocols/jsonrpc.py
index <HASH>..<HASH> 100644
--- a/tinyrpc/protocols/jsonrpc.py
+++ b/tinyrpc/protocols/jsonrpc.py
@@ -139,7 +139,7 @@ class JSONRPCRequest(RPCRequest):
jdata['params'] = self.args
if self.kwargs:
jdata['params'] = self.kwargs
- if self.unique_id != None:
+ if hasattr(self, 'unique_id') and self.unique_id is not None:
jdata['id'] = self.unique_id
return jdata
|
Support notifications, with <URL>
|
diff --git a/test/api-configuration.test.js b/test/api-configuration.test.js
index <HASH>..<HASH> 100644
--- a/test/api-configuration.test.js
+++ b/test/api-configuration.test.js
@@ -134,9 +134,13 @@ function PATTERN_IndexDocumentsResponse(members) {
IndexDocumentsResponse: {
'@': { xmlns: '' },
IndexDocumentsResult: {
- FieldNames: members.map(function(member) {
- return { member: '' };
- })
+ FieldNames: (function() {
+ var pattern = {};
+ members.forEach(function(member, index) {
+ pattern[index] = { member: '' };
+ });
+ return pattern;
+ })()
},
ResponseMetadata: PATTERN_ResponseMetadata
}
@@ -578,10 +582,15 @@ suite('Configuration API', function() {
body: PATTERN_IndexDocumentsResponse(expectedFieldNames) });
var fieldNames = response.body.IndexDocumentsResponse
.IndexDocumentsResult
- .FieldNames
- .map(function(member) {
- return member.member;
- });
+ .FieldNames;
+ fieldNames = (function() {
+ var names = [];
+ for (var i in fieldNames) {
+ if (fieldNames.hasOwnProperty(i))
+ names.push(fieldNames[i].member);
+ }
+ return names;
+ })();
assert.deepEqual(fieldNames, expectedFieldNames);
done();
|
Fix expected patterns for IndexDocuments response
|
diff --git a/safe/gui/tools/minimum_needs/needs_manager_dialog.py b/safe/gui/tools/minimum_needs/needs_manager_dialog.py
index <HASH>..<HASH> 100644
--- a/safe/gui/tools/minimum_needs/needs_manager_dialog.py
+++ b/safe/gui/tools/minimum_needs/needs_manager_dialog.py
@@ -702,10 +702,6 @@ class NeedsManagerDialog(QDialog, FORM_CLASS):
self.minimum_needs.save_profile(minimum_needs['profile'])
self.mark_current_profile_as_saved()
- # Emit combobox function in dock
- current_index = self.dock.cboFunction.currentIndex()
- self.dock.cboFunction.currentIndexChanged.emit(current_index)
-
def save_profile_as(self):
"""Save the minimum needs under a new profile name.
"""
|
remove useless code about IF function combobox in minimumneeds dialog
|
diff --git a/test/functional/test_dirty.rb b/test/functional/test_dirty.rb
index <HASH>..<HASH> 100644
--- a/test/functional/test_dirty.rb
+++ b/test/functional/test_dirty.rb
@@ -99,6 +99,13 @@ class DirtyTest < Test::Unit::TestCase
should "be false if no keys changed" do
@document.new.changed?.should be_false
end
+
+ should "not raise when key name is 'value'" do
+ @document.key :value, Integer
+
+ doc = @document.new
+ doc.value_changed?.should be_false
+ end
end
context "changes" do
|
Added test: _changed? should not raise when key name is 'value'
|
diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index <HASH>..<HASH> 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -123,7 +123,7 @@ const (
EnableEquivalenceClassCache utilfeature.Feature = "EnableEquivalenceClassCache"
// owner: @k82cn
- // alpha: v1.8
+ // beta: v1.12
//
// Taint nodes based on their condition status for 'NetworkUnavailable',
// 'MemoryPressure', 'OutOfDisk' and 'DiskPressure'.
@@ -304,7 +304,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
PodShareProcessNamespace: {Default: false, PreRelease: utilfeature.Alpha},
PodPriority: {Default: false, PreRelease: utilfeature.Alpha},
EnableEquivalenceClassCache: {Default: false, PreRelease: utilfeature.Alpha},
- TaintNodesByCondition: {Default: false, PreRelease: utilfeature.Alpha},
+ TaintNodesByCondition: {Default: true, PreRelease: utilfeature.Beta},
MountPropagation: {Default: true, PreRelease: utilfeature.Beta},
QOSReserved: {Default: false, PreRelease: utilfeature.Alpha},
ExpandPersistentVolumes: {Default: false, PreRelease: utilfeature.Alpha},
|
Upgrade TaintNodesByCondition to beta.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100755
--- a/index.js
+++ b/index.js
@@ -335,10 +335,12 @@ function setFSEventsListener(path, realPath, callback, rawEmitter) {
};
}
-FSWatcher.prototype._watchWithFsEvents = function(watchPath, realPath) {
+FSWatcher.prototype._watchWithFsEvents = function(watchPath, realPath, pt) {
if (this._isIgnored(watchPath)) return;
var watchCallback = function(fullPath, flags, info) {
- var path = sysPath.join(watchPath, sysPath.relative(watchPath, fullPath));
+ var path = pt(sysPath.join(
+ watchPath, sysPath.relative(watchPath, fullPath)
+ ));
// ensure directories are tracked
var parent = sysPath.dirname(path);
var item = sysPath.basename(path);
@@ -794,7 +796,7 @@ FSWatcher.prototype._addToFsEvents = function(file, pathTransform) {
if (this.options.persistent) {
fs.realpath(sysPath.resolve(file), function(error, realPath) {
if (error) realPath = file;
- _this._watchWithFsEvents(file, realPath);
+ _this._watchWithFsEvents(file, realPath, pathTransform);
});
}
return this;
|
Fix path resolution through symlinks
gh-<I>
|
diff --git a/webapp/js/nextserver.js b/webapp/js/nextserver.js
index <HASH>..<HASH> 100644
--- a/webapp/js/nextserver.js
+++ b/webapp/js/nextserver.js
@@ -112,8 +112,8 @@ function showPopup() {
x = $(this).find("ul.subnav");
// var t = $(this).parents().filter("td.actions-col");
// x.css({ "left": + t.position().left + "px" });
-
- var table = $(this).parents().filter("div.table-right-container,div.table-container,div.dashboardNavigation,div.analysisNavigation,div.table-actions");
+// trebuie adaugat tot timpul parintele in care se afla submeniul
+ var table = $(this).parents().filter("div.table-right-container,div.table-container,div.dashboardNavigation,div.analysisNavigation,div.table-actions, div.dashboardCapture");
var tt = table.position().top;
var th = table.height();
var tb = tt + th;
|
Add new parrent to showPopup function
|
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -174,7 +174,7 @@ Server.prototype._onHttpRequest = function (req, res) {
}
if (left === 0) swarm.complete += 1
else swarm.incomplete += 1
- swarm.peers[addr] = {
+ peer = swarm.peers[addr] = {
ip: ip,
port: port,
peerId: peerId
@@ -233,7 +233,7 @@ Server.prototype._onHttpRequest = function (req, res) {
return error('invalid event') // early return
}
- if (left === 0) peer.complete = true
+ if (left === 0 && peer) peer.complete = true
// send peers
var peers = compact === 1
@@ -367,7 +367,7 @@ Server.prototype._onUdpRequest = function (msg, rinfo) {
}
if (left === 0) swarm.complete += 1
else swarm.incomplete += 1
- swarm.peers[addr] = {
+ peer = swarm.peers[addr] = {
ip: ip,
port: port,
peerId: peerId
@@ -426,7 +426,7 @@ Server.prototype._onUdpRequest = function (msg, rinfo) {
return error('invalid event') // early return
}
- if (left === 0) peer.complete = true
+ if (left === 0 && peer) peer.complete = true
// send peers
var peers = self._getPeersCompact(swarm, numWant)
|
don't assume peer var will exist
|
diff --git a/lib/lita/adapters/shell.rb b/lib/lita/adapters/shell.rb
index <HASH>..<HASH> 100644
--- a/lib/lita/adapters/shell.rb
+++ b/lib/lita/adapters/shell.rb
@@ -3,6 +3,8 @@ module Lita
module Adapters
# An adapter that runs Lita in a UNIX shell.
class Shell < Adapter
+ config :private_chat, default: false
+
# Creates a "Shell User" and then loops a prompt and input, passing the
# incoming messages to the robot.
# @return [void]
@@ -39,7 +41,7 @@ module Lita
def build_message(input, source)
message = Message.new(robot, input, source)
- message.command! if robot.config.adapter.private_chat
+ message.command! if robot.config.adapters.shell.private_chat
message
end
diff --git a/spec/lita/adapters/shell_spec.rb b/spec/lita/adapters/shell_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lita/adapters/shell_spec.rb
+++ b/spec/lita/adapters/shell_spec.rb
@@ -27,8 +27,8 @@ describe Lita::Adapters::Shell, lita: true do
subject.run
end
- it "marks messages as commands if config.adapter.private_chat is true" do
- registry.config.adapter.private_chat = true
+ it "marks messages as commands if config.adapters.shell.private_chat is true" do
+ registry.config.adapters.shell.private_chat = true
expect_any_instance_of(Lita::Message).to receive(:command!)
subject.run
end
|
Use new-style config for shell adapter.
|
diff --git a/Eloquent/Builder.php b/Eloquent/Builder.php
index <HASH>..<HASH> 100755
--- a/Eloquent/Builder.php
+++ b/Eloquent/Builder.php
@@ -1143,6 +1143,28 @@ class Builder
}
/**
+ * Add the given scopes to the current builder instance.
+ *
+ * @param array $scopes
+ * @return mixed
+ */
+ public function scopes(array $scopes)
+ {
+ $builder = $this;
+
+ foreach ($scopes as $scope => $parameters) {
+ if (is_int($scope)) {
+ $scope = $parameters;
+ $parameters = [];
+ }
+
+ $builder = $builder->callScope('scope'.ucfirst($scope), (array) $parameters);
+ }
+
+ return $builder;
+ }
+
+ /**
* Apply the given scope on the current builder instance.
*
* @param callable $scope
|
Add method to implement multiple scopes with variable names
|
diff --git a/KrToolBaseClass.php b/KrToolBaseClass.php
index <HASH>..<HASH> 100644
--- a/KrToolBaseClass.php
+++ b/KrToolBaseClass.php
@@ -8,11 +8,15 @@ class KrToolBaseClass {
public function setSettings( $settings ) {
foreach ( $this->settingsKeys as $key ) {
- if ( !array_key_exists( $key, $settings ) ) {
+ if ( !isset( $this->settings[ $key ] ) && !array_key_exists( $key, $settings ) ) {
throw new InvalidArgumentException( "Settings must have key $key." );
}
}
- $this->settings = $settings;
+ foreach ( $settings as $key => $value ) {
+ if ( in_array( $key, $this->settingsKeys ) ) {
+ $this->settings[ $key ] = $value;
+ }
+ }
}
public function getSetting( $key ) {
|
Allow ToolBaseClass to have default settings
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,8 @@ setup(
long_description=open(join(here, 'README.rst')).read(),
packages=find_packages(),
test_suite='tests',
- dependency_links=['https://github.com/trezor/python-mnemonic/archive/master.zip#egg=mnemonic-0.6'],
- install_requires=['ecdsa>=0.9', 'protobuf', 'mnemonic>=0.6', 'hidapi>=0.7.99'],
+ dependency_links=['https://github.com/trezor/python-mnemonic/archive/master.zip#egg=mnemonic-0.8'],
+ install_requires=['ecdsa>=0.9', 'protobuf', 'mnemonic>=0.8', 'hidapi>=0.7.99'],
include_package_data=True,
zip_safe=False,
classifiers=[
|
Uses mnemonic>=<I> (improved UTF8 handling)
|
diff --git a/src/Phinx/Db/Adapter/MysqlAdapter.php b/src/Phinx/Db/Adapter/MysqlAdapter.php
index <HASH>..<HASH> 100644
--- a/src/Phinx/Db/Adapter/MysqlAdapter.php
+++ b/src/Phinx/Db/Adapter/MysqlAdapter.php
@@ -350,8 +350,7 @@ class MysqlAdapter extends PdoAdapter implements AdapterInterface
*/
public function hasColumn($tableName, $columnName)
{
- $sql = sprintf('SHOW COLUMNS FROM %s', $this->quoteTableName($tableName));
- $rows = $this->fetchAll($sql);
+ $rows = $this->fetchAll(sprintf('SHOW COLUMNS FROM %s', $this->quoteTableName($tableName)));
foreach ($rows as $column) {
if (strcasecmp($column['Field'], $columnName) === 0) {
return true;
|
refs #<I> comment, sprintf and fetAll as one line
|
diff --git a/src/providers/sh/util/alias.js b/src/providers/sh/util/alias.js
index <HASH>..<HASH> 100755
--- a/src/providers/sh/util/alias.js
+++ b/src/providers/sh/util/alias.js
@@ -217,7 +217,7 @@ module.exports = class Alias extends Now {
return bail(new Error(body.error.message))
}
- // The two expected succesful cods are 200 and 304
+ // The two expected successful codes are 200 and 304
if (res.status !== 200 && res.status !== 304) {
throw new Error('Unhandled error')
}
@@ -524,7 +524,7 @@ module.exports = class Alias extends Now {
return bail(new Error(body.error.message))
}
- // The two expected succesful cods are 200 and 304
+ // The two expected successful codes are 200 and 304
if (res.status !== 200 && res.status !== 304) {
throw new Error('Unhandled error')
}
|
Fixed a few comment typos (#<I>)
|
diff --git a/config/environment.rb b/config/environment.rb
index <HASH>..<HASH> 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -17,13 +17,11 @@ Radiant::Initializer.run do |config|
# Only load the extensions named here, in the order given. By default all
# extensions in vendor/extensions are loaded, in alphabetical order. :all
# can be used as a placeholder for all extensions not explicitly named.
- config.extensions = [ :all ]
+ # config.extensions = [ :all ]
# By default, only English translations are loaded. Remove any of these from
# the list below if you'd like to provide any of the additional options
- config.ignore_extensions [:dutch_language_pack, :french_language_pack, :german_language_pack,
- :italian_language_pack, :japanese_language_pack, :russian_language_pack,
- :debug]
+ # config.ignore_extensions []
# Your secret key for verifying cookie session data integrity.
# If you change this key, all old sessions will become invalid!
|
a little more parity with the instance generator environment.rb
|
diff --git a/libnfldap.py b/libnfldap.py
index <HASH>..<HASH> 100644
--- a/libnfldap.py
+++ b/libnfldap.py
@@ -221,6 +221,7 @@ COMMIT
class LDAP(object):
def __init__(self, url, bind_dn, bind_passwd):
self.conn = ldap.initialize(url)
+ self.conn.start_tls_s()
self.conn.simple_bind_s(bind_dn, bind_passwd)
self.schema = {}
|
Add STARTTLS to LDAP connection
|
diff --git a/openquake/calculators/event_based.py b/openquake/calculators/event_based.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/event_based.py
+++ b/openquake/calculators/event_based.py
@@ -600,8 +600,11 @@ class EventBasedCalculator(ClassicalCalculator):
# save individual curves
if self.oqparam.individual_curves:
for i in sorted(result):
+ key = 'hcurves/rlz-%03d' % i
if result[i]:
- self.datastore['hcurves/rlz-%03d' % i] = result[i]
+ self.datastore[key] = result[i]
+ else:
+ logging.info('Zero curves for %s', key)
# compute and save statistics; this is done in process
# we don't need to parallelize, since event based calculations
# involves a "small" number of sites (<= 65,536)
|
Added a warning for zero hazard curves
Former-commit-id: fe<I>d<I>ef<I>c4b<I>b<I>defdcc<I>a<I>a
|
diff --git a/plugins/worker/web_client/JobStatus.js b/plugins/worker/web_client/JobStatus.js
index <HASH>..<HASH> 100644
--- a/plugins/worker/web_client/JobStatus.js
+++ b/plugins/worker/web_client/JobStatus.js
@@ -28,7 +28,7 @@ JobStatus.registerStatus({
WORKER_CANCELING: {
value: 824,
text: 'Canceling',
- icon: 'icon-cancel',
+ icon: 'icon-spin3 animate-spin',
color: '#f89406'
}
});
|
Change canceling icon to 'spinning orange'
|
diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Workflow/Workflow.php
+++ b/src/Symfony/Component/Workflow/Workflow.php
@@ -126,10 +126,10 @@ class Workflow
$this->enter($subject, $transition, $marking);
- $this->announce($subject, $transition, $marking);
-
$this->markingStore->setMarking($subject, $marking);
+ $this->announce($subject, $transition, $marking);
+
return $marking;
}
|
[Workflow] Set the marking then announce enabled transition
It allows to auto-apply some transition from a listener.
The feature was asked here: <URL>
|
diff --git a/lib/hmr/client.js b/lib/hmr/client.js
index <HASH>..<HASH> 100644
--- a/lib/hmr/client.js
+++ b/lib/hmr/client.js
@@ -7,20 +7,12 @@ var socket = socketIOClient(opts.root + opts.namespace, {
path: opts.path
});
-var hot = false;
-
var currentHash = '';
var reload = function() {
- if (hot) {
- console.info('[WPW-HMR] Reloading via HMR...');
-
- window.postMessage('webpackHotUpdate' + currentHash, '*');
- } else {
- console.info('[WPW-HMR] Reloading via restart...');
+ console.info('[WPW-HMR] Triggering HMR with hash ' + currentHash + '...');
- window.location.reload();
- }
+ window.postMessage('webpackHotUpdate' + currentHash, '*');
};
socket.on('connect', function() {
@@ -28,8 +20,6 @@ socket.on('connect', function() {
});
socket.on('hot', function() {
- hot = true;
-
console.info('[WPW-HMR] Hot Module Replacement enabled');
});
@@ -39,8 +29,6 @@ socket.on('invalid', function() {
socket.on('hash', function(hash) {
currentHash = hash;
-
- console.info('[WPW-HMR] Latest hash ' + hash);
});
socket.on('no-change', function() {
|
Removed auto reload from the client-side hmr
|
diff --git a/tornado/testing.py b/tornado/testing.py
index <HASH>..<HASH> 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -417,10 +417,8 @@ class AsyncHTTPSTestCase(AsyncHTTPTestCase):
Interface is generally the same as `AsyncHTTPTestCase`.
"""
def get_http_client(self):
- # Some versions of libcurl have deadlock bugs with ssl,
- # so always run these tests with SimpleAsyncHTTPClient.
- return SimpleAsyncHTTPClient(io_loop=self.io_loop, force_instance=True,
- defaults=dict(validate_cert=False))
+ return AsyncHTTPClient(io_loop=self.io_loop, force_instance=True,
+ defaults=dict(validate_cert=False))
def get_httpserver_options(self):
return dict(ssl_options=self.get_ssl_options())
|
Remove a special case that avoided using curl in tests for HTTPS.
This problem should have long since been fixed; any problematic
configurations don't deserve to misleadingly pass the tests.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -24,5 +24,5 @@ setup(
description='Modular Optimisation tools for soliving inverse problems.',
long_description=release_info["__about__"],
setup_requires=['pytest-runner', ],
- tests_require=['pytest', 'pytest-cov', 'pytest-pep8'],
+ tests_require=['pytest==4.6.4', 'pytest-cov==2.5.1', 'pytest-pep8'],
)
|
fixed pytest version for python <I> support
|
diff --git a/features/step_definitions/wait_steps.rb b/features/step_definitions/wait_steps.rb
index <HASH>..<HASH> 100644
--- a/features/step_definitions/wait_steps.rb
+++ b/features/step_definitions/wait_steps.rb
@@ -78,7 +78,8 @@ Then('the removing collection of sections disappears') do
end
Then('I can wait a variable time for elements to disappear') do
- expect { @test_site.home.removing_links(wait: 2.6) }.not_to raise_error
+ expect { @test_site.home.removing_links(wait: 1.9, count: 0) }
+ .not_to raise_error
expect(@test_site.home).to have_no_removing_links
end
|
Ensure that when doing the negative wait we pass in the counter to be zeroed, and not just counter to be active£
|
diff --git a/utils/utils.go b/utils/utils.go
index <HASH>..<HASH> 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -76,10 +76,12 @@ func RunUnderSystemdScope(pid int, slice, unitName string) error {
return err
}
properties = append(properties,
- systemdDbus.PropSlice(slice),
newProp("PIDs", []uint32{uint32(pid)}),
newProp("Delegate", true),
newProp("DefaultDependencies", false))
+ if slice != "" {
+ properties = append(properties, systemdDbus.PropSlice(slice))
+ }
ch := make(chan string)
_, err = conn.StartTransientUnit(unitName, "replace", properties, ch)
if err != nil {
|
utils: check that the slice name is not null
|
diff --git a/master/buildbot/test/unit/test_mq_wamp.py b/master/buildbot/test/unit/test_mq_wamp.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/test/unit/test_mq_wamp.py
+++ b/master/buildbot/test/unit/test_mq_wamp.py
@@ -13,6 +13,7 @@
#
# Copyright Buildbot Team Members
import os
+import textwrap
import mock
from autobahn.wamp.types import EventDetails
@@ -157,10 +158,9 @@ class WampMQReal(unittest.TestCase):
Tests a little bit more painful to run, but which involve real communication with
a wamp router
"""
- HOW_TO_RUN = """ \
- define WAMP_ROUTER_URL to a wamp router to run this test\
- e.g: WAMP_ROUTER_URL=ws://localhost:8000/ws
- """
+ HOW_TO_RUN = textwrap.dedent("""\
+ define WAMP_ROUTER_URL to a wamp router to run this test
+ e.g: WAMP_ROUTER_URL=ws://localhost:8000/ws""")
# if connection is bad, this test can timeout easily
# we reduce the timeout to help maintain the sanity of the developer
timeout = 2
|
fix WAMP warning formatting
Previsously it was seen as:
```
[SKIPPED]
define WAMP_ROUTER_URL to a wamp router to run this test e.g: WAMP_ROUTER_URL=ws://localhost:<I>/ws
```
|
diff --git a/lib/view.js b/lib/view.js
index <HASH>..<HASH> 100755
--- a/lib/view.js
+++ b/lib/view.js
@@ -37,13 +37,23 @@ require("./request").call(View.prototype);
*
* @return {object} this Chainable
*/
-View.prototype.query = function (query, callback) {
+View.prototype.query = function (query, postData, callback) {
if (typeof query === "function") {
callback = query;
query = {};
+ postData = null;
}
-
- return this.req("get", { query: query }, callback);
+
+ if(typeof postData === "function") {
+ callback = postData;
+ postData = null;
+ }
+
+ if(!postData) {
+ return this.req("get", { query: query }, callback);
+ } else {
+ return this.req("post", { query: query }, postData, callback);
+ }
};
/**
|
Updating view module to allow POSTing to views - for sending keys=[]
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -379,7 +379,7 @@ gulp.task('docs-default', function (callback) {
});
// Generates a new local build of the docs.
-gulp.task('docs-local', ['docs-default'], shell.task('bundle exec jekyll build --config=_config.yml,_config_local.yml', {
+gulp.task('docs-local', ['docs-config-local', 'docs-default'], shell.task('bundle exec jekyll build --config=_config.yml,_config_local.yml', {
cwd: __dirname + '/_docs',
verbose: true
}));
|
Added missing docs-config-local dependency to docs-local
|
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index <HASH>..<HASH> 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -333,7 +333,7 @@ gulp.task('clean-vscode-linux-arm', util.rimraf(path.join(path.dirname(root), 'V
gulp.task('clean-vscode-linux-ia32-deb', util.rimraf('.build/linux/i386'));
gulp.task('clean-vscode-linux-x64-deb', util.rimraf('.build/linux/amd64'));
-gulp.task('vscode-win32', [/*'optimize-vscode', */'clean-vscode-win32'], packageTask('win32'));
+gulp.task('vscode-win32', ['optimize-vscode', 'clean-vscode-win32'], packageTask('win32'));
gulp.task('vscode-darwin', ['optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin'));
gulp.task('vscode-linux-ia32', ['optimize-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32'));
gulp.task('vscode-linux-x64', ['optimize-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64'));
|
Enable optimze-vscode again for vscode-win<I>
|
diff --git a/cassandra/src/main/java/org/opennms/newts/persistence/cassandra/Aggregation.java b/cassandra/src/main/java/org/opennms/newts/persistence/cassandra/Aggregation.java
index <HASH>..<HASH> 100644
--- a/cassandra/src/main/java/org/opennms/newts/persistence/cassandra/Aggregation.java
+++ b/cassandra/src/main/java/org/opennms/newts/persistence/cassandra/Aggregation.java
@@ -66,14 +66,14 @@ public class Aggregation implements Iterable<Row<Measurement>>, Iterator<Row<Mea
// accumulate
for (Datasource ds : getDatasources()) {
Measurement m = m_working.getElement(ds.getSource());
- values.put(ds.getSource(), m != null ? m.getValue() : Double.NaN);
+ values.put(ds.getLabel(), m != null ? m.getValue() : Double.NaN);
}
// next working
m_working = m_input.hasNext() ? m_input.next() : null;
}
for (Datasource ds : getDatasources()) {
- Double v = aggregate(ds, values.get(ds.getSource()));
+ Double v = aggregate(ds, values.get(ds.getLabel()));
m_nextOut.addElement(new Measurement(m_nextOut.getTimestamp(), m_resource, ds.getLabel(), v));
}
|
collate by label, not source name
|
diff --git a/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java b/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java
index <HASH>..<HASH> 100644
--- a/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java
+++ b/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java
@@ -406,7 +406,7 @@ public class JsonQueryObjectModelConverter {
addType(objectNode, queryPart, type, false);
} else if (typeNode.isObject()) {
ObjectNode typeDef = (ObjectNode) typeNode;
- addType(objectNode, queryPart, typeDef.get("name").asText(), typeDef.get("includeAllSubTypes").asBoolean());
+ addType(objectNode, queryPart, typeDef.get("name").asText(), typeDef.has("includeAllSubTypes") && typeDef.get("includeAllSubTypes").asBoolean());
} else {
throw new QueryException("\"types\"[" + i + "] must be of type string");
}
|
Don't require includeAllSubTypes field
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ with open('README.md') as f:
with open('LICENSE') as f:
license = f.read()
-__version__ = '0.0.0.dev10'
+__version__ = '1.0.0'
setup(
name='aperturelib',
|
Updated version to <I>
|
diff --git a/lib/discordrb/data.rb b/lib/discordrb/data.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/data.rb
+++ b/lib/discordrb/data.rb
@@ -260,6 +260,12 @@ module Discordrb
attr_reader :deaf
alias_method :deafened?, :deaf
+ # @return [Time] when this member joined the server.
+ attr_reader :joined_at
+
+ # Alias the creation_time because Members are not IDObjects as they don't technically have IDs
+ alias_method :creation_time, :joined_at
+
# @!visibility private
def initialize(data, server, bot)
@bot = bot
|
Create a reader for joined_at
|
diff --git a/lib/sorcery/version.rb b/lib/sorcery/version.rb
index <HASH>..<HASH> 100644
--- a/lib/sorcery/version.rb
+++ b/lib/sorcery/version.rb
@@ -1,3 +1,3 @@
module Sorcery
- VERSION = "0.10.14"
+ VERSION = "0.9.1"
end
|
Fixes version (I was testing)
|
diff --git a/tests/system/Log/FileHandlerTest.php b/tests/system/Log/FileHandlerTest.php
index <HASH>..<HASH> 100644
--- a/tests/system/Log/FileHandlerTest.php
+++ b/tests/system/Log/FileHandlerTest.php
@@ -10,6 +10,7 @@ class FileHandlerTest extends \CIUnitTestCase
protected function setUp(): void
{
+ parent::setUp();
$this->root = vfsStream::setup('root');
$this->start = $this->root->url() . '/';
}
|
Fix FilerHandlerTest.php wierdness
All tests would fail when this class was run by itself.
setUp() method needed call the parent::setUp()
|
diff --git a/src/controllers/admin/AdminCrudController.php b/src/controllers/admin/AdminCrudController.php
index <HASH>..<HASH> 100644
--- a/src/controllers/admin/AdminCrudController.php
+++ b/src/controllers/admin/AdminCrudController.php
@@ -101,6 +101,10 @@ abstract class AdminCrudController extends AdminAngelController {
return $this->also_add_menu_item($this->model, $object->id);
}
+ return $this->add_redirect($object);
+ }
+ public function add_redirect($object)
+ {
return Redirect::to($this->uri())->with('success', '
<p>' . $this->model . ' successfully created.</p>
');
@@ -159,7 +163,11 @@ abstract class AdminCrudController extends AdminAngelController {
$change->save();
}
- return Redirect::to($this->uri('edit/' . $id))->with('success', '
+ return $this->edit_redirect($object);
+ }
+ public function edit_redirect($object)
+ {
+ return Redirect::to($this->uri('edit/' . $object->id))->with('success', '
<p>' . $this->model . ' successfully updated.</p>
<p><a href="' . $this->uri('', true) . '">Return to index</a></p>
');
|
add_redirect and edit_redirect
|
diff --git a/assets/app/js/app.utils.js b/assets/app/js/app.utils.js
index <HASH>..<HASH> 100755
--- a/assets/app/js/app.utils.js
+++ b/assets/app/js/app.utils.js
@@ -360,6 +360,10 @@
return App.Utils.renderer.default(v);
};
+ App.Utils.renderer.wysiwyg = function(v) {
+ v = App.Utils.stripTags(v);
+ return v.length < 50 ? v : App.$.trim(v).substring(0, 50).split(' ').slice(0, -1).join(' ') + '...';
+ };
App.Utils.renderValue = function(renderer, v, meta) {
return (this.renderer[renderer] || this.renderer.default)(v, meta);
|
added simple wysiwg renderer
It strips tags and than truncates words instead of characters to
preserve special chars like `ä`
|
diff --git a/rockAtlas/cl_utils.py b/rockAtlas/cl_utils.py
index <HASH>..<HASH> 100644
--- a/rockAtlas/cl_utils.py
+++ b/rockAtlas/cl_utils.py
@@ -135,7 +135,8 @@ def main(arguments=None):
from rockAtlas.phot import download
data = download(
log=log,
- settings=settings
+ settings=settings,
+ dev_flag=True
)
data.get(days=days)
diff --git a/rockAtlas/phot/download.py b/rockAtlas/phot/download.py
index <HASH>..<HASH> 100644
--- a/rockAtlas/phot/download.py
+++ b/rockAtlas/phot/download.py
@@ -55,7 +55,7 @@ class download():
self,
log,
settings=False,
- dev_flag=0
+ dev_flag=False
):
self.log = log
log.debug("instansiating a new 'download' object")
|
dev_flag to downloader
|
diff --git a/src/Ubiquity/log/Logger.php b/src/Ubiquity/log/Logger.php
index <HASH>..<HASH> 100644
--- a/src/Ubiquity/log/Logger.php
+++ b/src/Ubiquity/log/Logger.php
@@ -93,7 +93,7 @@ abstract class Logger {
public static function close() {
if (self::$test) {
- self::$instance->close ();
+ self::$instance->_close ();
}
}
@@ -113,6 +113,8 @@ abstract class Logger {
abstract public function _clearAll();
+ abstract public function _close();
+
public static function isActive() {
return self::$test;
}
|
fix recursive pb
|
diff --git a/web/concrete/src/Tree/TreeType.php b/web/concrete/src/Tree/TreeType.php
index <HASH>..<HASH> 100644
--- a/web/concrete/src/Tree/TreeType.php
+++ b/web/concrete/src/Tree/TreeType.php
@@ -57,7 +57,7 @@ class TreeType extends Object
$db = Database::connection();
$row = $db->GetRow('select * from TreeTypes where treeTypeID = ?', array($treeTypeID));
if (is_array($row) && $row['treeTypeID']) {
- $type = new self();
+ $type = new static();
$type->setPropertiesFromArray($row);
return $type;
@@ -69,7 +69,7 @@ class TreeType extends Object
$db = Database::connection();
$row = $db->GetRow('select * from TreeTypes where treeTypeHandle = ?', array($treeTypeHandle));
if (is_array($row) && $row['treeTypeHandle']) {
- $type = new self();
+ $type = new static();
$type->setPropertiesFromArray($row);
return $type;
|
Use LSB in TreeType
Late static bindings allow us to instantiate the called class rather than the class that the constructor is defined in.
Former-commit-id: <I>fd4e<I>bcf6dae3cca<I>ae9e<I>b<I>cf0
Former-commit-id: <I>f4cbd<I>afe8e7eabbe<I>b<I>e<I>b<I>eb2
|
diff --git a/spyder/app/mainwindow.py b/spyder/app/mainwindow.py
index <HASH>..<HASH> 100644
--- a/spyder/app/mainwindow.py
+++ b/spyder/app/mainwindow.py
@@ -1208,13 +1208,18 @@ class MainWindow(QMainWindow):
else:
# Load last project if a project was active when Spyder
# was closed
+ reopen_last_session = False
if projects:
projects.reopen_last_project()
+ if projects.get_active_project() is None:
+ reopen_last_session = True
+ else:
+ reopen_last_session = True
- # If no project is active, load last session
- if projects and projects.get_active_project() is None:
- if editor:
- editor.setup_open_files(close_previous_files=False)
+ # If no project is active or Projects is disabled, load last
+ # session
+ if editor and reopen_last_session:
+ editor.setup_open_files(close_previous_files=False)
# Raise the menuBar to the top of the main window widget's stack
# Fixes spyder-ide/spyder#3887.
|
Main Window: Load previous session if Projects is disabled
|
diff --git a/public/app/features/playlist/playlist_routes.js b/public/app/features/playlist/playlist_routes.js
index <HASH>..<HASH> 100644
--- a/public/app/features/playlist/playlist_routes.js
+++ b/public/app/features/playlist/playlist_routes.js
@@ -3,7 +3,7 @@ define([
'app/core/config',
'lodash'
],
-function (angular, config, _) {
+function (angular) {
'use strict';
var module = angular.module('grafana.routes');
|
fix(playlist): fix broken build. unused vars
|
diff --git a/aiogram/types/user.py b/aiogram/types/user.py
index <HASH>..<HASH> 100644
--- a/aiogram/types/user.py
+++ b/aiogram/types/user.py
@@ -69,7 +69,7 @@ class User(base.TelegramObject):
as_html = True
if name is None:
- name = self.mention
+ name = self.full_name
if as_html:
return markdown.hlink(name, self.url)
return markdown.link(name, self.url)
|
Use User.full_name instead User.mention in User.get_mention() method.
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -251,7 +251,7 @@ function parseData(chunk, telnetObj, callback) {
if (promptIndex === -1 && stringData.length !== 0) {
if (search(stringData, telnetObj.pageSeparator) !== -1) {
- telnetObj.telnetSocket.write(Buffer('20', 'hex'))
+ telnetObj.telnetSocket.write(Buffer.from('20', 'hex'))
}
return
@@ -306,7 +306,7 @@ function negotiate(socket, chunk) {
negResp = negData.toString('hex').replace(/fd/g, 'fc').replace(/fb/g, 'fd')
- if (socket.writable) socket.write(Buffer(negResp, 'hex'))
+ if (socket.writable) socket.write(Buffer.from(negResp, 'hex'))
if (cmdData != undefined) return cmdData
else return
|
use Buffer.from instead of Buffer
|
diff --git a/test/tape/raw.js b/test/tape/raw.js
index <HASH>..<HASH> 100644
--- a/test/tape/raw.js
+++ b/test/tape/raw.js
@@ -71,16 +71,6 @@ test('allows for options in raw queries, #605', function(t) {
})
})
-test('undefined named bindings are ignored', function(t) {
-
- t.plan(2)
-
- t.equal(raw('select :item from :place', {}).toSQL().sql, 'select :item from :place')
-
- t.equal(raw('select :item :cool 2 from :place', {item: 'col1'}).toSQL().sql, 'select ? :cool 2 from :place')
-
-})
-
test('raw bindings are optional, #853', function(t) {
t.plan(2)
|
Remove test "undefined named bindings are ignored" as they are no longer ignored.
|
diff --git a/tests/Gliph/Visitor/DepthFirstBasicVisitorTest.php b/tests/Gliph/Visitor/DepthFirstBasicVisitorTest.php
index <HASH>..<HASH> 100644
--- a/tests/Gliph/Visitor/DepthFirstBasicVisitorTest.php
+++ b/tests/Gliph/Visitor/DepthFirstBasicVisitorTest.php
@@ -88,7 +88,7 @@ class DepthFirstBasicVisitorTest extends SimpleStatefulDepthFirstVisitorTestBase
* @covers ::getReachable
*/
public function testTraversalWithStartPoint() {
- DepthFirst::traverse($this->g, $this->vis, $this->v['a']);
+ DepthFirst::traverse($this->g, $this->vis);
$this->assertCount(3, $this->vis->getReachable($this->v['a']));
$this->assertCount(2, $this->vis->getReachable($this->v['b']));
$this->assertCount(0, $this->vis->getReachable($this->v['c']));
|
Let the DepthFirstVisitor test do find_sources() for coverage.
|
diff --git a/test/connection.js b/test/connection.js
index <HASH>..<HASH> 100644
--- a/test/connection.js
+++ b/test/connection.js
@@ -15,11 +15,14 @@ describe('connection', function() {
});
});
- it('should work in a worker', function(done){
- var worker = new Worker('/test/support/worker.js');
- worker.onmessage = function(e){
- expect(e.data);
- done();
- };
- });
+ // no `Worker` on old IE
+ if (global.Worker) {
+ it('should work in a worker', function(done){
+ var worker = new Worker('/test/support/worker.js');
+ worker.onmessage = function(e){
+ expect(e.data);
+ done();
+ };
+ });
+ }
});
|
test: disable worker test via feature detection
|
diff --git a/storage.js b/storage.js
index <HASH>..<HASH> 100644
--- a/storage.js
+++ b/storage.js
@@ -687,13 +687,15 @@ function updateMinRetrievableMciAfterStabilizingMci(conn, last_stable_mci, handl
findLastBallMciOfMci(conn, last_stable_mci, function(last_ball_mci){
if (last_ball_mci <= min_retrievable_mci) // nothing new
return handleMinRetrievableMci(min_retrievable_mci);
+ var prev_min_retrievable_mci = min_retrievable_mci;
min_retrievable_mci = last_ball_mci;
// strip content off units older than min_retrievable_mci
conn.query(
// 'JOIN messages' filters units that are not stripped yet
- "SELECT DISTINCT unit, content_hash FROM units JOIN messages USING(unit) WHERE main_chain_index<=? AND sequence='final-bad'",
- [min_retrievable_mci],
+ "SELECT DISTINCT unit, content_hash FROM units JOIN messages USING(unit) \n\
+ WHERE main_chain_index<=? AND main_chain_index>=? AND sequence='final-bad'",
+ [min_retrievable_mci, prev_min_retrievable_mci],
function(unit_rows){
var arrQueries = [];
async.eachSeries(
|
narrow mci interval for faster select
|
diff --git a/Swat/SwatWidgetCellRenderer.php b/Swat/SwatWidgetCellRenderer.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatWidgetCellRenderer.php
+++ b/Swat/SwatWidgetCellRenderer.php
@@ -312,7 +312,7 @@ class SwatWidgetCellRenderer extends SwatCellRenderer implements SwatUIParent,
*
* @return array an array of widgets indexed by replicator_id
*/
- public function &getWidgets($widget_id = null)
+ public function getWidgets($widget_id = null)
{
$form = $this->getForm();
if ($form !== null && $form->isSubmitted()) {
|
Don't return reference since it is not needed.
svn commit r<I>
|
diff --git a/Condorcet.class.php b/Condorcet.class.php
index <HASH>..<HASH> 100644
--- a/Condorcet.class.php
+++ b/Condorcet.class.php
@@ -207,13 +207,14 @@ class Condorcet
///
- public function __construct ($algo = null)
+ public function __construct ($method = null)
{
$this->_method = self::$_class_method ;
$this->_options = array() ;
$this->_votes = array() ;
- $this->_algos = self::add_algos($algo) ;
+
+ $this->setMethod($method) ;
}
|
Bugfix about object method in constructor
|
diff --git a/integration-tests/spec/backgroundable_spec.rb b/integration-tests/spec/backgroundable_spec.rb
index <HASH>..<HASH> 100644
--- a/integration-tests/spec/backgroundable_spec.rb
+++ b/integration-tests/spec/backgroundable_spec.rb
@@ -24,7 +24,7 @@ describe "backgroundable tests" do
visit "/background"
page.should have_content('it worked')
@background.publish "release"
- result = @foreground.receive(:timeout => 25000)
+ result = @foreground.receive(:timeout => 60000)
result.should == "success"
end
@@ -32,7 +32,7 @@ describe "backgroundable tests" do
visit "/background?redefine=1"
page.should have_content('it worked')
@background.publish "release"
- result = @foreground.receive(:timeout => 25000)
+ result = @foreground.receive(:timeout => 60000)
result.should == "success"
end
end
|
More sleep to account for async runtime creation going slow, sometimes.
|
diff --git a/contrib/externs/jquery-1.12_and_2.2.js b/contrib/externs/jquery-1.12_and_2.2.js
index <HASH>..<HASH> 100644
--- a/contrib/externs/jquery-1.12_and_2.2.js
+++ b/contrib/externs/jquery-1.12_and_2.2.js
@@ -1265,9 +1265,10 @@ jQuery.map = function(arg1, callback) {};
jQuery.prototype.map = function(callback) {};
/**
- * @param {Array<*>} first
- * @param {Array<*>} second
- * @return {Array<*>}
+ * @template T, U
+ * @param {!Array<T>} first
+ * @param {!Array<U>} second
+ * @return {!Array<(T|U)>}
*/
jQuery.merge = function(first, second) {};
|
Corrected the type signature of $.merge to indicate that its arguments are mandatory and its return value is never null/undefined
-------------
Created by MOE: <URL>
|
diff --git a/examples/app.py b/examples/app.py
index <HASH>..<HASH> 100644
--- a/examples/app.py
+++ b/examples/app.py
@@ -33,9 +33,9 @@ You should execute these commands in the examples-directory.
$ pip install invenio-theme
$ pip install invenio-assets
- $ flask -a app.py bower
- $ cd instance
- $ bower install
+ $ flask -a app.py npm
+ $ cd static
+ $ npm install
$ cd ..
$ flask -a app.py collect -v
$ flask -a app.py assets build
|
examples: migration from bower to npm
|
diff --git a/src/main/java/br/com/digilabs/jqplot/chart/AbstractChart.java b/src/main/java/br/com/digilabs/jqplot/chart/AbstractChart.java
index <HASH>..<HASH> 100644
--- a/src/main/java/br/com/digilabs/jqplot/chart/AbstractChart.java
+++ b/src/main/java/br/com/digilabs/jqplot/chart/AbstractChart.java
@@ -413,7 +413,7 @@ public abstract class AbstractChart<T extends ChartData<?>, S extends Serializab
* @return AbstractChart
*/
public AbstractChart<T, S> setFillZero(Boolean fillZero) {
- getChartConfiguration().seriesDefaultsInstance().getRendererOptions()
+ getChartConfiguration().seriesDefaultsInstance().rendererOptionsInstance()
.setFillZero(fillZero);
return this;
}
|
Change getter of rendererOptions to correct one.
|
diff --git a/openquake/calculators/classical.py b/openquake/calculators/classical.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/classical.py
+++ b/openquake/calculators/classical.py
@@ -172,12 +172,9 @@ class PSHACalculator(base.HazardCalculator):
num_tasks = 0
num_sources = 0
src_filter = SourceFilter(tile, oq.maximum_distance)
+ if num_tiles > 1:
+ logging.info('Processing tile %d of %d', tile_i, len(tiles))
if self.prefilter:
- if num_tiles > 1:
- logging.info('Prefiltering tile %d of %d', tile_i,
- len(tiles))
- else:
- logging.info('Prefiltering sources')
with self.monitor('prefiltering'):
csm = self.csm.filter(src_filter)
else:
|
Better logging [skip CI]
|
diff --git a/src/Application.php b/src/Application.php
index <HASH>..<HASH> 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -111,8 +111,9 @@ class Application extends \Pimple\Container
["exception" => $routeNotFound]
);
+ $response->setStatusCode(404)
$response->setContent($this->load404Page());
- return;
+ throw $routeNotFound;
}
$this["logger.service"]("System")->info(
|
set <I> status code and rethrow exception
let the output component handle the display of that exception
|
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index <HASH>..<HASH> 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -40,7 +40,7 @@ module Dummy
config.active_support.escape_html_entities_in_json = true
# Enable the asset pipeline
- config.assets.enabled = true
+ config.assets.enabled = false
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
|
Disable dummy app asset pipeline
MS-<I>
|
diff --git a/astrobase/checkplot.py b/astrobase/checkplot.py
index <HASH>..<HASH> 100644
--- a/astrobase/checkplot.py
+++ b/astrobase/checkplot.py
@@ -1393,8 +1393,6 @@ def _pkl_finder_objectinfo(objectinfo,
distance_upper_bound=match_xyzdist
)
- import ipdb; ipdb.set_trace()
-
# sort by matchdist
mdsorted = np.argsort(matchdists)
matchdists = matchdists[mdsorted]
|
lcproc: add neighbor stuff to parallel_cp workers and driver
|
diff --git a/includes/class-freemius.php b/includes/class-freemius.php
index <HASH>..<HASH> 100755
--- a/includes/class-freemius.php
+++ b/includes/class-freemius.php
@@ -11016,7 +11016,9 @@
$api = $this->get_api_site_scope();
$uid = $this->get_anonymous_id();
- $result = $api->get( "/users/{$this->_site->user_id}.json?uid={$uid}", false, WP_FS__TIME_10_MIN_IN_SEC );
+ $request_path = "/users/{$this->_site->user_id}.json?uid={$uid}";
+
+ $result = $api->get( $request_path, false, WP_FS__TIME_10_MIN_IN_SEC );
if ( $this->is_api_result_entity( $result ) ) {
$user = new FS_User( $result );
@@ -11033,7 +11035,7 @@
* Those API errors will continue coming and are not recoverable with the
* current site's data. Therefore, extend the API call's cached result to 7 days.
*/
- $api->update_cache_expiration( "/users/{$this->_site->user_id}.json?uid={$uid}", WP_FS__TIME_WEEK_IN_SEC );
+ $api->update_cache_expiration( $request_path, WP_FS__TIME_WEEK_IN_SEC );
}
return $result;
|
[user-recovery] [minor] Added a helper var to store the API request path.
|
diff --git a/src/bosh-director/lib/bosh/director/disk_manager.rb b/src/bosh-director/lib/bosh/director/disk_manager.rb
index <HASH>..<HASH> 100644
--- a/src/bosh-director/lib/bosh/director/disk_manager.rb
+++ b/src/bosh-director/lib/bosh/director/disk_manager.rb
@@ -117,8 +117,6 @@ module Bosh::Director
end
if agent_mounted_disks(instance_model).include?(disk_cid)
- @logger.info("Stopping instance '#{instance_model}' before unmount")
- agent_client(instance_model).stop
@logger.info("Unmounting disk '#{disk_cid}'")
agent_client(instance_model).unmount_disk(disk_cid)
end
|
Remove unneeded call to stop in unmount_disk action
[#<I>](<URL>)
|
diff --git a/vstutils/static/js/common.js b/vstutils/static/js/common.js
index <HASH>..<HASH> 100644
--- a/vstutils/static/js/common.js
+++ b/vstutils/static/js/common.js
@@ -1,7 +1,7 @@
function loadQUnitTests()
{
- $('body').append('<script src=\'' + window.pmStaticPath + 'js/tests/qUnitTest.js\'></script>');
+ $('body').append('<script src=\'' + window.guiStaticPath + 'js/tests/qUnitTest.js\'></script>');
var intervaId = setInterval(function()
{
|
fix var name from pmStaticPath to guiStaticPath
|
diff --git a/src/bin.js b/src/bin.js
index <HASH>..<HASH> 100755
--- a/src/bin.js
+++ b/src/bin.js
@@ -9,5 +9,5 @@ const cli = meow(`
`);
(async () => {
- await process(await getConfig());
+ await process(await getConfig(), cli.flags);
})();
|
Pass CLI flags into config function.
|
diff --git a/vendor/plugins/typo_avatar_gravatar/lib/typo_avatar_gravatar.rb b/vendor/plugins/typo_avatar_gravatar/lib/typo_avatar_gravatar.rb
index <HASH>..<HASH> 100644
--- a/vendor/plugins/typo_avatar_gravatar/lib/typo_avatar_gravatar.rb
+++ b/vendor/plugins/typo_avatar_gravatar/lib/typo_avatar_gravatar.rb
@@ -23,7 +23,7 @@ module TypoPlugins
def gravatar_tag(email, options={})
options[:gravatar_id] = Digest::MD5.hexdigest(email.strip)
options[:default] = CGI::escape(options[:default]) if options.include?(:default)
- options[:size] ||= 60
+ options[:size] ||= 48
url = "http://www.gravatar.com/avatar.php?" << options.map { |key,value| "#{key}=#{value}" }.sort.join("&")
"<img src=\"#{url}\" class=\"avatar gravatar\" />"
|
Typo expects avatars to be <I> pixels by default
|
diff --git a/imbox/__init__.py b/imbox/__init__.py
index <HASH>..<HASH> 100644
--- a/imbox/__init__.py
+++ b/imbox/__init__.py
@@ -13,6 +13,7 @@ class Imbox(object):
def logout(self):
+ self.connection.close()
self.connection.logout()
def query_uids(self, **kwargs):
|
imbox: call close() before logout
The imaplib documentation recommends calling close() before logout to ensure
that 'deleted messages are removed from writable mailbox.'
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ EXTRA_REQUIREMENTS = {
'cli': ['click', 'requests'],
'html': ['lxml'], # apt: libxslt-dev libxml2-dev
'ods': ['lxml'],
- 'parquet': ['parquet'],
+ 'parquet': ['parquet>=1.1'],
'xls': ['xlrd', 'xlwt'],
'xlsx': ['openpyxl'],
'xpath': ['lxml'],
|
Force parquet version to the new one
Starting from version <I>, it supports Python 3.
|
diff --git a/src/View/Helper/MenuHelper.php b/src/View/Helper/MenuHelper.php
index <HASH>..<HASH> 100644
--- a/src/View/Helper/MenuHelper.php
+++ b/src/View/Helper/MenuHelper.php
@@ -1,6 +1,7 @@
<?php
namespace Menu\View\Helper;
+use Cake\Core\Configure;
use Cake\View\Helper;
use Cake\View\View;
@@ -14,6 +15,7 @@ class MenuHelper extends Helper
*/
public function getMenu($name)
{
+ $allControllers = Configure::readOrFail('Menu.allControllers');
$menu = [];
// get all controllers
$controllers = $this->_getAllControllers();
@@ -21,6 +23,10 @@ class MenuHelper extends Helper
if (is_callable([$controller, 'getMenu'])) {
$menu = array_merge($menu, $controller::getMenu($name));
}
+
+ if (!$allControllers) {
+ break;
+ }
}
return $menu;
}
|
add logic for calling getMenu method from all controllers or from a single one (ask #<I>)
|
diff --git a/lib/service_mock/server.rb b/lib/service_mock/server.rb
index <HASH>..<HASH> 100644
--- a/lib/service_mock/server.rb
+++ b/lib/service_mock/server.rb
@@ -43,7 +43,7 @@ module ServiceMock
class Server
include CommandLineOptions
- attr_accessor :inherit_io, :wait_for_process, :remote_host, :classpath
+ attr_accessor :inherit_io, :wait_for_process, :remote_host, :classpath, :use_ssl
attr_reader :wiremock_version, :working_directory, :process
attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass
@@ -52,6 +52,7 @@ module ServiceMock
@working_directory = working_directory
self.inherit_io = false
self.wait_for_process = false
+ self.use_ssl = false
end
#
@@ -215,10 +216,13 @@ module ServiceMock
def http
if using_proxy
- return Net::HTTP.Proxy(proxy_addr, proxy_port,
+ http = Net::HTTP.Proxy(proxy_addr, proxy_port,
proxy_user, proxy_pass)
+ else
+ http = Net::HTTP.new(admin_host, admin_port)
end
- Net::HTTP.new(admin_host, admin_port)
+ http.use_ssl = use_ssl
+ http
end
def using_proxy
|
added flag for use_ssl
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.