diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/application/Espo/Repositories/EmailAddress.php b/application/Espo/Repositories/EmailAddress.php
index <HASH>..<HASH> 100644
--- a/application/Espo/Repositories/EmailAddress.php
+++ b/application/Espo/Repositories/EmailAddress.php
@@ -288,7 +288,7 @@ class EmailAddress extends \Espo\Core\ORM\Repositories\RDB
".$pdo->quote($entity->id).",
".$pdo->quote($entity->getEntityName()).",
".$pdo->quote($emailAddress->id).",
- ".$pdo->quote($address === $primary)."
+ ".$pdo->quote((int)($address === $primary))."
)
";
$sth = $pdo->prepare($query);
|
fix email address primary pdo quote
|
diff --git a/src/Primer/Primer.php b/src/Primer/Primer.php
index <HASH>..<HASH> 100644
--- a/src/Primer/Primer.php
+++ b/src/Primer/Primer.php
@@ -336,9 +336,8 @@ class Primer
public function getTemplates()
{
$templates = array();
- $path = Primer::$BASE_PATH . '/patterns/templates';
- if ($handle = opendir($path)) {
+ if ($handle = opendir(Primer::$PATTERN_PATH . '/templates')) {
while (false !== ($entry = readdir($handle))) {
if (substr($entry, 0, 1) !== '.') {
$templates[] = array(
|
Bug fix with hardcoded ref to pattern path
|
diff --git a/lfs/diff_index_scanner.go b/lfs/diff_index_scanner.go
index <HASH>..<HASH> 100644
--- a/lfs/diff_index_scanner.go
+++ b/lfs/diff_index_scanner.go
@@ -135,6 +135,7 @@ func (s *DiffIndexScanner) Scan() bool {
}
s.next, s.err = s.scan(s.from.Text())
+ s.err = errors.Wrap(s.err, "diff-index scan")
return s.err == nil
}
|
lfs: re-wrap errors from `DiffIndexScanner.Scan()`
|
diff --git a/tensorflow_probability/python/distributions/geometric.py b/tensorflow_probability/python/distributions/geometric.py
index <HASH>..<HASH> 100644
--- a/tensorflow_probability/python/distributions/geometric.py
+++ b/tensorflow_probability/python/distributions/geometric.py
@@ -86,13 +86,13 @@ class Geometric(distribution.Distribution):
if (probs is None) == (logits is None):
raise ValueError('Must pass probs or logits, but not both.')
with tf.name_scope(name) as name:
+ dtype = dtype_util.common_dtype([logits, probs], dtype_hint=tf.float32)
self._probs = tensor_util.convert_nonref_to_tensor(
- probs, dtype_hint=tf.float32, name='probs')
+ probs, dtype=dtype, name='probs')
self._logits = tensor_util.convert_nonref_to_tensor(
- logits, dtype_hint=tf.float32, name='logits')
+ logits, dtype=dtype, name='logits')
super(Geometric, self).__init__(
- dtype=(self._logits.dtype if self._probs is None
- else self._probs.dtype),
+ dtype=dtype,
reparameterization_type=reparameterization.NOT_REPARAMETERIZED,
validate_args=validate_args,
allow_nan_stats=allow_nan_stats,
|
Use common_dtype to ensure we get a base dtype rather than a float<I>_ref.
PiperOrigin-RevId: <I>
|
diff --git a/spec/unit/lib/web_page_spec.rb b/spec/unit/lib/web_page_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/lib/web_page_spec.rb
+++ b/spec/unit/lib/web_page_spec.rb
@@ -31,6 +31,7 @@ RSpec.describe 'WebPage' do
let(:page) { double }
subject { WebPage.instance.title }
before do
+ # allow_any_instance_of(WebPage).to receive(:check_validations_are_defined!) { true }
allow(WebPage.instance).to receive(:current_url) { 'google.com' }
end
it do
@@ -125,6 +126,23 @@ RSpec.describe 'WebPage' do
end
end
+ describe '#initialize' do
+ subject { WebPage.instance }
+ before do
+ allow_any_instance_of(WebPage).to receive(:check_validations_are_defined!) { true }
+ allow_any_instance_of(WebPage).to receive_message_chain('page.driver.browser.manage.window.maximize')
+ end
+ context 'when maximized window' do
+ before do
+ allow(settings).to receive(:maximized_window) { true }
+ end
+ it do
+ allow_any_instance_of(WebPage).to receive_message_chain('page.driver.browser.manage.window.maximize')
+ subject
+ end
+ end
+ end
+
describe 'inherited callback' do
let!(:page_class) do
Howitzer::Utils::PageValidator.instance_variable_set(:@pages, [])
|
Added unit test for window maximization
|
diff --git a/composer.go b/composer.go
index <HASH>..<HASH> 100644
--- a/composer.go
+++ b/composer.go
@@ -584,6 +584,8 @@ func (c *Composer) processKey(ev Event) {
func ProcessEvent(ev Event) {
switch ev.Type {
+ case EventCloseWindow:
+ comp.closeTopWindow()
case EventRedraw:
RefreshScreen()
case EventResize:
diff --git a/consts.go b/consts.go
index <HASH>..<HASH> 100644
--- a/consts.go
+++ b/consts.go
@@ -286,6 +286,8 @@ const (
EventDialogClose
// Close application
EventQuit
+ // Close top window - or application is there is only one window
+ EventCloseWindow
)
// ConfirmationDialog and SelectDialog exit codes
|
add event for composer to close the top window
|
diff --git a/library/CM/FormField/Location.js b/library/CM/FormField/Location.js
index <HASH>..<HASH> 100644
--- a/library/CM/FormField/Location.js
+++ b/library/CM/FormField/Location.js
@@ -62,7 +62,7 @@ var CM_FormField_Location = CM_FormField_SuggestOne.extend({
}
})
.catch(function(error) {
- cm.window.hint('Unable to detect location');
+ cm.window.hint(cm.language.get('Unable to detect location'));
})
.finally(function() {
self.$('.detect-location').removeClass('waiting');
diff --git a/resources/translations/en.php b/resources/translations/en.php
index <HASH>..<HASH> 100644
--- a/resources/translations/en.php
+++ b/resources/translations/en.php
@@ -54,4 +54,5 @@ return function (CM_Model_Language $language) {
$language->setTranslation('{$file} has an invalid extension. Only {$extensions} are allowed.', '{$file} has an invalid extension. Only {$extensions} are allowed.',
array('file', 'extensions'));
$language->setTranslation('An unexpected connection problem occurred.', 'An unexpected connection problem occurred.');
+ $language->setTranslation('Unable to detect location', 'Unable to detect location');
};
|
Translation of 'Unable to detect location'.
|
diff --git a/python/herald/shell.py b/python/herald/shell.py
index <HASH>..<HASH> 100644
--- a/python/herald/shell.py
+++ b/python/herald/shell.py
@@ -132,13 +132,17 @@ class HeraldCommands(object):
"""
lines = []
lines.append("Peer {0}".format(peer.uid))
- lines.append("\t- UID : {0}".format(peer.uid))
- lines.append("\t- Name: {0}".format(peer.name))
+ lines.append("\t- UID......: {0}".format(peer.uid))
+ lines.append("\t- Name.....: {0}".format(peer.name))
lines.append("\t- Node UID.: {0}".format(peer.node_uid))
lines.append("\t- Node Name: {0}".format(peer.node_name))
- lines.append("\t- Groups:")
+ lines.append("\t- Groups...:")
for group in sorted(peer.groups):
lines.append("\t\t- {0}".format(group))
+ lines.append("\t- Accesses.:")
+ for access in sorted(peer.get_accesses()):
+ lines.append("\t\t- {0}: {1}"
+ .format(access, peer.get_access(access)))
lines.append("")
io_handler.write("\n".join(lines))
|
Show accesses when printing a Peer bean
|
diff --git a/closure/goog/fx/dragger.js b/closure/goog/fx/dragger.js
index <HASH>..<HASH> 100644
--- a/closure/goog/fx/dragger.js
+++ b/closure/goog/fx/dragger.js
@@ -321,7 +321,10 @@ goog.fx.Dragger.prototype.enableRightPositioningForRtl =
* @template T
*/
goog.fx.Dragger.prototype.getHandler = function() {
- return this.eventHandler_;
+ // TODO(user): templated "this" values currently result in "this" being
+ // "unknown" in the body of the function.
+ var self = /** @type {goog.fx.Dragger} */ (this);
+ return self.eventHandler_;
};
|
Fix unknown "this" warning.
-------------
Created by MOE: <URL>
|
diff --git a/src/frontend/org/voltdb/client/ClientConfig.java b/src/frontend/org/voltdb/client/ClientConfig.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/client/ClientConfig.java
+++ b/src/frontend/org/voltdb/client/ClientConfig.java
@@ -256,9 +256,9 @@ public class ClientConfig {
}
/**
- * <p>Attempts to reconnect to a node with retry after connection loss. See the {@link ReconnectStatusListener}.</p>
+ * <p>Experimental: Attempts to reconnect to a node with retry after connection loss. See the {@link ReconnectStatusListener}.</p>
*
- * @param on Enable or disable the reconnection feature.
+ * @param on Enable or disable the reconnection feature. Default is off.
*/
public void setReconnectOnConnectionLoss(boolean on) {
this.m_reconnectOnConnectionLoss = on;
|
Add "Experimental" to the ClientConfig reconnect on connection loss method.
Also explained that it's turned off by default.
|
diff --git a/rest_auth/registration/views.py b/rest_auth/registration/views.py
index <HASH>..<HASH> 100644
--- a/rest_auth/registration/views.py
+++ b/rest_auth/registration/views.py
@@ -7,7 +7,7 @@ from allauth.account.views import SignupView, ConfirmEmailView
from allauth.account.utils import complete_signup
from allauth.account import app_settings
-from ..serializers import UserDetailsSerializer
+from rest_auth.app_settings import UserDetailsSerializer
from rest_auth.registration.serializers import SocialLoginSerializer
from rest_auth.views import Login
|
Support custom UserDetailsSerializer for registration
|
diff --git a/thunder/images/readers.py b/thunder/images/readers.py
index <HASH>..<HASH> 100644
--- a/thunder/images/readers.py
+++ b/thunder/images/readers.py
@@ -374,7 +374,8 @@ def fromtif(path, ext='tif', start=None, stop=None, recursive=False, nplanes=Non
pageCount = pageCount - extra
logging.getLogger('thunder').warn('Ignored %d pages in file %s' % (extra, fname))
else:
- raise ValueError("nplanes '%d' does not evenly divide '%d'" % (nplanes, pageCount))
+ raise ValueError("nplanes '%d' does not evenly divide '%d in file %s'" % (nplanes, pageCount,
+ fname))
values = [ary[i:(i+nplanes)] for i in range(0, pageCount, nplanes)]
else:
values = [ary]
|
Add file name to error message when multi page tif has wrong number of planes and discard_extra is False
|
diff --git a/src/Controller/SettingsController.php b/src/Controller/SettingsController.php
index <HASH>..<HASH> 100644
--- a/src/Controller/SettingsController.php
+++ b/src/Controller/SettingsController.php
@@ -70,6 +70,7 @@ class SettingsController extends AppController
if (!$key) {
$key = 'App';
}
+ $this->Menu->active($this->prefixes[$key]);
if (!$this->__prefixExists($key)) {
throw new NotFoundException("The prefix-setting " . $key . " could not be found");
|
Activated selected settings in navigation bar
Activated selected settings in navigation bar by using the Menu component
|
diff --git a/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php b/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
+++ b/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
@@ -48,7 +48,7 @@ trait ValidatesWhenResolvedTrait
}
/**
- * Deteremine if the request passes the authorization check.
+ * Determine if the request passes the authorization check.
*
* @return bool
*/
|
[<I>] Fixed typo
Corrects a typo in ValidatesWhenResolvedTrait
|
diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
index <HASH>..<HASH> 100644
--- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
+++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
@@ -84,9 +84,10 @@ class SelfupgradeCommand extends Command
$this->setupConsole($input, $output);
$this->upgrader = new Upgrader($this->input->getOption('force'));
+
+
$local = $this->upgrader->getLocalVersion();
$remote = $this->upgrader->getRemoteVersion();
- $update = $this->upgrader->getAssets()->{'grav-update'};
$release = strftime('%c', strtotime($this->upgrader->getReleaseDate()));
if (!$this->upgrader->isUpgradable()) {
@@ -94,6 +95,8 @@ class SelfupgradeCommand extends Command
exit;
}
+ $update = $this->upgrader->getAssets()->{'grav-update'};
+
$questionHelper = $this->getHelper('question');
$skipPrompt = $this->input->getOption('all-yes');
|
Fix for issue #<I> - latest version check out of order
|
diff --git a/lib/stealth/server.rb b/lib/stealth/server.rb
index <HASH>..<HASH> 100644
--- a/lib/stealth/server.rb
+++ b/lib/stealth/server.rb
@@ -41,7 +41,7 @@ module Stealth
dispatcher = Stealth::Dispatcher.new(
service: params[:service],
params: params,
- headers: request.env
+ headers: get_helpers_from_request(request)
)
dispatcher.coordinate
@@ -49,5 +49,13 @@ module Stealth
status 202
end
+ private
+
+ def get_helpers_from_request(request)
+ request.env.reject do |header, value|
+ header.match(/rack\.|puma\.|sinatra\./)
+ end
+ end
+
end
end
|
Drop infrastructure specific headers
These are fairly large and unneccessary at the service level.
|
diff --git a/src/Collection/LastHelper.php b/src/Collection/LastHelper.php
index <HASH>..<HASH> 100644
--- a/src/Collection/LastHelper.php
+++ b/src/Collection/LastHelper.php
@@ -49,6 +49,23 @@ class LastHelper implements HelperInterface
throw new \InvalidArgumentException('Wrong type of the argument in the "last" helper.');
}
- return end($collection);
+ if (is_array($collection)) {
+ return end($collection);
+ }
+
+ // "end" function does not work with \Traversable in HHVM. Thus we
+ // need to get the element manually.
+ while ($collection instanceof \IteratorAggregate) {
+ $collection = $collection->getIterator();
+ }
+
+ $collection->rewind();
+ $item = false;
+ while ($collection->valid()) {
+ $item = $collection->current();
+ $collection->next();
+ }
+
+ return $item;
}
}
|
Fix "last" helper for HHVM
|
diff --git a/lib/travis/model/repository.rb b/lib/travis/model/repository.rb
index <HASH>..<HASH> 100644
--- a/lib/travis/model/repository.rb
+++ b/lib/travis/model/repository.rb
@@ -76,8 +76,10 @@ class Repository < ActiveRecord::Base
def find_by(params)
if id = params[:repository_id] || params[:id]
self.find(id)
- else
+ elsif params.key?(:name) && params.key?(:owner_name)
self.where(params.slice(:name, :owner_name)).first || raise(ActiveRecord::RecordNotFound)
+ else
+ raise(ActiveRecord::RecordNotFound)
end
end
|
make sure Repository.find_by requires necessary params
|
diff --git a/lib/jdbc_adapter/jdbc_derby.rb b/lib/jdbc_adapter/jdbc_derby.rb
index <HASH>..<HASH> 100644
--- a/lib/jdbc_adapter/jdbc_derby.rb
+++ b/lib/jdbc_adapter/jdbc_derby.rb
@@ -90,7 +90,7 @@ module ::JdbcSpec
# Override default -- fix case where ActiveRecord passes :default => nil, :null => true
def add_column_options!(sql, options)
options.delete(:default) if options.has_key?(:default) && options[:default].nil?
- options.delete(:null) if options.has_key?(:null) && (options[:null].nil? || options[:null].true?)
+ options.delete(:null) if options.has_key?(:null) && (options[:null].nil? || options[:null] == true)
super
end
|
<I>, JRUBY-<I>: Since when did I think that there was a #true? method on Object?
git-svn-id: svn+ssh://rubyforge.org/var/svn/jruby-extras/trunk/activerecord-jdbc@<I> 8ba<I>d5-0c1a-<I>-<I>a6-a<I>dfc1b<I>a6
|
diff --git a/src/test/java/org/jolokia/docker/maven/assembly/DockerAssemblyConfigurationSourceTest.java b/src/test/java/org/jolokia/docker/maven/assembly/DockerAssemblyConfigurationSourceTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/jolokia/docker/maven/assembly/DockerAssemblyConfigurationSourceTest.java
+++ b/src/test/java/org/jolokia/docker/maven/assembly/DockerAssemblyConfigurationSourceTest.java
@@ -77,7 +77,7 @@ public class DockerAssemblyConfigurationSourceTest {
assertFalse(source.isIgnorePermissions());
- String outputDir = params.getOutputDirectory();
+ String outputDir = new File(params.getOutputDirectory()).getPath();
assertTrue(startsWithDir(outputDir, source.getOutputDirectory()));
assertTrue(startsWithDir(outputDir, source.getWorkingDirectory()));
assertTrue(startsWithDir(outputDir, source.getTemporaryRootDirectory()));
|
Fix unit test on windows
Path issues, as always.
|
diff --git a/saspy/sasproccommons.py b/saspy/sasproccommons.py
index <HASH>..<HASH> 100644
--- a/saspy/sasproccommons.py
+++ b/saspy/sasproccommons.py
@@ -486,8 +486,11 @@ class SASProcCommons:
else:
inputs = {'interval': input_list}
- kwargs['input'] = inputs
- kwargs['target'] = target
+ if any(v is not None for v in inputs.values()):
+ kwargs['input'] = inputs
+ if any(v is not None for v in target.values()):
+ kwargs['target'] = target
+
return kwargs
|
minor fix to not add nominal dictionaries that are None
|
diff --git a/DataFixtures/ORM/LoadShopData.php b/DataFixtures/ORM/LoadShopData.php
index <HASH>..<HASH> 100644
--- a/DataFixtures/ORM/LoadShopData.php
+++ b/DataFixtures/ORM/LoadShopData.php
@@ -15,6 +15,7 @@ namespace WellCommerce\Bundle\ShopBundle\DataFixtures\ORM;
use Doctrine\Common\Persistence\ObjectManager;
use WellCommerce\Bundle\CoreBundle\DataFixtures\AbstractDataFixture;
use WellCommerce\Bundle\AppBundle\Entity\MailerConfiguration;
+use WellCommerce\Bundle\CurrencyBundle\DataFixtures\ORM\LoadCurrencyData;
/**
* Class LoadShopData
|
Finished restructurisation of bundles
(cherry picked from commit 7fa<I>b1af<I>e1d2bcf9ad5b4a<I>bfe<I>c)
|
diff --git a/clients/js/manners/index.js b/clients/js/manners/index.js
index <HASH>..<HASH> 100644
--- a/clients/js/manners/index.js
+++ b/clients/js/manners/index.js
@@ -65,6 +65,9 @@ InteractionGroup.prototype.setup = function (readyFn) {
fn(err);
}
};
+ var cleanup = function () {
+ return axios.delete(cfg.baseUrl + '/interactions', axiosCfg);
+ };
return axios
.put(cfg.baseUrl + '/interactions', { interactions: this._interactions }, axiosCfg)
@@ -85,9 +88,15 @@ InteractionGroup.prototype.setup = function (readyFn) {
var msg = 'Verification failed with error:\n' + JSON.stringify(err.data.error, null, 2);
throw new ProviderError(msg);
}))
- .then(function () {
- return axios.delete(cfg.baseUrl + '/interactions', axiosCfg);
- })
+ .then(
+ function () {
+ return cleanup();
+ }, function (err) {
+ return cleanup().then(function () {
+ throw err;
+ });
+ }
+ )
.catch(rethrow(function (err) {
throw new ProviderError('Cleaning up interactions failed');
}))
|
Add cleanup of interactions after in case of faulty test
|
diff --git a/test/test_messaging.py b/test/test_messaging.py
index <HASH>..<HASH> 100644
--- a/test/test_messaging.py
+++ b/test/test_messaging.py
@@ -565,9 +565,9 @@ class TestConsumerDisconnections(object):
publish(msg)
assert result.get() == msg
- def test_downstream_blackhole( # pragma: no cover
+ def test_downstream_blackhole(
self, container, publish, toxiproxy
- ):
+ ): # pragma: no cover
""" Verify we detect and recover from sockets losing data.
This failure mode means that all data sent from the rabbit broker to
|
put pragma in the right place
|
diff --git a/pybromo/diffusion.py b/pybromo/diffusion.py
index <HASH>..<HASH> 100644
--- a/pybromo/diffusion.py
+++ b/pybromo/diffusion.py
@@ -784,7 +784,14 @@ class ParticlesSimulation(object):
# Load emission in chunks, and save only the final timestamps
bg_rates = [None] * (len(max_rates) - 1) + [bg_rate]
+ prev_time = 0
for i_start, i_end in iter_chunk_index(timeslice_size, t_chunksize):
+
+ curr_time = np.around(i_start * self.t_step, decimals=1)
+ if curr_time > prev_time:
+ print(' %.1fs' % curr_time, end='', flush=True)
+ prev_time = curr_time
+
em_chunk = self.emission[:, i_start:i_end]
times_chunk_s, par_index_chunk_s = \
|
Print time during timestamps simulation
|
diff --git a/android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTitleBar.java b/android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTitleBar.java
index <HASH>..<HASH> 100644
--- a/android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTitleBar.java
+++ b/android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTitleBar.java
@@ -97,10 +97,12 @@ public class CollapsingTitleBar extends TitleBar implements View.OnTouchListener
@Override
protected void setBackground(StyleParams params) {
- titleBarBackground = createBackground(params,
- params.collapsingTopBarParams.expendedTitleBarColor,
- params.collapsingTopBarParams.scrimColor);
- setBackground(titleBarBackground);
+ if (titleBarBackground == null) {
+ titleBarBackground = createBackground(params,
+ params.collapsingTopBarParams.expendedTitleBarColor,
+ params.collapsingTopBarParams.scrimColor);
+ setBackground(titleBarBackground);
+ }
}
private TitleBarBackground createBackground(StyleParams styleParams, StyleParams.Color expendedColor, StyleParams.Color collapsedColor) {
|
Set CollapsingTitleBar background only once
This is a quick hack to address issue where the expended color was
set after pop even if screen was collapsed.
|
diff --git a/lib/app/controllers/offline_mirror/group_base_controller.rb b/lib/app/controllers/offline_mirror/group_base_controller.rb
index <HASH>..<HASH> 100644
--- a/lib/app/controllers/offline_mirror/group_base_controller.rb
+++ b/lib/app/controllers/offline_mirror/group_base_controller.rb
@@ -26,7 +26,7 @@ module OfflineMirror
end
def load_down_mirror_file(group, data)
- ensure_group_offline(group)
+ ensure_group_offline(group) if group
raise PluginError.new("Cannot accept down mirror file when app is in online mode") if OfflineMirror::app_online?
mirror_data = MirrorData.new(group, [data, "r"])
mirror_data.load_downwards_data
diff --git a/test/unit/group_controller_test.rb b/test/unit/group_controller_test.rb
index <HASH>..<HASH> 100644
--- a/test/unit/group_controller_test.rb
+++ b/test/unit/group_controller_test.rb
@@ -106,4 +106,8 @@ class GroupControllerTest < ActionController::TestCase
post :upload_up_mirror, "id" => @online_group.id, "mirror_data" => gen_up_mirror_data(@online_group)
end
end
+
+ offline_test "can load initial down mirror files by supplying nil as group" do
+ # TODO Implement
+ end
end
\ No newline at end of file
|
Nice-looking test app: Implemented the rest of the mirroring interface (still untested though)
|
diff --git a/dice-roller.js b/dice-roller.js
index <HASH>..<HASH> 100644
--- a/dice-roller.js
+++ b/dice-roller.js
@@ -601,9 +601,12 @@
// output the rolls
rolls.forEach(function(roll, rIndex, array){
+ // get the roll value to compare to (If penetrating and not the first roll, add 1, to compensate for the penetration)
+ var rollVal = (item.penetrate && (rIndex > 0)) ? roll + 1 : roll;
+
output += roll;
- if(item.explode && isComparePoint(item.comparePoint, roll)){
+ if(item.explode && isComparePoint(item.comparePoint, rollVal)){
// this die roll exploded (Either matched the explode value or is greater than the max - exploded and compounded)
output += '!' + (item.compound ? '!' : '') + (item.penetrate ? 'p' : '');
}
|
Penetrating dice has correct notation when penetrating multiple times
References #<I>
|
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java
@@ -788,11 +788,11 @@ public abstract class ODatabaseRecordAbstract extends ODatabaseWrapperAbstract<O
if (!OHookThreadLocal.INSTANCE.push(id))
return false;
- final ORecord<?> rec = id.getRecord();
- if (rec == null)
- return false;
-
try {
+ final ORecord<?> rec = id.getRecord();
+ if (rec == null)
+ return false;
+
boolean recordChanged = false;
for (ORecordHook hook : hooks)
if (hook.onTrigger(iType, rec))
|
Fixed issue <I> with the contribution of Stefan Liebig
|
diff --git a/lib/run.js b/lib/run.js
index <HASH>..<HASH> 100644
--- a/lib/run.js
+++ b/lib/run.js
@@ -244,12 +244,7 @@ module.exports = function (options, callback) {
stack: 'AssertionFailure: Expected tests["' + assertion + '"] to be truthy\n' +
' at Object.eval test.js:' + (index + 1) + ':' +
((o.cursor && o.cursor.position || 0) + 1) + ')'
- }), {
- cursor: o.cursor,
- assertion: assertion,
- event: o.event,
- item: o.item
- });
+ }), _.extend({ assertion: assertion }, o));
index += 1;
});
|
Made sure that the assertion event emitted by run handler forwards all event arguments
|
diff --git a/internal/uidriver/glfw/ui.go b/internal/uidriver/glfw/ui.go
index <HASH>..<HASH> 100644
--- a/internal/uidriver/glfw/ui.go
+++ b/internal/uidriver/glfw/ui.go
@@ -631,6 +631,7 @@ func (u *UserInterface) SetCursorShape(shape driver.CursorShape) {
func (u *UserInterface) DeviceScaleFactor() float64 {
if !u.isRunning() {
+ // TODO: Use the initWindowPosition. This requires to convert the units correctly (#1575).
return devicescale.GetAt(u.initMonitor.GetPos())
}
diff --git a/internal/uidriver/glfw/window.go b/internal/uidriver/glfw/window.go
index <HASH>..<HASH> 100644
--- a/internal/uidriver/glfw/window.go
+++ b/internal/uidriver/glfw/window.go
@@ -245,8 +245,7 @@ func (w *window) SetSize(width, height int) {
}
func (w *window) SizeLimits() (minw, minh, maxw, maxh int) {
- minw, minh, maxw, maxh = w.ui.getWindowSizeLimitsInDP()
- return
+ return w.ui.getWindowSizeLimitsInDP()
}
func (w *window) SetSizeLimits(minw, minh, maxw, maxh int) {
|
internal/uidriver: Add comments
Updates #<I>
|
diff --git a/lib/pg_charmer.rb b/lib/pg_charmer.rb
index <HASH>..<HASH> 100644
--- a/lib/pg_charmer.rb
+++ b/lib/pg_charmer.rb
@@ -62,11 +62,14 @@ end
ActionController::Base.instance_eval do
def use_db_connection(connection, args)
- klasses = args.delete(:for).map { |klass| if klass.is_a? String then klass else klass.name end }
+ default_connections = {}
+ klass_names = args.delete(:for)
+ klass_names.each do |klass_name|
+ default_connections[klass_name] = connection
+ end
+
before_filter(args) do |controller, &block|
- klasses.each do |klass|
- PgCharmer.overwritten_default_connections[klass] = connection
- end
+ PgCharmer.overwritten_default_connections.merge!(default_connections)
end
end
|
Premature optimization never hurt :)
|
diff --git a/commands/ui/ui.go b/commands/ui/ui.go
index <HASH>..<HASH> 100644
--- a/commands/ui/ui.go
+++ b/commands/ui/ui.go
@@ -71,7 +71,7 @@ func NewTestUI(out io.Writer) UI {
// DisplayTable presents a two dimentional array of strings as a table
func (ui UI) DisplayTable(prefix string, table [][]string) {
- tw := tabwriter.NewWriter(ui.Out, 0, 1, 2, ' ', 0)
+ tw := tabwriter.NewWriter(ui.Out, 0, 1, 4, ' ', 0)
for _, row := range table {
fmt.Fprint(tw, prefix)
|
change padding on common help to 4 spaces
[fixes #<I>]
|
diff --git a/src/EdvinasKrucas/Notification/NotificationServiceProvider.php b/src/EdvinasKrucas/Notification/NotificationServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/EdvinasKrucas/Notification/NotificationServiceProvider.php
+++ b/src/EdvinasKrucas/Notification/NotificationServiceProvider.php
@@ -28,12 +28,12 @@ class NotificationServiceProvider extends ServiceProvider {
*/
public function register()
{
+ $this->app['config']->package('edvinaskrucas/notification', __DIR__.'/../config');
+
$this->app['notification'] = $this->app->share(function($app)
{
return new Notification($this->app['config'], $this->app['session']);
});
-
- $this->app['config']->package('edvinaskrucas/notification', __DIR__.'/../config');
}
/**
|
Changed method order in register() method
|
diff --git a/test/connection.js b/test/connection.js
index <HASH>..<HASH> 100644
--- a/test/connection.js
+++ b/test/connection.js
@@ -5,7 +5,7 @@ var assert = require("chai").assert;
var CasparCG = require("../");
-var debug = false;
+var debug = true;
var port = 8000;
describe("connection", function () {
@@ -13,7 +13,7 @@ describe("connection", function () {
var server1;
var connection1;
- beforeEach(function (done) {
+ before(function (done) {
server1 = new net.createServer();
server1.listen(port);
@@ -49,7 +49,7 @@ describe("connection", function () {
var server3;
var connection3;
- beforeEach(function (done) {
+ before(function (done) {
server2 = new net.createServer();
server2.listen(port);
|
turn on debug output and simplify tests
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -156,6 +156,7 @@ function cors (opts) {
obj[key] = _handler
})
} else {
+ var obj = {}
var _handler = toCors(handler)
obj.options = _handler
obj.get = _handler
|
need an obj in cors if-else (#<I>)
|
diff --git a/src/admin/importers/CmslayoutImporter.php b/src/admin/importers/CmslayoutImporter.php
index <HASH>..<HASH> 100644
--- a/src/admin/importers/CmslayoutImporter.php
+++ b/src/admin/importers/CmslayoutImporter.php
@@ -57,6 +57,14 @@ class CmslayoutImporter extends Importer
try {
$json = Json::decode($json);
+
+ // the rows column defines the placeholders
+ // if the rows column does not exists fail back to normal layout processing
+ if (isset($json['rows'])) {
+ $json = $json['rows'];
+ } else {
+ $json = false;
+ }
} catch (\Exception $e) {
$json = false;
}
|
Added ability to provide json file for cms layouts in order to render
the grid in the admin according to the frontend. closes #<I>
|
diff --git a/mtools/mlaunch/mlaunch.py b/mtools/mlaunch/mlaunch.py
index <HASH>..<HASH> 100755
--- a/mtools/mlaunch/mlaunch.py
+++ b/mtools/mlaunch/mlaunch.py
@@ -221,7 +221,7 @@ class MLaunchTool(BaseCmdLineTool):
getattr(self, self.args['command'])()
- # -- below are the main commands: init, start, stop, list
+ # -- below are the main commands: init, start, stop, list, kill
def init(self):
""" sub-command init. Branches out to sharded, replicaset or single node methods. """
@@ -833,6 +833,8 @@ class MLaunchTool(BaseCmdLineTool):
in_dict['protocol_version'] = 1
self.loaded_args = in_dict
self.startup_info = {}
+ # hostname was added recently
+ self.loaded_args['hostname'] = socket.gethostname()
elif in_dict['protocol_version'] == 2:
self.startup_info = in_dict['startup_info']
|
fixed bug with hostname not available on upgrade.
|
diff --git a/lib/rackstash/buffer.rb b/lib/rackstash/buffer.rb
index <HASH>..<HASH> 100644
--- a/lib/rackstash/buffer.rb
+++ b/lib/rackstash/buffer.rb
@@ -29,10 +29,10 @@ module Rackstash
#
# Generally, a non-buffering Buffer will be flushed to the sink after each
# logged message. This thus mostly resembles the way traditional loggers work
- # in Ruby. A buffering Buffer however holds log messages for a longer time.
- # Only at a certain time, all log messages and stored fields will be flushed
- # to the {Sink} as a single log event. A common scope for such an event is a
- # full request to a Rack app as is used by the shipped Rack {Middleware}.
+ # in Ruby. A buffering Buffer however holds log messages for a longer time,
+ # e.g., for the duration of a web request. Only after the request finished
+ # all log messages and stored fields for this request will be flushed to the
+ # {Sink} as a single log event.
#
# While the fields structure of a Buffer is geared towards the format used by
# Logstash, it can be adaptd in many ways suited for a specific log target.
|
Don't refer to the (non-existing yet) rack middleware in the docs
|
diff --git a/salt/utils/event.py b/salt/utils/event.py
index <HASH>..<HASH> 100644
--- a/salt/utils/event.py
+++ b/salt/utils/event.py
@@ -294,7 +294,7 @@ class Reactor(multiprocessing.Process, salt.state.Compiler):
Execute the reaction state
'''
for chunk in chunks:
- self.wrap.run(low)
+ self.wrap.run(chunk)
def run(self):
'''
|
chunk, not low...
This commit completes the circle, the reaction system works!
|
diff --git a/lib/Widget/Db/QueryBuilder.php b/lib/Widget/Db/QueryBuilder.php
index <HASH>..<HASH> 100644
--- a/lib/Widget/Db/QueryBuilder.php
+++ b/lib/Widget/Db/QueryBuilder.php
@@ -223,6 +223,11 @@ class QueryBuilder
return $this->execute();
}
+ /**
+ * Execute a COUNT query to receive the rows number
+ *
+ * @return int
+ */
public function count()
{
return (int)$this->db->fetchColumn($this->getSqlForCount(), $this->params);
|
added docblock for query builder count method
|
diff --git a/tests/unit/modules/test_state.py b/tests/unit/modules/test_state.py
index <HASH>..<HASH> 100644
--- a/tests/unit/modules/test_state.py
+++ b/tests/unit/modules/test_state.py
@@ -975,3 +975,19 @@ class StateTestCase(TestCase, LoaderModuleMockMixin):
MockJson.flag = False
with patch('salt.utils.fopen', mock_open()):
self.assertTrue(state.pkg(tar_file, 0, "md5"))
+
+ def test_get_pillar_errors_CC(self):
+ '''
+ Test _get_pillar_errors function.
+ CC: External clean, Internal clean
+ :return:
+ '''
+ for int_pillar, ext_pillar in [({'foo': 'bar'}, {'fred': 'baz'}),
+ ({'foo': 'bar'}, None),
+ ({}, {'fred': 'baz'})]:
+ with patch('salt.modules.state.__pillar__', int_pillar):
+ for opts, res in [({'force': True}, None),
+ ({'force': False}, None),
+ ({}, None)]:
+ assert res == state._get_pillar_errors(kwargs=opts, pillar=ext_pillar)
+
|
Add unit test for _get_pillar_errors when external and internal pillars are clean
|
diff --git a/core/state/snapshot/generate.go b/core/state/snapshot/generate.go
index <HASH>..<HASH> 100644
--- a/core/state/snapshot/generate.go
+++ b/core/state/snapshot/generate.go
@@ -151,7 +151,7 @@ func journalProgress(db ethdb.KeyValueWriter, marker []byte, stats *generatorSta
// generate is a background thread that iterates over the state and storage tries,
// constructing the state snapshot. All the arguments are purely for statistics
-// gethering and logging, since the method surfs the blocks as they arrive, often
+// gathering and logging, since the method surfs the blocks as they arrive, often
// being restarted.
func (dl *diskLayer) generate(stats *generatorStats) {
// If a database wipe is in operation, wait until it's done
|
core/state/snapshot: gethring -> gathering typo (#<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -36,9 +36,12 @@ setup(name='zeroless',
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX',
- 'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)'
+ 'License :: OSI Approved :: GNU Lesser General Public License v2\
+ or later (LGPLv2+)'
],
- keywords='pyzmq zeromq zmq ØMQ networking distributed socket',
+ keywords='pyzmq zeromq zmq ØMQ networking distributed socket client\
+ server p2p publish subscribe request reply push pull\
+ communication internet backend microservices',
url='https://github.com/zmqless/zeroless',
author='Lucas Lira Gomes',
author_email='x8lucas8x@gmail.com',
diff --git a/zeroless/__init__.py b/zeroless/__init__.py
index <HASH>..<HASH> 100644
--- a/zeroless/__init__.py
+++ b/zeroless/__init__.py
@@ -1,4 +1,4 @@
from .zeroless import *
from zeroless_helpers import version
-__version__ = version()
\ No newline at end of file
+__version__ = version()
|
Updated keywords in setup.py file.
|
diff --git a/pymongo/database.py b/pymongo/database.py
index <HASH>..<HASH> 100644
--- a/pymongo/database.py
+++ b/pymongo/database.py
@@ -355,11 +355,23 @@ class Database(object):
result = self.command("validate", unicode(name), full=full)
+ valid = True
+ # Pre 1.9 results
if "result" in result:
info = result["result"]
if info.find("exception") != -1 or info.find("corrupt") != -1:
raise CollectionInvalid("%s invalid: %s" % (name, info))
+ # Post 1.9 sharded results
+ elif "raw" in result:
+ for repl, res in result["raw"].iteritems():
+ if not res.get("valid", False):
+ valid = False
+ break
+ # Post 1.9 non-sharded results.
elif not result.get("valid", False):
+ valid = False
+
+ if not valid:
raise CollectionInvalid("%s invalid: %r" % (name, result))
return result
|
Support <I> sharded output in validate_collection.
|
diff --git a/wunderlist.js b/wunderlist.js
index <HASH>..<HASH> 100755
--- a/wunderlist.js
+++ b/wunderlist.js
@@ -3,11 +3,15 @@
var app = require('commander')
var pkg = require('./package.json')
-app
- .version(pkg.version)
- .command('ls', 'List all of your tasks')
+app.version(pkg.version)
+ .command('inbox', 'View your inbox').alias('ls')
+ .command('starred', 'View your starred tasks')
+ .command('today', 'View tasks that are due today')
+ .command('week', 'View tasks that are due this week')
+ .command('all', 'View all of your tasks')
.command('add [task]', 'Add a task to your inbox')
.command('open', 'Open Wunderlist')
.command('whoami', 'Display effective user')
.command('flush', 'Flush the application cache')
- .parse(process.argv)
+
+app.parse(process.argv)
|
adds new commands, renames some existing ones
|
diff --git a/character.py b/character.py
index <HASH>..<HASH> 100644
--- a/character.py
+++ b/character.py
@@ -38,7 +38,8 @@ item's name, and the name of the attribute.
"SELECT character FROM character_things UNION "
"SELECT character FROM character_places UNION "
"SELECT character FROM character_portals UNION "
- "SELECT character FROM character_subcharacters UNION"
+ "SELECT inner_character FROM character_subcharacters UNION "
+ "SELECT outer_character FROM character_subcharacters UNION "
"SELECT character FROM character_skills UNION "
"SELECT character FROM character_stats"]
demands = ["thing_location", "portal", "spot_coords"]
diff --git a/closet.py b/closet.py
index <HASH>..<HASH> 100644
--- a/closet.py
+++ b/closet.py
@@ -957,6 +957,8 @@ def mkdb(DB_NAME='default.sqlite'):
except sqlite3.OperationalError as e:
print("OperationalError during postlude from {0}:".format(tn))
print(e)
+ import pdb
+ pdb.set_trace()
saveables.append(
(demands, provides, prelude, tablenames, postlude))
continue
|
silly error in SQL of character_subcharacters
|
diff --git a/src/Archive/SearchInterface.php b/src/Archive/SearchInterface.php
index <HASH>..<HASH> 100644
--- a/src/Archive/SearchInterface.php
+++ b/src/Archive/SearchInterface.php
@@ -3,7 +3,7 @@ namespace DreadLabs\VantomasWebsite\Archive;
use DreadLabs\VantomasWebsite\Page\PageType;
-interface SearchInterface extends \IteratorAggregate, \Countable
+interface SearchInterface
{
/**
|
[TASK] Remove unnecessary interfaces from Archive/SearchInterface
|
diff --git a/lib/faye-rails/version.rb b/lib/faye-rails/version.rb
index <HASH>..<HASH> 100644
--- a/lib/faye-rails/version.rb
+++ b/lib/faye-rails/version.rb
@@ -1,3 +1,3 @@
module FayeRails
- VERSION = "2.0.1"
+ VERSION = "2.0.2"
end
|
Bump gem version to <I>.
|
diff --git a/src/RootSnippetSourceListBuilder.php b/src/RootSnippetSourceListBuilder.php
index <HASH>..<HASH> 100644
--- a/src/RootSnippetSourceListBuilder.php
+++ b/src/RootSnippetSourceListBuilder.php
@@ -39,7 +39,7 @@ class RootSnippetSourceListBuilder
$sourceDataPairs = array_map(function ($productsPerPageData) {
$this->validateProductsPerPageData($productsPerPageData);
$context = $this->contextBuilder->getContext($productsPerPageData['context']);
- return ['context' => $context, 'numItemsPerPage' => (int) $productsPerPageData['number']];
+ return ['context' => $context, 'numItemsPerPage' => $productsPerPageData['number']];
}, $sourceArray['products_per_page']);
return RootSnippetSourceList::fromArray($sourceDataPairs);
|
Issue #<I>: Remove superfluous type casting
|
diff --git a/src/Beaudierman/Ups/Ups.php b/src/Beaudierman/Ups/Ups.php
index <HASH>..<HASH> 100644
--- a/src/Beaudierman/Ups/Ups.php
+++ b/src/Beaudierman/Ups/Ups.php
@@ -173,7 +173,7 @@ class Ups {
</PackagingType>
<PackageWeight>
<UnitOfMeasurement>
- <Code>LBS</Code>
+ <Code>' . $measurement . '</Code>
</UnitOfMeasurement>
<Weight>' . $weight . '</Weight>
</PackageWeight>
|
Add measurement var instead of hardcoded value for UOM
|
diff --git a/src/Illuminate/Foundation/helpers.php b/src/Illuminate/Foundation/helpers.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Foundation/helpers.php
+++ b/src/Illuminate/Foundation/helpers.php
@@ -673,7 +673,7 @@ if (! function_exists('validator')) {
* @param array $customAttributes
* @return \Illuminate\Contracts\Validation\Validator
*/
- function validator(array $data, array $rules, array $messages = [], array $customAttributes = [])
+ function validator(array $data = [], array $rules = [], array $messages = [], array $customAttributes = [])
{
$factory = app(ValidationFactory::class);
|
Fix to validator() helper so that a new ValidationFactory can
successfully be returned when no arguments are provided.
|
diff --git a/lepo/router.py b/lepo/router.py
index <HASH>..<HASH> 100644
--- a/lepo/router.py
+++ b/lepo/router.py
@@ -19,7 +19,7 @@ class Router:
@classmethod
def from_file(cls, filename):
with open(filename) as infp:
- if filename.endswith('.yaml'):
+ if filename.endswith('.yaml') or filename.endswith('.yml'):
import yaml
data = yaml.safe_load(infp)
else:
|
Also read .yml as YAML
Fixes #4
|
diff --git a/lib/dragonfly/server.rb b/lib/dragonfly/server.rb
index <HASH>..<HASH> 100644
--- a/lib/dragonfly/server.rb
+++ b/lib/dragonfly/server.rb
@@ -68,7 +68,7 @@ module Dragonfly
rescue Job::NoSHAGiven => e
[400, {"Content-Type" => 'text/plain'}, ["You need to give a SHA parameter"]]
rescue Job::IncorrectSHA => e
- [400, {"Content-Type" => 'text/plain'}, ["The SHA parameter you gave (#{e}) is incorrect"]]
+ [400, {"Content-Type" => 'text/plain'}, ["The SHA parameter you gave is incorrect"]]
rescue JobNotAllowed => e
Dragonfly.warn(e.message)
[403, {"Content-Type" => 'text/plain'}, ["Forbidden"]]
|
Remove incorrect sha parameter from error message
The output of the sha param is reported as an XSS vulnerability in some PCI scanners.
|
diff --git a/client/blocks/stats-navigation/intervals.js b/client/blocks/stats-navigation/intervals.js
index <HASH>..<HASH> 100644
--- a/client/blocks/stats-navigation/intervals.js
+++ b/client/blocks/stats-navigation/intervals.js
@@ -19,7 +19,7 @@ const Intervals = props => {
'is-standalone': standalone,
} );
return (
- <SegmentedControl primary className={ classes }>
+ <SegmentedControl compact primary className={ classes }>
{ intervals.map( i => {
const path = pathTemplate.replace( /{{ interval }}/g, i.value );
return (
|
Stats: Make segmented control in header compact (#<I>)
|
diff --git a/spyder/plugins/application/container.py b/spyder/plugins/application/container.py
index <HASH>..<HASH> 100644
--- a/spyder/plugins/application/container.py
+++ b/spyder/plugins/application/container.py
@@ -384,10 +384,21 @@ class ApplicationContainer(PluginMainContainer):
@Slot()
def restart_debug(self):
- answer = QMessageBox.warning(self, _("Warning"),
- _("Spyder will restart in debug mode: <br><br>"
- "Do you want to continue?"),
- QMessageBox.Yes | QMessageBox.No)
- if answer == QMessageBox.Yes:
+ box = QMessageBox(QMessageBox.Question, _("Question"),
+ _("Which debug mode do you want Spyder to restart in?"),
+ QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel,
+ parent=self)
+ verbose = box.button(QMessageBox.Yes)
+ minimal = box.button(QMessageBox.No)
+ verbose.setText(_("Verbose"))
+ minimal.setText(_("Minimal"))
+ box.exec_()
+
+ if box.clickedButton() == minimal:
+ os.environ['SPYDER_DEBUG'] = '2'
+ elif box.clickedButton() == verbose:
os.environ['SPYDER_DEBUG'] = '3'
- self.sig_restart_requested.emit()
+ else:
+ return
+
+ self.sig_restart_requested.emit()
|
* Add option to select debug mode on restart in debug mode
|
diff --git a/test/runnel.js b/test/runnel.js
index <HASH>..<HASH> 100644
--- a/test/runnel.js
+++ b/test/runnel.js
@@ -220,7 +220,12 @@ test('\n second callback has syntax error', function (t) {
setup();
runnel(uno, synerror, tres, function (err) {
- t.ok(/aa/.test(err.message), 'passes syntax error');
+ if (!process.browser)
+ // no way to cover all possible error messages for each browser
+ t.ok(/aa is not defined/.test(err.message), 'passes syntax error');
+ else
+ t.ok(err, 'passes syntax error')
+
t.ok(unocalled, 'called uno');
t.notOk(trescalled, 'not called tres');
|
just testing for existence of syntax error in browsers
|
diff --git a/sorter/src/main/java/sortpom/util/FileUtil.java b/sorter/src/main/java/sortpom/util/FileUtil.java
index <HASH>..<HASH> 100644
--- a/sorter/src/main/java/sortpom/util/FileUtil.java
+++ b/sorter/src/main/java/sortpom/util/FileUtil.java
@@ -6,7 +6,6 @@ import sortpom.parameter.PluginParameters;
import java.io.*;
import java.net.URL;
-import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.nio.file.Files;
import java.util.Optional;
@@ -80,9 +79,9 @@ public class FileUtil {
*/
public String getPomFileContent() {
String content;
- try {
- content = Files.readString(pomFile.toPath(), Charset.forName(encoding));
- } catch (UnsupportedCharsetException ex) {
+ try (InputStream inputStream = new FileInputStream(pomFile)) {
+ content = IOUtils.toString(inputStream, encoding);
+ } catch (UnsupportedCharsetException ex) {
throw new FailureException("Could not handle encoding: " + encoding, ex);
} catch (IOException ex) {
throw new FailureException("Could not read pom file: " + pomFile.getAbsolutePath(), ex);
|
Reverted functionality which don't exists until Java <I>
|
diff --git a/src/A256KW.php b/src/A256KW.php
index <HASH>..<HASH> 100644
--- a/src/A256KW.php
+++ b/src/A256KW.php
@@ -17,13 +17,9 @@ class A256KW
/**
* @param string $kek The Key Encryption Key
- *
- * @throws \InvalidArgumentException If the size of the KEK is invalid
*/
protected static function checkKEKSize($kek)
{
- if (strlen($kek) !== 32) {
- throw new \InvalidArgumentException('Bad KEK size');
- }
+ Assertion::eq(strlen($kek), 32, 'Bad KEK size');
}
}
|
Update A<I>KW.php
|
diff --git a/services/OauthService.php b/services/OauthService.php
index <HASH>..<HASH> 100644
--- a/services/OauthService.php
+++ b/services/OauthService.php
@@ -619,7 +619,8 @@ class OauthService extends BaseApplicationComponent
foreach($oauthProviderTypes as $oauthProviderType)
{
- $providers[$oauthProviderType] = $this->_createProvider($oauthProviderType);
+ $provider = $this->_createProvider($oauthProviderType);
+ $providers[$provider->getHandle()] = $provider;
}
ksort($providers);
|
Fixed a bug where providers were not properly alphabetically sorted
|
diff --git a/parsl/monitoring/monitoring.py b/parsl/monitoring/monitoring.py
index <HASH>..<HASH> 100644
--- a/parsl/monitoring/monitoring.py
+++ b/parsl/monitoring/monitoring.py
@@ -6,6 +6,7 @@ import time
import typeguard
import datetime
import zmq
+from functools import wraps
import queue
from parsl.multiprocessing import ForkProcess, SizedQueue
@@ -324,6 +325,7 @@ class MonitoringHub(RepresentationMixin):
""" Internal
Wrap the Parsl app with a function that will call the monitor function and point it at the correct pid when the task begins.
"""
+ @wraps(f)
def wrapped(*args: List[Any], **kwargs: Dict[str, Any]) -> Any:
# Send first message to monitoring router
send_first_message(try_id,
|
adds wraps to monitoring so functions have their names back (#<I>)
Callables lose their name attributes when monitoring is turned on as the wrapper function for monitoring doesn't wrap callables correctly. More details can be found in this issue: <URL>
|
diff --git a/app/assets/javascripts/pageflow/editor/views/entry_preview_view.js b/app/assets/javascripts/pageflow/editor/views/entry_preview_view.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/pageflow/editor/views/entry_preview_view.js
+++ b/app/assets/javascripts/pageflow/editor/views/entry_preview_view.js
@@ -93,7 +93,7 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
view.ui.overview.overview();
});
- this.$el.toggleClass('emphasize_chapter_beginning', !!this.model.get('emphasize_chapter_beginning'));
+ this.$el.toggleClass('emphasize_chapter_beginning', !!this.model.configuration.get('emphasize_chapter_beginning'));
},
updateWidgets: function(partials) {
|
Read emphasize_chapter_beginning from Entry Configuration
|
diff --git a/recordext/functions/set_record_documents.py b/recordext/functions/set_record_documents.py
index <HASH>..<HASH> 100644
--- a/recordext/functions/set_record_documents.py
+++ b/recordext/functions/set_record_documents.py
@@ -24,7 +24,7 @@ import os
from invenio.base.utils import toposort_depends
from invenio.modules.documents import api
from invenio.modules.documents.tasks import set_document_contents
-from invenio.modules.pidstore.recordext.functions import reserve_recid
+from invenio_records.recordext.functions import reserve_recid
from invenio_records.signals import before_record_insert
from invenio_records.utils import name_generator
|
pidstore: removal of recid provider
* INCOMPATIBLE Removes recid provider, reserve recid function and
* datacite tasks as they were ported to invenio-records package.
(addresses inveniosoftware/invenio-records#6)
|
diff --git a/lib/neo4j/rails/relationships/node_dsl.rb b/lib/neo4j/rails/relationships/node_dsl.rb
index <HASH>..<HASH> 100644
--- a/lib/neo4j/rails/relationships/node_dsl.rb
+++ b/lib/neo4j/rails/relationships/node_dsl.rb
@@ -58,6 +58,10 @@ module Neo4j
@storage.persisted?
end
+ def to_ary
+ all.to_a
+ end
+
# Specifies the depth of the traversal
def depth(d)
adapt_to_traverser.depth(d)
|
Add a to_ary since the Rails ActionView needs(Thanks Depaak) [#<I>]
|
diff --git a/core-bundle/tests/Controller/FrontendModule/TwoFactorControllerTest.php b/core-bundle/tests/Controller/FrontendModule/TwoFactorControllerTest.php
index <HASH>..<HASH> 100644
--- a/core-bundle/tests/Controller/FrontendModule/TwoFactorControllerTest.php
+++ b/core-bundle/tests/Controller/FrontendModule/TwoFactorControllerTest.php
@@ -43,13 +43,6 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class TwoFactorControllerTest extends TestCase
{
- protected function setUp(): void
- {
- parent::setUp();
-
- System::setContainer($this->getContainerWithContaoConfiguration());
- }
-
public function testReturnsEmptyResponseIfTheUserIsNotFullyAuthenticated(): void
{
$container = $this->getContainerWithFrameworkTemplate(
|
Removed an unused setup method (see #<I>)
Description
-----------
Figured out this setup method is never used because every test method calls `getContainerWithFrameworkTemplate` which sets `System::setContainer` anyway.
Commits
-------
4f<I> Removed unused setup method
|
diff --git a/src/nerdbank-gitversioning.npm/gulpfile.js b/src/nerdbank-gitversioning.npm/gulpfile.js
index <HASH>..<HASH> 100644
--- a/src/nerdbank-gitversioning.npm/gulpfile.js
+++ b/src/nerdbank-gitversioning.npm/gulpfile.js
@@ -24,9 +24,9 @@ gulp.task('tsc', function() {
}
};
return merge([
- tsResult.dts.pipe(gulp.dest(`${outDir}/definitions`)),
+ tsResult.dts.pipe(gulp.dest(outDir)),
tsResult.js
- .pipe(sourcemaps.write(`maps`))
+ .pipe(sourcemaps.write('.'))
.pipe(replace({
tokens: replacements,
preserveUnknownTokens: true // we'll set the remaining ones later.
|
Keep typings and maps in root directory of package
|
diff --git a/coremain/version.go b/coremain/version.go
index <HASH>..<HASH> 100644
--- a/coremain/version.go
+++ b/coremain/version.go
@@ -2,7 +2,7 @@ package coremain
// Various CoreDNS constants.
const (
- CoreVersion = "1.6.2"
+ CoreVersion = "1.6.3"
coreName = "CoreDNS"
serverType = "dns"
)
|
Up version to <I> (#<I>)
|
diff --git a/lib/rspec_api_documentation/example.rb b/lib/rspec_api_documentation/example.rb
index <HASH>..<HASH> 100644
--- a/lib/rspec_api_documentation/example.rb
+++ b/lib/rspec_api_documentation/example.rb
@@ -39,7 +39,7 @@ module RspecApiDocumentation
end
def explanation
- metadata[:explanation] || ""
+ metadata[:explanation] || nil
end
end
end
diff --git a/spec/example_spec.rb b/spec/example_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/example_spec.rb
+++ b/spec/example_spec.rb
@@ -138,7 +138,7 @@ describe RspecApiDocumentation::Example do
end
it "should return an empty string when not set" do
- example.explanation.should == ""
+ example.explanation.should == nil
end
end
end
|
Example#explanation should return nil so that the Mustache template won't render it
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -104,9 +104,16 @@ module.exports = {
return `<link rel="preload" href="${rootUrl}/assets/fonts/${font}" as="font" type="font/woff2" crossorigin="anonymous">`;
});
const linkText = links.join("\n");
+ let polyfillIoScript = '';
+
+ if (env.environment === "production") {
+ //provides polyfills based on the users browser, Safari 12 requires Intl.PluralRules and Intl.RelativeTimeFormat for each locale we support
+ polyfillIoScript = '<script src="https://polyfill.io/v3/polyfill.min.js?version=3.52.1&features=Intl.PluralRules%252CIntl.PluralRules.%257Elocale.en%252CIntl.PluralRules.%257Elocale.es%252CIntl.PluralRules.%257Elocale.fr%252CIntl.RelativeTimeFormat%252CIntl.RelativeTimeFormat.%257Elocale.en%252CIntl.RelativeTimeFormat.%257Elocale.fr%252CIntl.RelativeTimeFormat.%257Elocale.es"></script>';
+ }
return `
<title>Ilios</title>
+ ${polyfillIoScript}
${linkText}
`;
}
|
Add polyfill for safari <I>
This version, which is still in active use, doesn't have the Intl libs
we need. Using the polyfill.io service creates a script that uses the
browser agent to decide what data to send so users of more modern
browsers won't need to download and execute this.
|
diff --git a/payment_sixpay/indico_payment_sixpay/controllers.py b/payment_sixpay/indico_payment_sixpay/controllers.py
index <HASH>..<HASH> 100644
--- a/payment_sixpay/indico_payment_sixpay/controllers.py
+++ b/payment_sixpay/indico_payment_sixpay/controllers.py
@@ -114,7 +114,7 @@ class RHInitSixpayPayment(RHPaymentBase):
try:
resp.raise_for_status()
except RequestException as exc:
- self.logger.error('Could not initialize payment: %s', exc.response.text)
+ SixpayPaymentPlugin.logger.error('Could not initialize payment: %s', exc.response.text)
raise Exception('Could not initialize payment')
return resp.json()
|
Payment/Sixpay: Fix error logging
|
diff --git a/cmd/kops/secrets_expose.go b/cmd/kops/secrets_expose.go
index <HASH>..<HASH> 100644
--- a/cmd/kops/secrets_expose.go
+++ b/cmd/kops/secrets_expose.go
@@ -100,7 +100,7 @@ func (cmd *ExposeSecretsCommand) Run() error {
return fmt.Errorf("secret type not known: %q", cmd.Type)
}
- _, err := fmt.Fprint(os.Stdout, value)
+ _, err := fmt.Fprint(os.Stdout, value + "\n")
if err != nil {
return fmt.Errorf("error writing to output: %v", err)
}
|
When exposing secrets, output a blank line afterwards
Otherwise it becomes hard to copy and paste
|
diff --git a/lib/mapnik.js b/lib/mapnik.js
index <HASH>..<HASH> 100644
--- a/lib/mapnik.js
+++ b/lib/mapnik.js
@@ -11,9 +11,11 @@ var sm = new (require('sphericalmercator'));
var cache = {};
-// Increase number of threads to 1.5x the number of logical CPUs.
-var threads = Math.ceil(Math.max(4, require('os').cpus().length * 1.5));
-require('eio').setMinParallel(threads);
+if (process.platform !== 'win32') {
+ // Increase number of threads to 1.5x the number of logical CPUs.
+ var threads = Math.ceil(Math.max(4, require('os').cpus().length * 1.5));
+ require('eio').setMinParallel(threads);
+}
exports = module.exports = MapnikSource;
|
node-eio only makes sense on unix
|
diff --git a/src/main/java/com/lazerycode/jmeter/testrunner/TestManager.java b/src/main/java/com/lazerycode/jmeter/testrunner/TestManager.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/lazerycode/jmeter/testrunner/TestManager.java
+++ b/src/main/java/com/lazerycode/jmeter/testrunner/TestManager.java
@@ -119,6 +119,15 @@ public class TestManager {
JMeterProcessBuilder.addArguments(argumentsArray);
try {
final Process process = JMeterProcessBuilder.startProcess();
+
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ @Override
+ public void run() {
+ LOGGER.info("Shutdown detected, destroying JMeter process...");
+ process.destroy();
+ }
+ });
+
BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
String line;
while ((line = br.readLine()) != null) {
|
Fix #<I> add a shutdown hook to destroy the JMeter process if the parent thread is terminated.
|
diff --git a/tasks/jekyll_post.js b/tasks/jekyll_post.js
index <HASH>..<HASH> 100644
--- a/tasks/jekyll_post.js
+++ b/tasks/jekyll_post.js
@@ -69,6 +69,8 @@ module.exports = function(grunt) {
} else {
grunt.fail.warn("Your Gruntfile's jekyll_post task needs a `title` question.");
}
+
+ done();
});
}
});
|
Added done(); so the task can move on
|
diff --git a/Kwc/Articles/Directory/Controller.php b/Kwc/Articles/Directory/Controller.php
index <HASH>..<HASH> 100644
--- a/Kwc/Articles/Directory/Controller.php
+++ b/Kwc/Articles/Directory/Controller.php
@@ -4,7 +4,10 @@ class Kwc_Articles_Directory_Controller extends Kwf_Controller_Action_Auto_Kwc_G
protected $_buttons = array('save', 'add');
protected $_paging = 25;
protected $_filters = array('text'=>true);
- protected $_defaultOrder = array('field'=>'date', 'direction'=>'DESC');
+ protected $_defaultOrder = array(
+ array('field'=>'date', 'direction'=>'DESC'),
+ array('field'=>'priority', 'direction'=>'DESC')
+ );
protected function _initColumns()
{
|
added order for priority in backend for articles
|
diff --git a/completer.js b/completer.js
index <HASH>..<HASH> 100644
--- a/completer.js
+++ b/completer.js
@@ -175,15 +175,21 @@ exports.search = search = function(phrase, count, callback) {
}
if (iter == keys.length) {
- return callback(null, results);
+ // it's annoying to deal with dictionaries in js
+ // turn it into a sorted list for the client's convenience
+ var ret = [];
+ for (var key in results) {
+ ret.push(key);
+ }
+ ret.sort(function(a,b) { return results[b] - results[a] });
+ return callback(null, ret);
}
});
});
} else {
- callback(null, {});
+ callback(null, []);
}
}
});
}
-
|
return search results as sorted list, not dict of scores
|
diff --git a/src/com/google/javascript/jscomp/Es6ToEs3Converter.java b/src/com/google/javascript/jscomp/Es6ToEs3Converter.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/Es6ToEs3Converter.java
+++ b/src/com/google/javascript/jscomp/Es6ToEs3Converter.java
@@ -339,8 +339,8 @@ public final class Es6ToEs3Converter implements NodeTraversal.Callback, HotSwapC
Node typeNode = type.getRoot();
Node memberType =
typeNode.getType() == Token.ELLIPSIS
- ? typeNode.getFirstChild().cloneNode()
- : typeNode.cloneNode();
+ ? typeNode.getFirstChild().cloneTree()
+ : typeNode.cloneTree();
arrayType.addChildToFront(
new Node(Token.BLOCK, memberType).useSourceInfoIfMissingFrom(typeNode));
JSDocInfoBuilder builder = new JSDocInfoBuilder(false);
|
Use cloneTree instead of cloneNode so that we don't end up with invalid trees.
<URL>
|
diff --git a/src/Manager.php b/src/Manager.php
index <HASH>..<HASH> 100644
--- a/src/Manager.php
+++ b/src/Manager.php
@@ -131,4 +131,25 @@ final class Manager {
return false;
}
+
+ /**
+ * Check if a table is installed.
+ *
+ * @since 1.0
+ *
+ * @param Table $table
+ *
+ * @return bool
+ */
+ public static function is_table_installed( Table $table ) {
+
+ /** @var $wpdb \wpdb */
+ global $wpdb;
+
+ $name = $table->get_table_name( $wpdb );
+
+ $results = $wpdb->get_results( "SHOW TABLES LIKE '$name'" );
+
+ return count( $results ) > 0;
+ }
}
\ No newline at end of file
|
Add method for checking if a table is installed.
|
diff --git a/src/Command.php b/src/Command.php
index <HASH>..<HASH> 100644
--- a/src/Command.php
+++ b/src/Command.php
@@ -18,8 +18,11 @@ class Command extends \hiqdev\hiart\Command
public function search($options = [])
{
$rows = parent::search($options);
- $isBatch = $this->request->getQuery()->getOption('batch');
- return $isBatch ? $rows : reset($rows);
+ if ($this->request->getQuery()->getOption('batch')) {
+ return $rows;
+ }
+
+ return $rows === [] ? null : reset($rows);
}
}
|
Fixed Command::search() to treat empty array response for Batch query as null
|
diff --git a/tool/forcefield/src/main/java/org/openscience/cdk/forcefield/mmff/MmffAtomTypeMatcher.java b/tool/forcefield/src/main/java/org/openscience/cdk/forcefield/mmff/MmffAtomTypeMatcher.java
index <HASH>..<HASH> 100644
--- a/tool/forcefield/src/main/java/org/openscience/cdk/forcefield/mmff/MmffAtomTypeMatcher.java
+++ b/tool/forcefield/src/main/java/org/openscience/cdk/forcefield/mmff/MmffAtomTypeMatcher.java
@@ -203,9 +203,11 @@ final class MmffAtomTypeMatcher {
* @param symbs symbolic atom types
*/
private void assignPreliminaryTypes(IAtomContainer container, String[] symbs) {
- SmartsMatchers.prepare(container, true);
+ // shallow copy
+ IAtomContainer cpy = container.getBuilder().newInstance(IAtomContainer.class, container);
+ SmartsMatchers.prepare(cpy, true);
for (AtomTypePattern matcher : patterns) {
- for (final int idx : matcher.matches(container)) {
+ for (final int idx : matcher.matches(cpy)) {
if (symbs[idx] == null) {
symbs[idx] = matcher.symb;
}
|
Perform SMARTS matching on a shallow copy.
|
diff --git a/source/Application/Controller/Admin/statistic_main.php b/source/Application/Controller/Admin/statistic_main.php
index <HASH>..<HASH> 100644
--- a/source/Application/Controller/Admin/statistic_main.php
+++ b/source/Application/Controller/Admin/statistic_main.php
@@ -54,7 +54,7 @@ class Statistic_Main extends oxAdminDetails
}
// setting all reports data: check for reports and load them
- $sPath = getShopBasePath() . "Application/controllers/admin/reports";
+ $sPath = getShopBasePath() . "Application/Controller/Admin/Report";
$iLanguage = (int) oxRegistry::getConfig()->getRequestParameter("editlanguage");
$aAllreports = array();
|
ESDEV-<I> Update path to file to uppercase in statistic_main.php
|
diff --git a/configargparse.py b/configargparse.py
index <HASH>..<HASH> 100644
--- a/configargparse.py
+++ b/configargparse.py
@@ -741,10 +741,11 @@ class ArgumentParser(argparse.ArgumentParser):
self.error("Unexpected value for %s: '%s'. Expecting 'true', "
"'false', 'yes', 'no', '1' or '0'" % (key, value))
elif isinstance(value, list):
- accepts_list = (isinstance(action, argparse._StoreAction) and
- action.nargs in ('+', '*')) or (
- isinstance(action, argparse._StoreAction) and
- isinstance(action.nargs, int) and action.nargs > 1)
+ accepts_list = ((isinstance(action, argparse._StoreAction) or
+ isinstance(action, argparse._AppendAction)) and
+ action.nargs is not None and (
+ action.nargs in ('+', '*')) or
+ (isinstance(action.nargs, int) and action.nargs > 1))
if action is None or isinstance(action, argparse._AppendAction):
for list_elem in value:
|
Redo fix for nargs and append
|
diff --git a/src/Dhl/resources/capabilities.php b/src/Dhl/resources/capabilities.php
index <HASH>..<HASH> 100644
--- a/src/Dhl/resources/capabilities.php
+++ b/src/Dhl/resources/capabilities.php
@@ -57,14 +57,10 @@ return array(
),
'option' =>
array(
- 'description' => 'The shipment options',
- 'type' => 'array',
+ 'description' => 'The shipment options (comma separated)',
+ 'type' => 'string',
'required' => false,
- 'location' => 'query',
- 'items' =>
- array(
- 'type' => 'string',
- ),
+ 'location' => 'query'
),
'fromPostalCode' =>
array(
|
Change option-key in capabiliteis to comma-separated
|
diff --git a/storybook/main.js b/storybook/main.js
index <HASH>..<HASH> 100644
--- a/storybook/main.js
+++ b/storybook/main.js
@@ -8,5 +8,6 @@ module.exports = {
'../src/js/contexts/**/stories/typescript/*.tsx',
'../src/js/contexts/**/stories/*.(ts|tsx|js|jsx)',
'../src/js/all/**/stories/*.(ts|tsx|js|jsx)',
+ '../src/js/all/stories/typescript/*.tsx',
],
};
|
Added tsx loader for All stories (#<I>)
|
diff --git a/chess/uci.py b/chess/uci.py
index <HASH>..<HASH> 100644
--- a/chess/uci.py
+++ b/chess/uci.py
@@ -1140,6 +1140,8 @@ def popen_engine(command, engine_cls=Engine, setpgrp=False, _popen_lock=threadin
>>> engine.author
'T. Romstad, M. Costalba, J. Kiiski, G. Linscott'
+ :param command:
+ :param engine_cls:
:param setpgrp: Open the engine process in a new process group. This will
stop signals (such as keyboard interrupts) from propagating from the
parent process. Defaults to ``False``.
diff --git a/chess/xboard.py b/chess/xboard.py
index <HASH>..<HASH> 100644
--- a/chess/xboard.py
+++ b/chess/xboard.py
@@ -1449,6 +1449,8 @@ def popen_engine(command, engine_cls=Engine, setpgrp=False, _popen_lock=threadin
>>> engine = chess.xboard.popen_engine("/usr/games/crafty")
>>> engine.xboard()
+ :param command:
+ :param engine_cls:
:param setpgrp: Opens the engine process in a new process group. This will
stop signals (such as keyboard interrupts) from propagating from the
parent process. Defaults to ``False``.
|
Add some missing :param: docs
|
diff --git a/pypika/__init__.py b/pypika/__init__.py
index <HASH>..<HASH> 100644
--- a/pypika/__init__.py
+++ b/pypika/__init__.py
@@ -38,4 +38,4 @@ from .utils import JoinException, GroupingException, CaseException, UnionExcepti
__author__ = "Timothy Heys"
__email__ = "theys@kayak.com"
-__version__ = "0.1.14"
\ No newline at end of file
+__version__ = "0.2.0"
\ No newline at end of file
|
Upgraded verson to <I>
|
diff --git a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java b/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
index <HASH>..<HASH> 100644
--- a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
+++ b/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
@@ -51,7 +51,7 @@ public class RestartTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
@Rule
- public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(60));
+ public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(900));
@After
public void stop() {
|
Fix safeguard timeout in IT RestartTest
|
diff --git a/src/JpnForPhp/Transliterator/Kana.php b/src/JpnForPhp/Transliterator/Kana.php
index <HASH>..<HASH> 100644
--- a/src/JpnForPhp/Transliterator/Kana.php
+++ b/src/JpnForPhp/Transliterator/Kana.php
@@ -139,7 +139,7 @@ class Kana
protected $mapPunctuationMarks = array(
' ' => ' ', ',' => '、', ', ' => '、', '-' => '・', '.' => '。', ':' => '：', '!' => '！', '?' => '？',
'(' => '（', ')' => '）', '{' => '｛', '}' => '｝',
- '[' => '［', ']' => '］', '[' => '【', ']' => '】',
+ '[' => '［', ']' => '］',
'~' => '〜',
);
|
Remove duplicated opening/closing brackets (Fixes #<I>)
|
diff --git a/lib/fog/hmac.rb b/lib/fog/hmac.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/hmac.rb
+++ b/lib/fog/hmac.rb
@@ -2,17 +2,33 @@ module Fog
class HMAC
def initialize(type, key)
- @digest = case type
+ @key = key
+ case type
when 'sha1'
- OpenSSL::Digest::Digest.new('sha1')
+ setup_sha1
when 'sha256'
- OpenSSL::Digest::Digest.new('sha256')
+ setup_sha256
end
- @key = key
end
def sign(data)
- OpenSSL::HMAC.digest(@digest, @key, data)
+ @signer.call(data)
+ end
+
+ private
+
+ def setup_sha1
+ @digest = OpenSSL::Digest::Digest.new('sha1')
+ @signer = lambda do |data|
+ OpenSSL::HMAC.digest(@digest, @key, data)
+ end
+ end
+
+ def setup_sha256
+ @digest = OpenSSL::Digest::Digest.new('sha256')
+ @signer = lambda do |data|
+ OpenSSL::HMAC.digest(@digest, @key, data)
+ end
end
end
|
make hmac stuff a bit more flexible
|
diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb
index <HASH>..<HASH> 100644
--- a/lib/fluent/supervisor.rb
+++ b/lib/fluent/supervisor.rb
@@ -359,7 +359,11 @@ module Fluent
end
def run_worker
- require 'sigdump/setup'
+ begin
+ require 'sigdump/setup'
+ rescue Exception
+ # ignore LoadError and others (related with signals): it may raise these errors in Windows
+ end
@log.init
Process.setproctitle("worker:#{@process_name}") if @process_name
|
fix to rescue any errors for loading sigdump
|
diff --git a/cmd/gazelle/fix-update.go b/cmd/gazelle/fix-update.go
index <HASH>..<HASH> 100644
--- a/cmd/gazelle/fix-update.go
+++ b/cmd/gazelle/fix-update.go
@@ -234,7 +234,12 @@ func newFixUpdateConfiguration(cmd command, args []string) (*updateConfig, error
return nil, fmt.Errorf("failed to evaluate symlinks for repo root: %v", err)
}
- for _, dir := range uc.c.Dirs {
+ for i, dir := range uc.c.Dirs {
+ dir, err = filepath.EvalSymlinks(dir)
+ if err != nil {
+ return nil, fmt.Errorf("failed to evaluate symlinks for dir: %v", err)
+ }
+ uc.c.Dirs[i] = dir
if !isDescendingDir(dir, uc.c.RepoRoot) {
return nil, fmt.Errorf("dir %q is not a subdirectory of repo root %q", dir, uc.c.RepoRoot)
}
|
Evaluate symlinks in positional arguments (#<I>)
This fixes an error that occurs when Gazelle's positional command line
arguments are symbolic links.
|
diff --git a/lib/rest-ftp-daemon/job.rb b/lib/rest-ftp-daemon/job.rb
index <HASH>..<HASH> 100644
--- a/lib/rest-ftp-daemon/job.rb
+++ b/lib/rest-ftp-daemon/job.rb
@@ -9,7 +9,7 @@ module RestFtpDaemon
include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
end
- FIELDS = [:source, :target, :label, :priority, :notify, :overwrite, :mkdir, :tempfile]
+ FIELDS = [:source, :target, :label, :priority, :notify, :overwrite, :mkdir, :tempfile, :runs]
attr_accessor :wid
@@ -212,13 +212,13 @@ module RestFtpDaemon
oops :ended, exception, :timeout
end
- protected
-
def age
return nil if @queued_at.nil?
(Time.now - @queued_at).round(2)
end
+ protected
+
def set attribute, value
@mutex.synchronize do
@params || {}
|
Job: make .age method public
|
diff --git a/lockfile.go b/lockfile.go
index <HASH>..<HASH> 100644
--- a/lockfile.go
+++ b/lockfile.go
@@ -108,8 +108,18 @@ func (l Lockfile) TryLock() error {
return err
}
- // return value intentionally ignored, as ignoring it is part of the algorithm
- _ = os.Link(tmplock.Name(), name)
+ // EEXIST and similiar error codes, caught by os.IsExist, are intentionally ignored,
+ // as it means that someone was faster creating this link
+ // and ignoring this kind of error is part of the algorithm.
+ // The we will probably fail the pid owner check later, if this process is still alive.
+ // We cannot ignore ALL errors, since failure to support hard links, disk full
+ // as well as many other errors can happen to a filesystem operation
+ // and we really want to abort on those.
+ if err := os.Link(tmplock.Name(), name); err != nil {
+ if !os.IsExist(err) {
+ return err
+ }
+ }
fiTmp, err := os.Lstat(tmplock.Name())
if err != nil {
|
fail properly on unexpected link errors
also document the behavior more clearly.
Updates #<I>
|
diff --git a/fmttab_border_test.go b/fmttab_border_test.go
index <HASH>..<HASH> 100644
--- a/fmttab_border_test.go
+++ b/fmttab_border_test.go
@@ -45,10 +45,10 @@ func TestBorderHorizontalMulti(t *testing.T) {
org := fmt.Sprintf("Table%[1]s╔═══════╤═══════╤═══════╗%[1]s║Column1│Column2│Column3║%[1]s╟───────┼───────┼───────╢%[1]s║test │ │ ║ %[1]s╟───────┼───────┼───────╢%[1]s║test2 │ │ ║%[1]s╚═══════╧═══════╧═══════╝%[1]s", eol.EOL)
- tab := fmttab.New("Table",fmttab.BorderDouble,nil)
- tab.AddColumn("Column1",fmttab.WidthAuto,fmttab.AlignLeft)
- tab.AddColumn("Column2",fmttab.WidthAuto,fmttab.AlignLeft)
- tab.AddColumn("Column3",fmttab.WidthAuto,fmttab.AlignLeft)
+ tab := New("Table",BorderDouble,nil)
+ tab.AddColumn("Column1",WidthAuto,AlignLeft)
+ tab.AddColumn("Column2",WidthAuto,AlignLeft)
+ tab.AddColumn("Column3",WidthAuto,AlignLeft)
tab.CloseEachColumn=true;
tab.AppendData(map[string]interface{} {
"Column1": "test",
|
Update fmttab_border_test.go
|
diff --git a/Controller/SnapshotAdminController.php b/Controller/SnapshotAdminController.php
index <HASH>..<HASH> 100644
--- a/Controller/SnapshotAdminController.php
+++ b/Controller/SnapshotAdminController.php
@@ -50,7 +50,7 @@ class SnapshotAdminController extends Controller
$form = $this->createForm(CreateSnapshotType::class, $snapshot);
if ($request->getMethod() == 'POST') {
- $form->submit($request);
+ $form->submit($request->request->get($form->getName()));
if ($form->isValid()) {
$snapshotManager = $this->get('sonata.page.manager.snapshot');
|
Pass form data instead of request object to form::submit (#<I>)
|
diff --git a/src/bins.js b/src/bins.js
index <HASH>..<HASH> 100644
--- a/src/bins.js
+++ b/src/bins.js
@@ -169,7 +169,7 @@ module.exports = function(RAW_GENOME_DATA) {
return {
uniformBinMapper: function(binWidth) {
- var name = 'uniform_' + binWidth + '__bin';
+ var name = 'uniform_' + binWidth + 'Mb__bin';
if(!isNumber(binWidth)) {
throw new Error('binWidth must be numeric: ' + binWidth);
}
diff --git a/src/genomes.js b/src/genomes.js
index <HASH>..<HASH> 100644
--- a/src/genomes.js
+++ b/src/genomes.js
@@ -20,6 +20,10 @@ Genomes.prototype.binCount = function() {
return this._bins.length;
};
+Genomes.prototype.getBin = function(idx) {
+ return this._bins[idx];
+};
+
Genomes.prototype.each = function(iteratee) {
_.forEach(this._genomesArray, function(region) {
iteratee(region, region.name);
|
Fix for uniform bin mapper request. Get bin by global idx.
|
diff --git a/clam/clamservice.py b/clam/clamservice.py
index <HASH>..<HASH> 100755
--- a/clam/clamservice.py
+++ b/clam/clamservice.py
@@ -821,10 +821,6 @@ class Project:
printlog("Creating project '" + project + "'")
os.makedirs(settings.ROOT + "projects/" + user + '/' + project)
- #project index will need to be regenerated, remove cache
- if os.path.exists(os.path.join(settings.ROOT + "projects/" + user,'.index')):
- os.unlink(os.path.join(settings.ROOT + "projects/" + user,'.index'))
-
if not os.path.isdir(settings.ROOT + "projects/" + user + '/' + project + '/input/'):
os.makedirs(settings.ROOT + "projects/" + user + '/' + project + "/input")
if not os.path.isdir(settings.ROOT + "projects/" + user + '/' + project + '/input'):
|
do not delete project index on project creation anymore
|
diff --git a/vendor/visualmetrics.py b/vendor/visualmetrics.py
index <HASH>..<HASH> 100755
--- a/vendor/visualmetrics.py
+++ b/vendor/visualmetrics.py
@@ -1172,7 +1172,7 @@ def render_video(directory, video_file):
if current_image is not None:
command = ['ffmpeg', '-f', 'image2pipe', '-vcodec', 'png', '-r', '30', '-i', '-',
'-vcodec', 'libx264', '-r', '30', '-crf', '24', '-g', '15',
- '-preset', 'superfast', '-y', video_file]
+ '-preset', 'superfast', '-vf', 'pad=ceil(iw/2)*2:ceil(ih/2)*2', '-y', video_file]
try:
proc = subprocess.Popen(command, stdin=subprocess.PIPE)
if proc:
|
make sure the video has an even number of pixels (#<I>)
|
diff --git a/keyrings/alt/file.py b/keyrings/alt/file.py
index <HASH>..<HASH> 100644
--- a/keyrings/alt/file.py
+++ b/keyrings/alt/file.py
@@ -10,7 +10,7 @@ from keyring.py27compat import configparser
from keyring.util import properties
from keyring.util.escape import escape as escape_for_ini
-from keyrings.cryptfile.file_base import (
+from keyrings.alt.file_base import (
Keyring, decodebytes, encodebytes,
)
|
file.py: fix cherry-pick overlook
|
diff --git a/db/seeds.rb b/db/seeds.rb
index <HASH>..<HASH> 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -78,12 +78,11 @@ params = {
'ovs_bridge_mappings' => [],
'ovs_bridge_uplinks' => [],
'ovs_tunnel_iface' => 'eth0',
- 'tenant_network_type' => 'gre',
+ 'tenant_network_type' => 'vxlan',
'enable_tunneling' => 'True',
'ovs_vxlan_udp_port' => '4789',
- 'ovs_tunnel_types' => [],
+ 'ovs_tunnel_types' => ['vxlan'],
'auto_assign_floating_ip' => 'True',
- 'neutron_core_plugin' => 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
'cisco_vswitch_plugin' => 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
'cisco_nexus_plugin' => 'neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin',
'nexus_config' => {},
|
BZ #<I> - Tweak settings for ML2 as default
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.