diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/packer/new_stuff.go b/packer/new_stuff.go
index <HASH>..<HASH> 100644
--- a/packer/new_stuff.go
+++ b/packer/new_stuff.go
@@ -9,7 +9,8 @@ type GetBuildsOptions struct {
}
type BuildGetter interface {
- // GetBuilds return all possible builds for a config. It also starts them.
+ // GetBuilds return all possible builds for a config. It also starts all
+ // builders.
// TODO(azr): rename to builder starter ?
GetBuilds(GetBuildsOptions) ([]Build, hcl.Diagnostics)
}
@@ -19,15 +20,20 @@ type FixConfigMode int
const (
Stdout FixConfigMode = iota
+ // Inplace fixes your files on the spot.
Inplace
+ // Diff shows a full diff.
Diff
+ // SimpleOutput will simply print what the config should be; it will only
+ // work when a single file is passed.
+ SimpleOutput
)
type FixConfigOptions struct {
DiffOnly bool
}
-type OtherInterfaceyMacOtherInterfaceFace interface {
+type ConfigFixer interface {
// FixConfig will output the config in a fixed manner.
FixConfig(FixConfigOptions) hcl.Diagnostics
}
|
Update new_stuff.go
|
diff --git a/lib/heroku/pg_resolver.rb b/lib/heroku/pg_resolver.rb
index <HASH>..<HASH> 100644
--- a/lib/heroku/pg_resolver.rb
+++ b/lib/heroku/pg_resolver.rb
@@ -36,7 +36,7 @@ module PGResolver
end
resolver = Resolver.new(db_id, config_vars)
- display resolver.message
+ display(resolver.message) if resolver.message
abort_with_database_list(db_id) unless resolver.url
return resolver
@@ -67,10 +67,6 @@ module PGResolver
end
end
- def display(message='', newline=true)
- super if message
- end
-
class Resolver
include PGResolver
attr_reader :url, :db_id
|
cleanup pg resolver message printing for consistency
|
diff --git a/Query/Builder.php b/Query/Builder.php
index <HASH>..<HASH> 100755
--- a/Query/Builder.php
+++ b/Query/Builder.php
@@ -947,7 +947,7 @@ class Builder {
*/
public function offset($value)
{
- $this->offset = $value > 0 ? $value : 0;
+ $this->offset = max(0, $value);
return $this;
}
|
Use max() instead of ternary in DB offset.
|
diff --git a/Lib/ufo2ft/outlineCompiler.py b/Lib/ufo2ft/outlineCompiler.py
index <HASH>..<HASH> 100644
--- a/Lib/ufo2ft/outlineCompiler.py
+++ b/Lib/ufo2ft/outlineCompiler.py
@@ -1474,7 +1474,16 @@ class OutlineTTFCompiler(BaseOutlineCompiler, InstructionCompiler):
hmtx = self.otf.get("hmtx")
ttGlyphs = self.getCompiledGlyphs()
- for name in self.glyphOrder:
+ # Sort the glyphs so that simple glyphs are compiled first, and composite
+ # glyphs are compiled later. Otherwise the glyph hashes may not be ready
+ # to calculate when a base glyph of a composite glyph is not in the font yet.
+ compilation_order = [
+ name
+ for _, name in sorted(
+ [(int(ttGlyphs[name].isComposite()), name) for name in self.glyphOrder]
+ )
+ ]
+ for name in compilation_order:
ttGlyph = ttGlyphs[name]
if ttGlyph.isComposite() and hmtx is not None and self.autoUseMyMetrics:
self.autoUseMyMetrics(ttGlyph, name, hmtx)
|
Compile simple glyphs first to avoid missing base glyphs in composites
|
diff --git a/src/Assetic/Filter/Yui/BaseCompressorFilter.php b/src/Assetic/Filter/Yui/BaseCompressorFilter.php
index <HASH>..<HASH> 100644
--- a/src/Assetic/Filter/Yui/BaseCompressorFilter.php
+++ b/src/Assetic/Filter/Yui/BaseCompressorFilter.php
@@ -80,7 +80,7 @@ abstract class BaseCompressorFilter implements FilterInterface
// input and output files
$tempDir = realpath(sys_get_temp_dir());
- $hash = substr(sha1(time().rand(11111, 99999)), 0, 7);
+ $hash = substr(sha1(microtime().rand(11111, 99999)), 0, 7);
$input = $tempDir.DIRECTORY_SEPARATOR.$hash.'.'.$type;
$output = $tempDir.DIRECTORY_SEPARATOR.$hash.'-min.'.$type;
file_put_contents($input, $content);
|
Ensure uniqueness of temporary files created by the compressor filter. Fixed #<I>
|
diff --git a/scapy/arch/__init__.py b/scapy/arch/__init__.py
index <HASH>..<HASH> 100644
--- a/scapy/arch/__init__.py
+++ b/scapy/arch/__init__.py
@@ -28,7 +28,8 @@ except ImportError:
def str2mac(s):
- return ("%02x:"*6)[:-1] % tuple(map(ord, s))
+ #return ("%02x:"*6)[:-1] % tuple(map(ord, s))
+ return ("%02x:"*6)[:-1] % tuple(s)
diff --git a/scapy/sendrecv.py b/scapy/sendrecv.py
index <HASH>..<HASH> 100644
--- a/scapy/sendrecv.py
+++ b/scapy/sendrecv.py
@@ -145,7 +145,7 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbose=None, chainCC=0, retry=0
if r.answers(hlst[i]):
ans.append((hlst[i],r))
if verbose > 1:
- os.write(1, "*")
+ os.write(1, b"*")
ok = 1
if not multi:
del(hlst[i])
|
Fixed setting src mac address
|
diff --git a/Utilities/Clock.php b/Utilities/Clock.php
index <HASH>..<HASH> 100644
--- a/Utilities/Clock.php
+++ b/Utilities/Clock.php
@@ -6,6 +6,7 @@
namespace Ouzo\Utilities;
use DateTime;
+use DateTimeZone;
/**
* Class Clock
@@ -186,4 +187,10 @@ class Clock
{
return $this->getTimestamp() < $other->getTimestamp();
}
+
+ public function setTimezone($timezone)
+ {
+ $this->dateTime->setTimezone(new DateTimeZone($timezone));
+ return $this;
+ }
}
|
Added setTimezone to Clock.
|
diff --git a/src/main/java/org/mythtv/services/api/frontend/impl/FrontendTemplate.java b/src/main/java/org/mythtv/services/api/frontend/impl/FrontendTemplate.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/mythtv/services/api/frontend/impl/FrontendTemplate.java
+++ b/src/main/java/org/mythtv/services/api/frontend/impl/FrontendTemplate.java
@@ -187,7 +187,6 @@ public class FrontendTemplate extends AbstractFrontendOperations implements Fron
if(useBookmark) parameters.add( "UseBookmark", "1");
URI uri = buildUri( frontedApiUrlBase + "/Frontend/PlayVideo", parameters );
- Log.d(TAG, uri.toString());
ResponseEntity<Bool> responseEntity = restOperations.exchange(
uri,
|
removed Log reference from code. Log is specific to Android and this
library is intended not to be tied to android specifically.
|
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index <HASH>..<HASH> 100644
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -2342,9 +2342,13 @@ class custom_menu extends custom_menu_item {
if (preg_match('/^(\-*)/', $line, $match) && $lastchild != null && $lastdepth !== null) {
$depth = strlen($match[1]);
if ($depth < $lastdepth) {
- if ($lastdepth > 1) {
- $depth = $lastdepth - 1;
- $lastchild = $lastchild->get_parent()->get_parent()->add($bits[0], $bits[1], $bits[2], $bits[3]);
+ $difference = $lastdepth - $depth;
+ if ($lastdepth > 1 && $lastdepth != $difference) {
+ $tempchild = $lastchild->get_parent();
+ for ($i =0; $i < $difference; $i++) {
+ $tempchild = $tempchild->get_parent();
+ }
+ $lastchild = $tempchild->add($bits[0], $bits[1], $bits[2], $bits[3]);
} else {
$depth = 0;
$lastchild = new custom_menu_item($bits[0], $bits[1], $bits[2], $bits[3]);
|
output-custommenu MDL-<I> Fixed up the processing of the custom menu removing the hard-coded single step down
|
diff --git a/cmd/web-handlers.go b/cmd/web-handlers.go
index <HASH>..<HASH> 100644
--- a/cmd/web-handlers.go
+++ b/cmd/web-handlers.go
@@ -471,7 +471,7 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
AccountName: claims.Subject,
Action: iampolicy.ListBucketAction,
BucketName: args.BucketName,
- ConditionValues: getConditionValues(r, "", ""),
+ ConditionValues: getConditionValues(r, "", claims.Subject),
IsOwner: owner,
})
@@ -479,7 +479,7 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
AccountName: claims.Subject,
Action: iampolicy.PutObjectAction,
BucketName: args.BucketName,
- ConditionValues: getConditionValues(r, "", ""),
+ ConditionValues: getConditionValues(r, "", claims.Subject),
IsOwner: owner,
ObjectName: args.Prefix + "/",
})
|
Make sure to pass the right username for correct ConditionValues (#<I>)
Without passing proper username value would result in AccessDenied
errors when policies with `{aws:username}` substitutions are used.
Fixes #<I>
|
diff --git a/loggers.go b/loggers.go
index <HASH>..<HASH> 100644
--- a/loggers.go
+++ b/loggers.go
@@ -13,7 +13,11 @@ type IoLogger struct {
}
func (l *IoLogger) Log(data Data) error {
- _, err := l.stream.Write(l.BuildLog(data))
+ return l.Write(l.BuildLog(data))
+}
+
+func (l *IoLogger) Write(data []byte) err {
+ _, err := l.stream.Write(data)
return err
}
|
expose how an IoLogger writes to the stream
|
diff --git a/search/actions/getSearchResults.js b/search/actions/getSearchResults.js
index <HASH>..<HASH> 100644
--- a/search/actions/getSearchResults.js
+++ b/search/actions/getSearchResults.js
@@ -6,6 +6,7 @@
*/
import { ITEMS_PER_LOAD } from '@shopgate/pwa-common/constants/DisplayOptions';
+import { getSortOrder } from '@shopgate/pwa-common/selectors/history';
import getProducts from '../../product/actions/getProducts';
import requestSearchResults from '../action-creators/requestSearchResults';
import receiveSearchResults from '../action-creators/receiveSearchResults';
@@ -26,12 +27,15 @@ const getSearchResults = (offset = 0) => (dispatch, getState) => {
return;
}
+ const sort = getSortOrder(state);
+
const promise = dispatch(
getProducts({
params: {
searchPhrase,
offset,
limit,
+ sort,
},
onBeforeDispatch: () => {
// Dispatch the request action before the related pipeline request is executed.
|
CON-<I>: fixed missing sort order in product search pipeline requests
|
diff --git a/src/Select.js b/src/Select.js
index <HASH>..<HASH> 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -537,7 +537,7 @@ const Select = React.createClass({
if (options && options.length) {
let Option = this.props.optionComponent;
let renderLabel = this.props.optionRenderer || this.getOptionLabel;
- return options.map(option => {
+ return options.map((option, i) => {
let isSelected = valueArray && valueArray.indexOf(option) > -1;
let isFocused = option === focusedOption;
let optionRef = isFocused ? 'focused' : null;
@@ -552,7 +552,7 @@ const Select = React.createClass({
className={optionClass}
isDisabled={option.disabled}
isFocused={isFocused}
- key={'option-' + option[this.props.valueKey]}
+ key={`option-${i}-${option[this.props.valueKey]}`}
onSelect={this.selectValue}
onFocus={this.focusOption}
option={option}
|
Prevent duplicate react keys when multiple options have the same value
Ref #<I>
|
diff --git a/etc/MelisDemoCms/src/MelisDemoCms/Controller/MelisSetupPostDownloadController.php b/etc/MelisDemoCms/src/MelisDemoCms/Controller/MelisSetupPostDownloadController.php
index <HASH>..<HASH> 100755
--- a/etc/MelisDemoCms/src/MelisDemoCms/Controller/MelisSetupPostDownloadController.php
+++ b/etc/MelisDemoCms/src/MelisDemoCms/Controller/MelisSetupPostDownloadController.php
@@ -205,7 +205,7 @@ class MelisSetupPostDownloadController extends AbstractActionController implemen
$setupSrv = $this->getServiceLocator()->get('SetupDemoCmsService');
- $setupSrv->setupSite($siteData);
+ //$setupSrv->setupSite($siteData); -- caused to duplicate site entry 02-15-19
$setupSrv->setup(getenv('MELIS_PLATFORM'), $siteLabel);
//$setupSrv->setupSiteDomain($scheme, $domain);
|
fixed error duplicate site-entry during installation
|
diff --git a/tests/CommandBus/SimpleCommandBusTest.php b/tests/CommandBus/SimpleCommandBusTest.php
index <HASH>..<HASH> 100644
--- a/tests/CommandBus/SimpleCommandBusTest.php
+++ b/tests/CommandBus/SimpleCommandBusTest.php
@@ -47,13 +47,10 @@ class SimpleCommandBusTest extends \PHPUnit_Framework_TestCase
* @test
* @expectedException \HelloFresh\Engine\CommandBus\Exception\MissingHandlerException
*/
- public function itLosesMessageWhenThereIsNoHandlers()
+ public function itFailsWhenThereIsNoHandlers()
{
$command = new TestCommand("hey");
$this->commandBus->execute($command);
-
- $handler = new TestHandler();
- $this->assertSame(0, $handler->getCounter());
}
/**
@@ -66,7 +63,6 @@ class SimpleCommandBusTest extends \PHPUnit_Framework_TestCase
$handler = new TestHandler();
$this->locator->addHandler($command, $handler);
- $this->commandBus->execute($command);
}
/**
|
Minor SimpleCommandBus test improvement.
- Renamed method to be more accurate
- Removed unneeded execute call
|
diff --git a/lib/tocer/rake/tasks.rb b/lib/tocer/rake/tasks.rb
index <HASH>..<HASH> 100644
--- a/lib/tocer/rake/tasks.rb
+++ b/lib/tocer/rake/tasks.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
require "rake"
+require "tocer"
module Tocer
module Rake
|
Fixed rake task requirements.
Necessary for dependent gems/projects to load these tasks and not hit
runtime issues with gem dependencies not loaded (i.e. `Runner` and
other objects).
|
diff --git a/pythonforandroid/recipes/hostpython3/__init__.py b/pythonforandroid/recipes/hostpython3/__init__.py
index <HASH>..<HASH> 100644
--- a/pythonforandroid/recipes/hostpython3/__init__.py
+++ b/pythonforandroid/recipes/hostpython3/__init__.py
@@ -6,7 +6,7 @@ import sh
class Hostpython3Recipe(Recipe):
- version = '3.7.0'
+ version = '3.7.1'
url = 'https://www.python.org/ftp/python/{version}/Python-{version}.tgz'
name = 'hostpython3'
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
index <HASH>..<HASH> 100644
--- a/pythonforandroid/recipes/python3/__init__.py
+++ b/pythonforandroid/recipes/python3/__init__.py
@@ -11,7 +11,7 @@ import sh
class Python3Recipe(TargetPythonRecipe):
- version = '3.7.0'
+ version = '3.7.1'
url = 'https://www.python.org/ftp/python/{version}/Python-{version}.tgz'
name = 'python3'
|
Updated python3 recipe target version to <I>
|
diff --git a/lib/podio/models/app_store_share.rb b/lib/podio/models/app_store_share.rb
index <HASH>..<HASH> 100644
--- a/lib/podio/models/app_store_share.rb
+++ b/lib/podio/models/app_store_share.rb
@@ -12,18 +12,17 @@ class Podio::AppStoreShare < ActivePodio::Base
property :integration, :string
property :categories, :hash
property :org, :hash
- property :author, :hash
property :author_apps, :integer
property :author_packs, :integer
property :icon, :string
property :icon_id, :integer
- property :comments, :array
property :ratings, :hash
property :user_rating, :array
- property :screenshots, :array
property :video, :string
has_many :children, :class => 'AppStoreShare'
+ has_many :screenshots, :class => 'FileAttachment'
+ has_many :comments, :class => 'Comment'
has_one :author, :class => 'ByLine'
alias_method :id, :share_id
@@ -83,6 +82,10 @@ class Podio::AppStoreShare < ActivePodio::Base
response.status
end
+
+ def find_all_by_reference(ref_type, ref_id)
+ list Podio.connection.get("/app_store/#{ref_type}/#{ref_id}/").body
+ end
end
end
|
Added find_all_by_reference method to AppStoreShare model
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from setuptools import setup, find_packages
setup(
name = "pyapi-gitlab",
- version = "6.1-2",
+ version = "6.1-4",
packages = find_packages(),
install_requires = ['requests', 'markdown'],
# metadata for upload to PyPI
|
upped pypi version to <I>-4
|
diff --git a/config/environments/development.rb b/config/environments/development.rb
index <HASH>..<HASH> 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -27,6 +27,8 @@ Cortex::Application.configure do
# number of complex assets.
config.assets.debug = true
+ config.cache_store = :redis_store, 'redis://localhost:6379/0/cache'
+
if ENV['S3_BUCKET_NAME'].to_s != ''
config.paperclip_defaults = {
:storage => :s3,
|
Use Redis caching in dev
|
diff --git a/prototypes/examples/ipnbdoctest.py b/prototypes/examples/ipnbdoctest.py
index <HASH>..<HASH> 100755
--- a/prototypes/examples/ipnbdoctest.py
+++ b/prototypes/examples/ipnbdoctest.py
@@ -273,7 +273,7 @@ def test_notebook(nb, generate_png_diffs=True):
sys.stdout.write('S')
continue
- skip_test_match = re.match(r'#\s*Skip\s+Doctest', cell.input, re.IGNORECASE)
+ skip_test_match = re.match(r'#\s*skip\s+doctest', cell.input.lower())
if skip_test_match:
sys.stdout.write('S')
continue
|
removed re.IGNORECASE
|
diff --git a/lib/sgr.js b/lib/sgr.js
index <HASH>..<HASH> 100644
--- a/lib/sgr.js
+++ b/lib/sgr.js
@@ -43,14 +43,10 @@ sgr.mods = mods;
, onlyKey = require('es5-ext/object/first-key')
, uniq = require('es5-ext/array/#/uniq.js');
- sgr.toModPair = function (mod) {
- return mod[onlyKey(mod)];
- };
-
var openers = {}, closers = {};
forEach(mods, function (mod) {
- var modPair = sgr.toModPair(mod);
+ var modPair = mod[onlyKey(mod)];
openers[modPair[0]] = modPair;
closers[modPair[1]] = modPair;
|
get rid of modPair fn.
|
diff --git a/java/client/test/org/openqa/selenium/CookieImplementationTest.java b/java/client/test/org/openqa/selenium/CookieImplementationTest.java
index <HASH>..<HASH> 100644
--- a/java/client/test/org/openqa/selenium/CookieImplementationTest.java
+++ b/java/client/test/org/openqa/selenium/CookieImplementationTest.java
@@ -212,7 +212,7 @@ public class CookieImplementationTest extends JUnit4TestBase {
}
@Test
- @Ignore(CHROME)
+ @NotYetImplemented(CHROME)
public void testCannotGetCookiesWithPathDifferingOnlyInCase() {
String cookieName = "fish";
Cookie cookie = new Cookie.Builder(cookieName, "cod").path("/Common/animals").build();
@@ -236,7 +236,7 @@ public class CookieImplementationTest extends JUnit4TestBase {
}
@Test
- @Ignore(CHROME)
+ @NotYetImplemented(CHROME)
public void testShouldBeAbleToAddToADomainWhichIsRelatedToTheCurrentDomain() {
String cookieName = "name";
assertCookieIsNotPresentWithName(cookieName);
@@ -425,7 +425,7 @@ public class CookieImplementationTest extends JUnit4TestBase {
}
@Test
- @Ignore(CHROME)
+ @NotYetImplemented(CHROME)
@Ignore(SAFARI)
public void testRetainsHttpOnlyFlag() {
Cookie addedCookie =
|
[java] Changing @Ignore to @NotYetImplemented for some non-destructive failures
|
diff --git a/lib/generamba/code_generation/content_generator.rb b/lib/generamba/code_generation/content_generator.rb
index <HASH>..<HASH> 100755
--- a/lib/generamba/code_generation/content_generator.rb
+++ b/lib/generamba/code_generation/content_generator.rb
@@ -22,7 +22,9 @@ module Generamba
'name' => code_module.name,
'file_name' => file_name,
'description' => code_module.description,
- 'project_name' => code_module.project_name
+ 'project_name' => code_module.project_name,
+ 'project_targets' => code_module.project_targets,
+ 'test_targets' => code_module.test_targets
}
developer = {
|
Added info about project and test targets to content generator (Issue #<I>)
|
diff --git a/wafer/static/js/edit_schedule.js b/wafer/static/js/edit_schedule.js
index <HASH>..<HASH> 100644
--- a/wafer/static/js/edit_schedule.js
+++ b/wafer/static/js/edit_schedule.js
@@ -75,6 +75,21 @@
var newItem = document.querySelectorAll('[id=scheduleItemnull]')[0];
newItem.id = 'scheduleItem' + scheduleItemId;
+
+ // Add a close button, since we've deleted it if one
+ // existed, and we're not going back through the template
+ var closeButton = document.createElement("BUTTON");
+ closeButton.id = "delete" + scheduleItemId;
+ closeButton.setAttribute("data-id", scheduleItemId);
+ closeButton.classList.add("close");
+ closeButton.setAttribute("aria-label", "Close");
+ var buttonSpan = document.createElement("span");
+ buttonSpan.setAttribute("aria-hidden", true);
+ buttonSpan.innerHTML = "×";
+
+ closeButton.appendChild(buttonSpan);
+ closeButton.addEventListener('click', handleClickDelete, false);
+ newItem.insertBefore(closeButton, newItem.childNodes[0]);
}
|
Plug a close button back onto newly dropped items in the schedule
|
diff --git a/lib/locabulary.rb b/lib/locabulary.rb
index <HASH>..<HASH> 100644
--- a/lib/locabulary.rb
+++ b/lib/locabulary.rb
@@ -3,7 +3,7 @@ require 'json'
# @since 0.1.0
module Locabulary
- VERSION='0.1.4'.freeze
+ VERSION='0.1.5'.freeze
DATA_DIRECTORY = File.expand_path("../../data/", __FILE__).freeze
class RuntimeError < ::RuntimeError
|
Bumping to version <I>
|
diff --git a/guacamole/src/main/frontend/src/app/rest/services/patchService.js b/guacamole/src/main/frontend/src/app/rest/services/patchService.js
index <HASH>..<HASH> 100644
--- a/guacamole/src/main/frontend/src/app/rest/services/patchService.js
+++ b/guacamole/src/main/frontend/src/app/rest/services/patchService.js
@@ -25,17 +25,16 @@ angular.module('rest').factory('patchService', ['$injector',
// Required services
var requestService = $injector.get('requestService');
- var authenticationService = $injector.get('authenticationService');
var cacheService = $injector.get('cacheService');
var service = {};
-
+
/**
* Makes a request to the REST API to get the list of patches, returning
* a promise that provides the array of all applicable patches if
* successful. Each patch is a string of raw HTML with meta information
* describing the patch operation stored within meta tags.
- *
+ *
* @returns {Promise.<String[]>}
* A promise which will resolve with an array of HTML patches upon
* success.
@@ -43,14 +42,14 @@ angular.module('rest').factory('patchService', ['$injector',
service.getPatches = function getPatches() {
// Retrieve all applicable HTML patches
- return authenticationService.request({
+ return requestService({
cache : cacheService.patches,
method : 'GET',
url : 'api/patches'
});
};
-
+
return service;
}]);
|
GUACAMOLE-<I>: Stop including the auth token when making requests to the /api/patches endpoint.
|
diff --git a/store.go b/store.go
index <HASH>..<HASH> 100644
--- a/store.go
+++ b/store.go
@@ -368,7 +368,7 @@ func (i *itemLoc) read(o *Store, withValue bool) (err error) {
if loc.isEmpty() {
return nil
}
- b := make([]byte, loc.Length)
+ b := make([]byte, loc.Length) // TODO: Read less when not withValue.
if _, err := o.file.ReadAt(b, loc.Offset); err != nil {
return err
}
|
TODO comment on withValue optimization.
|
diff --git a/aa_composer.js b/aa_composer.js
index <HASH>..<HASH> 100644
--- a/aa_composer.js
+++ b/aa_composer.js
@@ -853,6 +853,8 @@ function handleTrigger(conn, batch, trigger, stateVars, arrDefinition, address,
}
function handleSuccessfulEmptyResponseUnit() {
+ if (!objStateUpdate)
+ return bounce("no state changes");
executeStateUpdateFormula(null, function (err) {
if (err) {
error_message = undefined; // remove error message like 'no messages after filtering'
@@ -1016,11 +1018,8 @@ function handleTrigger(conn, batch, trigger, stateVars, arrDefinition, address,
if (err)
return bounce(err);
var messages = template.messages;
- if (!messages) {
- error_message = 'no messages';
- console.log(error_message);
- return finish(null);
- }
+ if (!messages)
+ return bounce('no messages');
// this will also filter out the special message that performs the state changes
messages = messages.filter(function (message) { return ('payload' in message && (message.app !== 'payment' || 'outputs' in message.payload)); });
if (messages.length === 0) { // eat the received coins and send no response, state changes are still performed
|
bounce when there would be no messages and no state changes
|
diff --git a/src/Exceptions/Handlers/ExceptionHandler.php b/src/Exceptions/Handlers/ExceptionHandler.php
index <HASH>..<HASH> 100644
--- a/src/Exceptions/Handlers/ExceptionHandler.php
+++ b/src/Exceptions/Handlers/ExceptionHandler.php
@@ -86,6 +86,10 @@ abstract class ExceptionHandler
// Make sure we handle fatal errors too.
register_shutdown_function(function () use ($exceptionHandler) {
+ if (!self::$exceptionTrappingOn) {
+ return;
+ }
+
$error = error_get_last();
if ($error != null) {
|
Disabled shutdown function execution if exception trapping is turned off
|
diff --git a/server/src/main/java/io/atomix/copycat/server/state/ClusterState.java b/server/src/main/java/io/atomix/copycat/server/state/ClusterState.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/io/atomix/copycat/server/state/ClusterState.java
+++ b/server/src/main/java/io/atomix/copycat/server/state/ClusterState.java
@@ -344,9 +344,12 @@ final class ClusterState implements Cluster, AutoCloseable {
} else if (type == Member.Type.ACTIVE) {
context.transition(CopycatServer.State.FOLLOWER);
joinFuture.complete(null);
- } else if (type == Member.Type.PASSIVE) {
+ } else if (type == Member.Type.PASSIVE || type == Member.Type.PROMOTABLE) {
context.transition(CopycatServer.State.PASSIVE);
joinFuture.complete(null);
+ } else if (type == Member.Type.RESERVE) {
+ context.transition(CopycatServer.State.RESERVE);
+ joinFuture.complete(null);
} else {
joinFuture.completeExceptionally(new IllegalStateException("unknown member type: " + type));
}
|
Ensure server transitions to RESERVE upon join.
|
diff --git a/src/webroot/cms/media-library/medialibrary/MedialibraryAction.php b/src/webroot/cms/media-library/medialibrary/MedialibraryAction.php
index <HASH>..<HASH> 100644
--- a/src/webroot/cms/media-library/medialibrary/MedialibraryAction.php
+++ b/src/webroot/cms/media-library/medialibrary/MedialibraryAction.php
@@ -429,9 +429,10 @@ class MedialibraryAction extends MediaLibraryAbstractAction
$folderPath = $this->getRequest()
->getPostValue('folderPath', '');
- $folderPathParts = explode('/', trim(str_replace('\\', '/', $folderPath), '/'));
+ $folderPath = trim(str_replace('\\', '/', $folderPath), '/');
- if ( ! empty($folderPathParts)) {
+ if ( ! empty($folderPath)) {
+ $folderPathParts = explode('/', $folderPath);
foreach ($folderPathParts as $part) {
$folderFound = false;
|
Fixed media library creating folders with empty name
|
diff --git a/liquibase-core/src/main/java/liquibase/integration/commandline/Main.java b/liquibase-core/src/main/java/liquibase/integration/commandline/Main.java
index <HASH>..<HASH> 100644
--- a/liquibase-core/src/main/java/liquibase/integration/commandline/Main.java
+++ b/liquibase-core/src/main/java/liquibase/integration/commandline/Main.java
@@ -1404,7 +1404,7 @@ public class Main {
);
Database database = null;
- if (this.url != null) {
+ if (dbConnectionNeeded(command) && this.url != null) {
database = CommandLineUtils.createDatabaseObject(fileOpener, this.url,
this.username, this.password, this.driver, this.defaultCatalogName, this.defaultSchemaName,
Boolean.parseBoolean(outputDefaultCatalog), Boolean.parseBoolean(outputDefaultSchema),
@@ -1904,6 +1904,10 @@ public class Main {
}
}
+ private boolean dbConnectionNeeded(String command) {
+ return ! COMMANDS.REGISTER_CHANGELOG.equalsIgnoreCase(command);
+ }
+
private boolean isLicenseableCommand(String formatValue) {
return COMMANDS.ROLLBACK_ONE_CHANGE_SET.equalsIgnoreCase(command) ||
COMMANDS.ROLLBACK_ONE_CHANGE_SET_SQL.equalsIgnoreCase(command) ||
|
We do not need to connect to the DB for registerChangeLog even if there is a URL specified LB-<I>
|
diff --git a/examples/module-native/test.js b/examples/module-native/test.js
index <HASH>..<HASH> 100644
--- a/examples/module-native/test.js
+++ b/examples/module-native/test.js
@@ -1,4 +1,4 @@
-var dockerLambda = require('..')
+var dockerLambda = require('../..')
var match = dockerLambda({event: {password: 'lambda-docker'}})
|
Fix path for module-native example
|
diff --git a/plugins/homepage/server/__init__.py b/plugins/homepage/server/__init__.py
index <HASH>..<HASH> 100644
--- a/plugins/homepage/server/__init__.py
+++ b/plugins/homepage/server/__init__.py
@@ -54,7 +54,7 @@ def getOrCreateAssetsFolder():
collection = ModelImporter.model('collection').createCollection(
NAME, public=False, reuseExisting=True)
folder = ModelImporter.model('folder').createFolder(
- collection, NAME, parentType='collection', public=False,
+ collection, NAME, parentType='collection', public=True,
reuseExisting=True)
return folder
diff --git a/plugins/homepage/web_client/js/ConfigView.js b/plugins/homepage/web_client/js/ConfigView.js
index <HASH>..<HASH> 100644
--- a/plugins/homepage/web_client/js/ConfigView.js
+++ b/plugins/homepage/web_client/js/ConfigView.js
@@ -25,7 +25,7 @@ girder.views.homepage_ConfigView = girder.View.extend({
parent: this.folder,
enableUploads: true,
maxUploadSize: 1024 * 1024 * 10,
- allowedExtensions: ['png', 'jpeg', 'jpg', 'gif'],
+ allowedExtensions: ['png', 'jpeg', 'jpg', 'gif']
});
this.render();
this.editor.val(resp['homepage.markdown']);
|
Public folder. Remove trailing comma.
|
diff --git a/fusionbox/fabric_helpers.py b/fusionbox/fabric_helpers.py
index <HASH>..<HASH> 100644
--- a/fusionbox/fabric_helpers.py
+++ b/fusionbox/fabric_helpers.py
@@ -39,7 +39,7 @@ def update_git(branch):
try:
loc = tempfile.mkdtemp()
put(StringIO(local('git rev-parse %s' % branch, capture=True) + "\n"), 'static/.git_version.txt', mode=0775)
- local("git archive %s | tar xf - -C %s" % (branch, loc))
+ local("cd `git rev-parse --show-toplevel` && git archive %s | tar xf - -C %s" % (branch, loc))
local("chmod -R g+rwX %s" % (loc)) # force group permissions
# env.cwd is documented as private, but I'm not sure how else to do this
with settings(warn_only=True):
|
cd to git root before archiving, the whole project always needs to be updated
|
diff --git a/storage/storagepb/kv.pb.go b/storage/storagepb/kv.pb.go
index <HASH>..<HASH> 100644
--- a/storage/storagepb/kv.pb.go
+++ b/storage/storagepb/kv.pb.go
@@ -68,8 +68,9 @@ type Event struct {
// a put event contains the current key-value
// a delete/expire event contains the previous
// key-value
- Kv *KeyValue `protobuf:"bytes,2,opt,name=kv" json:"kv,omitempty"`
- WatchID int64 `protobuf:"varint,3,opt,name=watchID,proto3" json:"watchID,omitempty"`
+ Kv *KeyValue `protobuf:"bytes,2,opt,name=kv" json:"kv,omitempty"`
+ // watchID is the ID of watching this event is sent to.
+ WatchID int64 `protobuf:"varint,3,opt,name=watchID,proto3" json:"watchID,omitempty"`
}
func (m *Event) Reset() { *m = Event{} }
|
storagepb: minor updates from genproto
I ran genproto with the most recent protocol buffer
and it adds one line of missing comment.
|
diff --git a/lib/rake/file_utils.rb b/lib/rake/file_utils.rb
index <HASH>..<HASH> 100644
--- a/lib/rake/file_utils.rb
+++ b/lib/rake/file_utils.rb
@@ -3,7 +3,7 @@
# added to the FileUtils utility functions.
#
module FileUtils
- # Path to the currently running ruby.
+ # Path to the currently running Ruby program
RUBY = File.join(
Config::CONFIG['bindir'],
Config::CONFIG['ruby_install_name'] + Config::CONFIG['EXEEXT']).
|
Added comment about the RUBY constant
|
diff --git a/client/index.js b/client/index.js
index <HASH>..<HASH> 100644
--- a/client/index.js
+++ b/client/index.js
@@ -5,7 +5,7 @@
const url = require('url');
const stripAnsi = require('strip-ansi');
-const log = require('loglevel');
+const log = require('loglevel').getLogger('webpack-dev-server');
const socket = require('./socket');
const overlay = require('./overlay');
|
Fixes issue #<I> by switching to a named logger (#<I>)
|
diff --git a/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java b/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java
+++ b/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java
@@ -4,6 +4,13 @@ import com.typesafe.config.ConfigOrigin;
import com.typesafe.config.ConfigResolveOptions;
import com.typesafe.config.ConfigValue;
+/**
+ *
+ * Trying very hard to avoid a parent reference in config values; when you have
+ * a tree like this, the availability of parent() tends to result in a lot of
+ * improperly-factored and non-modular code. Please don't add parent().
+ *
+ */
abstract class AbstractConfigValue implements ConfigValue {
final private ConfigOrigin origin;
|
add comment about not having ConfigValue.parent()
|
diff --git a/ca/config.go b/ca/config.go
index <HASH>..<HASH> 100644
--- a/ca/config.go
+++ b/ca/config.go
@@ -29,13 +29,13 @@ const (
)
const (
- rootCN = "cluster-ca"
+ rootCN = "swarm-ca"
// ManagerRole represents the Manager node type, and is used for authorization to endpoints
- ManagerRole = "cluster-manager"
+ ManagerRole = "swarm-manager"
// AgentRole represents the Agent node type, and is used for authorization to endpoints
- AgentRole = "cluster-worker"
+ AgentRole = "swarm-worker"
// CARole represents the CA node type, and is used for clients attempting to get new certificates issued
- CARole = "cluster-ca"
+ CARole = "swarm-ca"
)
// AgentSecurityConfig is used to configure the security params of the agents
diff --git a/ca/server.go b/ca/server.go
index <HASH>..<HASH> 100644
--- a/ca/server.go
+++ b/ca/server.go
@@ -218,7 +218,7 @@ func (s *Server) evaluateAndSignCert(ctx context.Context, rCertificate *api.Regi
// FIXME(aaronl): Right now, this automatically signs any pending certificate. We need to
// add more flexible logic on acceptance modes.
- if rCertificate.Role == AgentRole && rCertificate.Status.State != api.IssuanceStatePending {
+ if rCertificate.Status.State != api.IssuanceStatePending {
return
}
|
Changing cluster to swarm. For the third time
|
diff --git a/lib/ridgepole/version.rb b/lib/ridgepole/version.rb
index <HASH>..<HASH> 100644
--- a/lib/ridgepole/version.rb
+++ b/lib/ridgepole/version.rb
@@ -1,3 +1,3 @@
module Ridgepole
- VERSION = '0.7.0.beta2'
+ VERSION = '0.7.0.beta3'
end
|
Bump up version [ci skip]
|
diff --git a/lib/metacrunch/elasticsearch/index_creator.rb b/lib/metacrunch/elasticsearch/index_creator.rb
index <HASH>..<HASH> 100644
--- a/lib/metacrunch/elasticsearch/index_creator.rb
+++ b/lib/metacrunch/elasticsearch/index_creator.rb
@@ -14,7 +14,7 @@ class Metacrunch::Elasticsearch::IndexCreator < Metacrunch::Processor
def initialize(options = {})
(@client_args = options).deep_symbolize_keys!
- extract_options!(@client_args, :_client_options_, :default_mapping, :delete_existing_index, :logger)
+ extract_options!(@client_args, :_client_options_, :default_mapping, :delete_existing_index, :logger, :number_of_shards, :number_of_replicas)
raise ArgumentError.new("You have to supply an index name!") if @client_args[:index].blank?
end
@@ -33,7 +33,15 @@ class Metacrunch::Elasticsearch::IndexCreator < Metacrunch::Processor
end
end
- client.indices.create(@client_args)
+ client.indices.create(@client_args.merge(
+ {
+ body: {
+ number_of_shards: @number_of_shards,
+ number_of_replicas: @number_of_replicas
+ }.compact
+ }
+ ))
+
log_index_created(logger, @client_args[:index], client) if logger
if @default_mapping
|
Added number of shards/replicas option to index creator
|
diff --git a/generate.js b/generate.js
index <HASH>..<HASH> 100755
--- a/generate.js
+++ b/generate.js
@@ -5,7 +5,6 @@ set("-e");
cd(`${__dirname}`);
-const fs = require("fs");
const package = require("./package.json");
const thisFolder = $("pwd");
const specFilename = `spec-v1-swagger.json`;
@@ -30,7 +29,7 @@ eval(
swaggerConfig = require(swaggerConfigFilename);
swaggerConfig.npmName = package.name;
swaggerConfig.npmVersion = package.version;
-fs.writeFileSync(swaggerConfigFilename, JSON.stringify(swaggerConfig, null, 2));
+writeFile(swaggerConfigFilename, JSON.stringify(swaggerConfig, null, 2));
/// Share the current folder with docker, and then run the generator, pointing to the given template
eval(`docker run --rm -v ${
|
Use jBash writeFile helper
|
diff --git a/spec/platform/helpers/extensions/test.rb b/spec/platform/helpers/extensions/test.rb
index <HASH>..<HASH> 100644
--- a/spec/platform/helpers/extensions/test.rb
+++ b/spec/platform/helpers/extensions/test.rb
@@ -17,8 +17,4 @@ ronin_extension do
:method
end
- def run_method
- @var = :running
- end
-
end
|
Removed an unused method from the test extension.
|
diff --git a/tests/TestCase.php b/tests/TestCase.php
index <HASH>..<HASH> 100755
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -196,6 +196,13 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
/**
* @return string
*/
+ public static function wsdlYandexDirectApiLivePath()
+ {
+ return __DIR__ . '/resources/directapi/live.wsdl';
+ }
+ /**
+ * @return string
+ */
public static function wsdlDocDataPaymentsPath()
{
return __DIR__ . '/resources/docdatapayments/1_3.wsdl';
|
issue #<I> - add utility method for direct api live wsdl
|
diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index <HASH>..<HASH> 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -1376,10 +1376,25 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
var t = this,
prefix = t.o.prefix,
fullscreenCssClass = prefix + 'fullscreen',
- isFullscreen;
+ fullscreenPlaceholderClass = fullscreenCssClass + '-placeholder',
+ isFullscreen,
+ editorHeight = t.$box.outerHeight();
t.$box.toggleClass(fullscreenCssClass);
isFullscreen = t.$box.hasClass(fullscreenCssClass);
+
+ if (isFullscreen) {
+ t.$box.before(
+ $('<div/>', {
+ class: fullscreenPlaceholderClass
+ }).css({
+ height: editorHeight + 'px'
+ })
+ );
+ } else {
+ $('.' + fullscreenPlaceholderClass).remove();
+ }
+
$('body').toggleClass(prefix + 'body-fullscreen', isFullscreen);
$(window).trigger('scroll');
t.$c.trigger('tbw' + (isFullscreen ? 'open' : 'close') + 'fullscreen');
|
fix: add a placeholder while fullscreen to keep editor space
fix #<I>
|
diff --git a/src/detectSeries.js b/src/detectSeries.js
index <HASH>..<HASH> 100644
--- a/src/detectSeries.js
+++ b/src/detectSeries.js
@@ -5,7 +5,7 @@ export default function detectSeries(collection, predicate, notFound = undefined
return collection.reduce(
(promise, item, index, collection) => {
return promise.then(() => {
- return tryFn(predicate ,item, index, collection)
+ return tryFn(predicate, item, index, collection)
.then((result) => {
if (result === true) {
return Promise.reject(new PromiseBreak(item));
|
Fix lint issue in detectSeries
|
diff --git a/core-bundle/contao/drivers/DC_Table.php b/core-bundle/contao/drivers/DC_Table.php
index <HASH>..<HASH> 100644
--- a/core-bundle/contao/drivers/DC_Table.php
+++ b/core-bundle/contao/drivers/DC_Table.php
@@ -15,7 +15,7 @@ namespace Contao;
* Provide methods to modify the database.
*
* @author Leo Feyer <https://github.com/leofeyer>
- * @author Andreas Schempp <https://github.com/schempp>
+ * @author Andreas Schempp <https://github.com/aschempp>
*/
class DC_Table extends \DataContainer implements \listable, \editable
{
diff --git a/core-bundle/contao/elements/ContentGallery.php b/core-bundle/contao/elements/ContentGallery.php
index <HASH>..<HASH> 100644
--- a/core-bundle/contao/elements/ContentGallery.php
+++ b/core-bundle/contao/elements/ContentGallery.php
@@ -286,9 +286,6 @@ class ContentGallery extends \ContentElement
// Do not index or cache the page if the page number is outside the range
if ($page < 1 || $page > max(ceil($total/$this->perPage), 1))
{
- /** @var \PageModel $objPage */
- global $objPage;
-
$objPage->noSearch = 1;
$objPage->cache = 0;
|
[Core] Fixed two minor issues found by @aschempp
|
diff --git a/src/Shell/Task/ExtractTask.php b/src/Shell/Task/ExtractTask.php
index <HASH>..<HASH> 100644
--- a/src/Shell/Task/ExtractTask.php
+++ b/src/Shell/Task/ExtractTask.php
@@ -522,7 +522,9 @@ class ExtractTask extends Shell
$occurrences = [];
foreach ($files as $file => $lines) {
$lines = array_unique($lines);
- $occurrences[] = $file . ':' . implode(';', $lines);
+ foreach ($lines as $line) {
+ $occurrences[] = $file . ':' . $line;
+ }
}
$occurrences = implode("\n#: ", $occurrences);
$header = '';
|
Improve generated .pot references compatibility with editors
Most PO editors do not support references like File.php:<I>;<I>, each line must be listed separately as File.php:<I> File.php:<I>.
|
diff --git a/src/tagadvance/gilligan/text/Ordinal.php b/src/tagadvance/gilligan/text/Ordinal.php
index <HASH>..<HASH> 100644
--- a/src/tagadvance/gilligan/text/Ordinal.php
+++ b/src/tagadvance/gilligan/text/Ordinal.php
@@ -33,7 +33,7 @@ class Ordinal {
self::RD
];
$index = $n % 10;
- return isset ( $suffixes [$index] ) ? $suffixes [$index] : self::TH;
+ return $suffixes [$index] ?? self::TH;
}
}
\ No newline at end of file
|
replace ternary operator with null coalesce operator
|
diff --git a/cherrypy/lib/cptools.py b/cherrypy/lib/cptools.py
index <HASH>..<HASH> 100644
--- a/cherrypy/lib/cptools.py
+++ b/cherrypy/lib/cptools.py
@@ -370,7 +370,8 @@ Message: %(error_msg)s
if path.endswith('login_screen'):
if self.debug:
cherrypy.log('routing %r to login_screen' % path, 'TOOLS.SESSAUTH')
- return self.login_screen(**request.params)
+ response.body = self.login_screen()
+ return True
elif path.endswith('do_login'):
if request.method != 'POST':
response.headers['Allow'] = "POST"
|
cptools.SessionAuth: fix login_screen page handler
The login_screen page handler erroneously returned the formatted HTML page,
which was simply interpreted as a boolean that controls whether the call
to the controller function was suppressed or not.
Set the response.body instead and return a literal True that suppresses the
call to the page handler.
|
diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go
index <HASH>..<HASH> 100644
--- a/pkg/kubelet/rkt/rkt.go
+++ b/pkg/kubelet/rkt/rkt.go
@@ -998,6 +998,7 @@ func (r *Runtime) GetPods(all bool) ([]*kubecontainer.Pod, error) {
}
pods := make(map[types.UID]*kubecontainer.Pod)
+ var podIDs []types.UID
for _, pod := range listResp.Pods {
pod, err := r.convertRktPod(pod)
if err != nil {
@@ -1009,16 +1010,17 @@ func (r *Runtime) GetPods(all bool) ([]*kubecontainer.Pod, error) {
oldPod, found := pods[pod.ID]
if !found {
pods[pod.ID] = pod
+ podIDs = append(podIDs, pod.ID)
continue
}
oldPod.Containers = append(oldPod.Containers, pod.Containers...)
}
- // Convert map to list.
+ // Convert map to list, using the consistent order from the podIDs array.
var result []*kubecontainer.Pod
- for _, p := range pods {
- result = append(result, p)
+ for _, id := range podIDs {
+ result = append(result, pods[id])
}
return result, nil
|
Fix rkt GetPods() order
Use an array to store the pod IDs and use that to build the pod array with consistent ordering,
instead of map ordering, which is random and causes test flakes.
|
diff --git a/packages/core/renderers/renderer-hyperhtml.js b/packages/core/renderers/renderer-hyperhtml.js
index <HASH>..<HASH> 100644
--- a/packages/core/renderers/renderer-hyperhtml.js
+++ b/packages/core/renderers/renderer-hyperhtml.js
@@ -34,11 +34,13 @@ export function BoltComponent(Base = HTMLElement) {
// this.innerHTML = JSON.parse(this.dataset.ssrContent);
// }
this._checkSlots();
- super.connectedCallback && super.connectedCallback();
+ this.connecting && this.connecting();
+ this.connected && this.connected();
}
disconnectedCallback() {
- super.disconnectedCallback && super.disconnectedCallback();
+ this.disconnecting && this.disconnecting();
+ this.disconnected && this.disconnected();
}
addStyles(stylesheet) {
|
fix: updating hyperhtml renderer to prevent extra connectedCallbacks from running unexpectedly
|
diff --git a/tests/ResultTest.php b/tests/ResultTest.php
index <HASH>..<HASH> 100644
--- a/tests/ResultTest.php
+++ b/tests/ResultTest.php
@@ -91,7 +91,7 @@ class ResultTest extends TestCase{
* @expectedExceptionMessage invalid callback
*/
public function testEachInvalidCallback(){
- $this->result->__each('foo');
+ $this->result->__each([$this, 'foo']);
}
public function testMerge(){
|
:octocat: WTB consistent behaviour of the "callable" type hint
|
diff --git a/tests/UriTemplateTest.php b/tests/UriTemplateTest.php
index <HASH>..<HASH> 100644
--- a/tests/UriTemplateTest.php
+++ b/tests/UriTemplateTest.php
@@ -119,7 +119,7 @@ class UriTemplateTest extends \PHPUnit_Framework_TestCase
*/
public function testExpandsUriTemplates($template, $expansion, $params)
{
- $uri = new UriTemplate($template);
+ $uri = new UriTemplate();
$this->assertEquals($expansion, $uri->expand($template, $params));
}
@@ -162,7 +162,7 @@ class UriTemplateTest extends \PHPUnit_Framework_TestCase
*/
public function testParsesExpressions($exp, $data)
{
- $template = new UriTemplate($exp);
+ $template = new UriTemplate();
// Access the config object
$class = new \ReflectionClass($template);
|
Fix UriTemplate does not have constructor args
|
diff --git a/src/exceptions/Handler.php b/src/exceptions/Handler.php
index <HASH>..<HASH> 100644
--- a/src/exceptions/Handler.php
+++ b/src/exceptions/Handler.php
@@ -25,8 +25,12 @@ class Handler {
*/
public static function error( $severity, $message, $file, $line ) {
+ // Latest Twig raises a warning when accessing missing cached views - we can ignore it
+ if( preg_match('/filemtime/', $message) )
+ return;
+
// if the error was a type hint failure then throw an InvalidArgumentException instead
- if( preg_match('/^Argument (\d+) passed to ([\w\\\\]+)::(\w+)\(\) must be an instance of ([\w\\\\]+), ([\w\\\\]+) given, called in ([\w\s\.\/_-]+) on line (\d+)/', $message, $m) )
+ elseif( preg_match('/^Argument (\d+) passed to ([\w\\\\]+)::(\w+)\(\) must be an instance of ([\w\\\\]+), ([\w\\\\]+) given, called in ([\w\s\.\/_-]+) on line (\d+)/', $message, $m) )
throw new \InvalidArgumentException("Argument {$m[1]} to {$m[2]}::{$m[3]}() should be an instance of {$m[4]}, {$m[5]} given", $severity, new \ErrorException($message, 0, $severity, $m[6], $m[7]));
// convert the error to an exception
|
Ignore stupid Twig warnings
|
diff --git a/lib/fast-tcpn/tcpn.rb b/lib/fast-tcpn/tcpn.rb
index <HASH>..<HASH> 100644
--- a/lib/fast-tcpn/tcpn.rb
+++ b/lib/fast-tcpn/tcpn.rb
@@ -142,14 +142,8 @@ module FastTCPN
end
def add_marking_for(name, m)
- if m.kind_of? Hash
- token = m[:val]
- timestamp = m[:ts]
- find_place(name).add token, timestamp
- else
- token = m
- find_place(name).add token
- end
+ token = m
+ find_place(name).add token
end
private
|
Removed obsolete Hash handing form TCPN#add_marking_for
|
diff --git a/src/Tonic/Request.php b/src/Tonic/Request.php
index <HASH>..<HASH> 100644
--- a/src/Tonic/Request.php
+++ b/src/Tonic/Request.php
@@ -98,6 +98,8 @@ class Request {
$uri = $options['uri'];
} elseif (isset($_SERVER['REDIRECT_URL']) && isset($_SERVER['SCRIPT_NAME'])) { // use redirection URL from Apache environment
$uri = substr($_SERVER['REDIRECT_URL'], strlen(dirname($_SERVER['SCRIPT_NAME'])));
+ } elseif (isset($_SERVER['REQUEST_URI']) && isset($_SERVER['SCRIPT_NAME'])) { // use redirection URL from Apache environment
+ $uri = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
} elseif (isset($_SERVER['QUERY_STRING'])) { // use querystring if not using redirection
if ($pos = strpos($_SERVER['QUERY_STRING'], '?')) {
$uri = substr($_SERVER['QUERY_STRING'], 0, $pos);
|
Use REQUEST_URI to get URI also
|
diff --git a/src/js/color.js b/src/js/color.js
index <HASH>..<HASH> 100644
--- a/src/js/color.js
+++ b/src/js/color.js
@@ -209,8 +209,8 @@
l: 1,
a: 1
};
- if (r.hasOwnProperty('s')) hsl.g = clamp(number(r.s), 255);
- if (r.hasOwnProperty('l')) hsl.b = clamp(number(r.l), 255);
+ if (r.hasOwnProperty('s')) hsl.s = clamp(number(r.s), 1);
+ if (r.hasOwnProperty('l')) hsl.l = clamp(number(r.l), 1);
if (r.hasOwnProperty('a')) hsl.a = clamp(number(r.a), 1);
this.rgb(hslToRgb(hsl));
@@ -492,7 +492,7 @@
r: hue(h + 1 / 3) * 255,
g: hue(h) * 255,
b: hue(h - 1 / 3) * 255,
- a: 1
+ a: a
};
return r;
|
* fix color constructor with hsl object.
|
diff --git a/scripts/homestead.rb b/scripts/homestead.rb
index <HASH>..<HASH> 100644
--- a/scripts/homestead.rb
+++ b/scripts/homestead.rb
@@ -91,7 +91,10 @@ class Homestead
# Register All Of The Configured Shared Folders
if settings.include? 'folders'
settings["folders"].each do |folder|
- mount_opts = folder["type"] == "nfs" ? ['actimeo=1'] : []
+ mount_opts = []
+ if (folder["type"] == "nfs")
+ mount_opts = folder["mount_opts"] ? folder["mount_opts"] : ['actimeo=1']
+ end
config.vm.synced_folder folder["map"], folder["to"], type: folder["type"] ||= nil, mount_options: mount_opts
end
end
|
Adding the option of setting mount_opts on Homestead.yaml
|
diff --git a/pretrainedmodels/models/utils.py b/pretrainedmodels/models/utils.py
index <HASH>..<HASH> 100644
--- a/pretrainedmodels/models/utils.py
+++ b/pretrainedmodels/models/utils.py
@@ -4,7 +4,7 @@ from .resnext import pretrained_settings as resnext_settings
from .inceptionv4 import pretrained_settings as inceptionv4_settings
from .inceptionresnetv2 import pretrained_settings as inceptionresnetv2_settings
from .torchvision_models import pretrained_settings as torchvision_models_settings
-from .nasnet_mobile import pretrained_settings as nasnet_settings
+from .nasnet_mobile import pretrained_settings as nasnet_mobile_settings
from .nasnet import pretrained_settings as nasnet_settings
from .dpn import pretrained_settings as dpn_settings
from .xception import pretrained_settings as xception_settings
@@ -17,6 +17,7 @@ all_settings = [
inceptionv4_settings,
inceptionresnetv2_settings,
torchvision_models_settings,
+ nasnet_mobile_settings,
nasnet_settings,
dpn_settings,
xception_settings,
|
bugfix: nasnet mobile was not listed in pretrainedmodels.model_names
|
diff --git a/steamfiles/appinfo.py b/steamfiles/appinfo.py
index <HASH>..<HASH> 100644
--- a/steamfiles/appinfo.py
+++ b/steamfiles/appinfo.py
@@ -179,6 +179,8 @@ class AppinfoDecoder:
return byte
def read_string(self):
+ # This method is pretty fast, provided we iterate over a memoryview.
+ # It's also easier to read then the most performant ones, which is more important.
for index, value in enumerate(self.data[self.offset:]):
# NUL-byte – a string's end
if value != 0:
|
Add a bit of an explanation to a string-parsing function
|
diff --git a/lib/agent/actions/lock/index.js b/lib/agent/actions/lock/index.js
index <HASH>..<HASH> 100644
--- a/lib/agent/actions/lock/index.js
+++ b/lib/agent/actions/lock/index.js
@@ -78,7 +78,7 @@ function open(password, cb) {
child = lock;
child.stdout.on('data', function(data) {
- if (child.impersonating && data.toString().match(/PID:? (\d+)/)) {
+ if (child && child.impersonating && data.toString().match(/PID:? (\d+)/)) {
child.impersonated_pid = data.toString().match(/PID:? (\d+)/)[1];
} else if (emitter && data.toString().match(/invalid password/i)) {
diff --git a/lib/system/index.js b/lib/system/index.js
index <HASH>..<HASH> 100644
--- a/lib/system/index.js
+++ b/lib/system/index.js
@@ -107,6 +107,8 @@ var as_logged_user = function(type, bin, args, opts, cb) {
if (typeof opts == 'function') {
var cb = opts;
var opts = {};
+ } else if (!opts) {
+ var opts = {};
}
system.get_logged_user(function(err, user) {
|
Two small validations in lock and system libs.
|
diff --git a/src/Processes/Model.php b/src/Processes/Model.php
index <HASH>..<HASH> 100644
--- a/src/Processes/Model.php
+++ b/src/Processes/Model.php
@@ -35,7 +35,7 @@ class Model
public static function set($class , $table)
{
$txt = "<?php\n\nuse Vinala\Kernel\MVC\ORM;\n\n";
- $txt.="class $class extends ORM\n{\n\t/**\n\t* Name of the DataTable\n\t*/\n\tpublic static ".'$table'."='$table';\n\n}";
+ $txt.="class $class extends ORM\n{\n\t/**\n\t* Name of the DataTable\n\t*/\n\tpublic static ".'$_table'."='$table';\n\n}";
// $txt.="class $class extends ORM\n{\n\t//Name of the table in database\n\tpublic static ".'$table'."='$table';\n\tprotected static ".'$foreignKeys=array();'."\n\n}";
//
return $txt;
|
update table prop name to deal with new orm names
|
diff --git a/buildprocess/configureWebpack.js b/buildprocess/configureWebpack.js
index <HASH>..<HASH> 100644
--- a/buildprocess/configureWebpack.js
+++ b/buildprocess/configureWebpack.js
@@ -183,7 +183,7 @@ function configureWebpack(terriaJSBasePath, config, devMode, hot) {
req.url.indexOf('/convert') < 0 &&
req.url.indexOf('/proxyabledomains') < 0 &&
req.url.indexOf('/errorpage') < 0 &&
- req.url.indexOf('/initfile') < 0) {
+ req.url.indexOf('/init') < 0) {
return req.originalUrl;
}
}
|
Make webpack server pass /init to normal server.
|
diff --git a/tests/test_localfs.py b/tests/test_localfs.py
index <HASH>..<HASH> 100644
--- a/tests/test_localfs.py
+++ b/tests/test_localfs.py
@@ -8,6 +8,7 @@ import stat
import sys
from unittest import TestCase
from abl.vpath.base import URI
+from .common import mac_only
#-------------------------------------------------------------------------------
@@ -50,6 +51,7 @@ class TestLocalFSInfo(TestCase):
self.assert_(p.info().mtime.timetuple()[:6] >= now.timetuple()[:6])
+ @mac_only
def test_info_on_symlinks(self):
a_file = URI("test.txt")
a_link = URI("test_link")
|
Only run symlink test on Mac OSX
Linux doesn't provide lchmod and we don't want to fail silently either.
|
diff --git a/lib/grape_entity/entity.rb b/lib/grape_entity/entity.rb
index <HASH>..<HASH> 100644
--- a/lib/grape_entity/entity.rb
+++ b/lib/grape_entity/entity.rb
@@ -153,7 +153,7 @@ module Grape
#
# @example as: a proc or lambda
#
- # object = OpenStruct(awesomness: 'awesome_key', awesome: 'not-my-key', other: 'other-key' )
+ # object = OpenStruct(awesomeness: 'awesome_key', awesome: 'not-my-key', other: 'other-key' )
#
# class MyEntity < Grape::Entity
# expose :awesome, as: proc { object.awesomeness }
|
Fix typo in comments in lib/grape_entity/entity.rb (#<I>)
|
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1614,11 +1614,6 @@ MSG
self
end
- def initialize_clone(other)
- super
- @persisted = other.persisted?
- end
-
# Returns +true+ if the record is read only. Records loaded through joins with piggy-back
# attributes will be marked as read only since they cannot be saved.
def readonly?
|
initialize_clone can go away
|
diff --git a/config/Netcraft.php b/config/Netcraft.php
index <HASH>..<HASH> 100644
--- a/config/Netcraft.php
+++ b/config/Netcraft.php
@@ -26,6 +26,7 @@ return [
'Source',
'Date',
'Domain',
+ 'Ip',
],
],
@@ -39,6 +40,7 @@ return [
'Source',
'Date',
'Download-Link',
+ 'Ip',
],
],
],
diff --git a/src/Netcraft.php b/src/Netcraft.php
index <HASH>..<HASH> 100644
--- a/src/Netcraft.php
+++ b/src/Netcraft.php
@@ -136,4 +136,3 @@ class Netcraft extends Parser
return $this->success();
}
}
-
|
remove extra newline and protect IP field
|
diff --git a/lib/consts/consts.go b/lib/consts/consts.go
index <HASH>..<HASH> 100644
--- a/lib/consts/consts.go
+++ b/lib/consts/consts.go
@@ -8,7 +8,7 @@ import (
)
// Version contains the current semantic version of k6.
-var Version = "0.26.1" //nolint:gochecknoglobals
+var Version = "0.26.2" //nolint:gochecknoglobals
// VersionDetails can be set externally as part of the build process
var VersionDetails = "" // nolint:gochecknoglobals
|
Actually bump the version to <I>
|
diff --git a/Generator/Generator.php b/Generator/Generator.php
index <HASH>..<HASH> 100644
--- a/Generator/Generator.php
+++ b/Generator/Generator.php
@@ -4,7 +4,7 @@ namespace Admingenerator\GeneratorBundle\Generator;
use Symfony\Component\Finder\Finder;
use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelInterface;
use Admingenerator\GeneratorBundle\Validator\ValidatorInterface;
use Admingenerator\GeneratorBundle\Builder\Generator as AdminGenerator;
use Doctrine\Common\Cache as DoctrineCache;
@@ -78,7 +78,7 @@ abstract class Generator implements GeneratorInterface
protected $twig;
/**
- * @var HttpKernelInterface
+ * @var KernelInterface
*/
protected $kernel;
@@ -292,10 +292,10 @@ abstract class Generator implements GeneratorInterface
}
/**
- * @param HttpKernelInterface $kernel
+ * @param KernelInterface $kernel
* @return void
*/
- public function setKernel(HttpKernelInterface $kernel)
+ public function setKernel(KernelInterface $kernel)
{
$this->kernel = $kernel;
}
|
Update Generator.php
Fix scrutinizer issues
|
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index <HASH>..<HASH> 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -515,7 +515,7 @@ define({
"EXTENSION_NOT_INSTALLED" : "Couldn't remove extension {0} because it wasn't installed.",
"NO_EXTENSIONS" : "No extensions installed yet.<br>Click on the Available tab above to get started.",
"NO_EXTENSION_MATCHES" : "No extensions match your search.",
- "REGISTRY_SANITY_CHECK_WARNING" : "NOTE: These extensions may come from different authors than Brackets itself. Be cautious when installing extensions from an unknown source.",
+ "REGISTRY_SANITY_CHECK_WARNING" : "NOTE: These extensions may come from different authors than {APP_NAME} itself. Extensions are not reviewed and have full local privileges. Be cautious when installing extensions from an unknown source.",
"EXTENSIONS_INSTALLED_TITLE" : "Installed",
"EXTENSIONS_AVAILABLE_TITLE" : "Available",
"EXTENSIONS_UPDATES_TITLE" : "Updates",
|
Updated notice per comments and review.
|
diff --git a/glue/ligolw/lsctables.py b/glue/ligolw/lsctables.py
index <HASH>..<HASH> 100644
--- a/glue/ligolw/lsctables.py
+++ b/glue/ligolw/lsctables.py
@@ -536,7 +536,7 @@ class ExperimentTable(table.Table):
"experiment_id": "ilwd:char",
"search_group": "lstring",
"search": "lstring",
- "lars_id": "ilwd:char",
+ "lars_id": "lstring",
"instruments": "lstring",
"gps_start_time": "int_4s",
"gps_end_time": "int_4s",
|
Changed lars_id in experiment table to lstring.
|
diff --git a/superset/config.py b/superset/config.py
index <HASH>..<HASH> 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -656,7 +656,7 @@ DISPLAY_MAX_ROW = 10000
# Default row limit for SQL Lab queries. Is overridden by setting a new limit in
# the SQL Lab UI
-DEFAULT_SQLLAB_LIMIT = 10000
+DEFAULT_SQLLAB_LIMIT = 1000
# Maximum number of tables/views displayed in the dropdown window in SQL Lab.
MAX_TABLE_NAMES = 3000
|
fix: revert DEFAULT_SQLLAB_LIMIT to default (#<I>)
|
diff --git a/lib/origami/graphics/xobject.rb b/lib/origami/graphics/xobject.rb
index <HASH>..<HASH> 100644
--- a/lib/origami/graphics/xobject.rb
+++ b/lib/origami/graphics/xobject.rb
@@ -666,15 +666,15 @@ module Origami
raise ArgumentError, "Missing file format" if format.nil?
case format.downcase
- when 'jpg', 'jpeg', 'jpe', 'jif', 'jfif', 'jfi'
+ when '.jpg', 'jpeg', '.jpe', '.jif', '.jfif', '.jfi'
image.setFilter :DCTDecode
image.encoded_data = data
- when 'jp2','jpx','j2k','jpf','jpm','mj2'
+ when '.jp2','.jpx','.j2k','.jpf','.jpm','.mj2'
image.setFilter :JPXDecode
image.encoded_data = data
- when 'jb2', 'jbig', 'jbig2'
+ when '.jb2', '.jbig', '.jbig2'
image.setFilter :JBIG2Decode
image.encoded_data = data
else
|
graphics/xobject: fix extensions in from_image_file
|
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index <HASH>..<HASH> 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -23,12 +23,12 @@ module Jekyll
self.pygments = config['pygments']
self.baseurl = config['baseurl']
self.permalink_style = config['permalink'].to_sym
- self.exclude = config['exclude'] || []
- self.include = config['include'] || []
+ self.exclude = config['exclude']
+ self.include = config['include']
self.future = config['future']
- self.show_drafts = config['show_drafts'] || nil
- self.limit_posts = config['limit_posts'] || nil
- self.keep_files = config['keep_files'] || []
+ self.show_drafts = config['show_drafts']
+ self.limit_posts = config['limit_posts']
+ self.keep_files = config['keep_files']
self.reset
self.setup
|
Remove short-circuits from Site
|
diff --git a/src/ef-version.py b/src/ef-version.py
index <HASH>..<HASH> 100755
--- a/src/ef-version.py
+++ b/src/ef-version.py
@@ -597,7 +597,7 @@ def cmd_set(context):
print("would set key: {} with value: {} {} {} {} {}".format(s3_key, context.value, context.build_number, context.commit_hash, context.location, s3_version_status))
else:
context.aws_client("s3").put_object(
- ACL = 'bucket-owner-read',
+ ACL = 'bucket-owner-full-control',
Body = context.value,
Bucket = EFConfig.S3_VERSION_BUCKET,
ContentEncoding = EFConfig.S3_VERSION_CONTENT_ENCODING,
|
Changing ef-version s3 policy to have object be bucket-owner-full-control (#<I>)
|
diff --git a/models/classes/preview/ItemPreviewerService.php b/models/classes/preview/ItemPreviewerService.php
index <HASH>..<HASH> 100644
--- a/models/classes/preview/ItemPreviewerService.php
+++ b/models/classes/preview/ItemPreviewerService.php
@@ -72,10 +72,7 @@ class ItemPreviewerService extends ConfigurableService
$config = $registry->get(self::REGISTRY_ENTRY_KEY);
}
- if (isset($config[self::PREVIEWERS_KEY])) {
- return $config[self::PREVIEWERS_KEY];
- }
- return [];
+ return $config[self::PREVIEWERS_KEY] ?? [];
}
/**
@@ -90,10 +87,7 @@ class ItemPreviewerService extends ConfigurableService
$config = $registry->get(self::REGISTRY_ENTRY_KEY);
}
- if (isset($config[self::PLUGINS_KEY])) {
- return $config[self::PLUGINS_KEY];
- }
- return [];
+ return $config[self::PLUGINS_KEY] ?? [];
}
/**
|
refactor: use null coalescing operator
|
diff --git a/init.js b/init.js
index <HASH>..<HASH> 100644
--- a/init.js
+++ b/init.js
@@ -1,5 +1,5 @@
"use strict";
-var mode = 'dev';
+var mode = process.env['ROADS_ENV'] || 'dev';
var Models = require('roads-models');
require('./libs/roadsmodelpromise.js').mixin(Models.ModelRequest.prototype);
@@ -113,4 +113,4 @@ module.exports.webserver = function (fn) {
}
return server;
-};
\ No newline at end of file
+};
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -5,11 +5,6 @@
* MIT Licensed
*/
-// This file sucks. Todo: make this suck less
-
-var mode = 'dev';
-//var mode = 'prod';
-
var init = require('./init');
init.config();
|
allow environment to be defined through the ROADS_ENV variable
|
diff --git a/lib/transit/rolling_cache.rb b/lib/transit/rolling_cache.rb
index <HASH>..<HASH> 100644
--- a/lib/transit/rolling_cache.rb
+++ b/lib/transit/rolling_cache.rb
@@ -51,15 +51,11 @@ module Transit
def encache(name)
clear if cache_full?
- if existing_key = @value_to_key[name]
- existing_key
- else
- encode_key(@key_to_value.size).tap do |key|
- @key_to_value[key] = name
- @value_to_key[name] = key
- end
- name
- end
+ @value_to_key[name] || begin
+ key = encode_key(@key_to_value.size)
+ @value_to_key[name] = key
+ @key_to_value[key] = name
+ end
end
def encode_key(i)
|
slightly cleaner, no faster or slower (again)
|
diff --git a/python-package/lightgbm/basic.py b/python-package/lightgbm/basic.py
index <HASH>..<HASH> 100644
--- a/python-package/lightgbm/basic.py
+++ b/python-package/lightgbm/basic.py
@@ -803,7 +803,7 @@ class Dataset(object):
assert num_data == len(used_indices)
for i in range_(len(used_indices)):
for j in range_(predictor.num_class):
- sub_init_score[i * redictor.num_class + j] = init_score[used_indices[i] * redictor.num_class + j]
+ sub_init_score[i * predictor.num_class + j] = init_score[used_indices[i] * predictor.num_class + j]
init_score = sub_init_score
if predictor.num_class > 1:
# need to regroup init_score
|
[python] Variable Typo: redictor -> predictor (#<I>)
I believe that this should be a typo, right?
|
diff --git a/src/service/translate.js b/src/service/translate.js
index <HASH>..<HASH> 100644
--- a/src/service/translate.js
+++ b/src/service/translate.js
@@ -532,6 +532,7 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
return $storageKey;
}
$storageKey = key;
+ return this;
};
this.storageKey = storageKey;
|
fix(service): make provider's storageKey chainable
Solves #<I>
|
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
index <HASH>..<HASH> 100755
--- a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
+++ b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
@@ -1799,6 +1799,14 @@ public class OStorageRemote extends OStorageAbstract implements OStorageProxy {
}
OLogManager.instance().error(this, "Can not open database with url " + currentURL, e);
+ } catch (OOfflineNodeException e) {
+ if (network != null) {
+ // REMOVE THE NETWORK CONNECTION IF ANY
+ engine.getConnectionManager().remove(network);
+ network = null;
+ }
+
+ OLogManager.instance().error(this, "Can not open database with url " + currentURL, e);
} catch (OSecurityException ex) {
OLogManager.instance().debug(this, "Invalidate token for url=%s", ex, currentURL);
tokens.remove(currentURL);
|
add offline node handling on reopen operation
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -29,7 +29,7 @@
}
}
} else if (argType === 'object') {
- if (arg.toString === Object.prototype.toString) {
+ if (!arg.hasOwnProperty('toString')) {
for (var key in arg) {
if (hasOwn.call(arg, key) && arg[key]) {
classes.push(key);
|
Bugfix - Class names being returned as [object Object]
Updated to use `hasOwnProperty` over trying to compare the Object prototype which fails with some build pipelines after transpilation. See issue #<I>.
|
diff --git a/doc/source/conf.py b/doc/source/conf.py
index <HASH>..<HASH> 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -18,7 +18,7 @@ import os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../../'))
# -- General configuration ------------------------------------------------
|
Enh: Doc - Make compilation work on rtd
|
diff --git a/src/Sham/DataGenerator.php b/src/Sham/DataGenerator.php
index <HASH>..<HASH> 100644
--- a/src/Sham/DataGenerator.php
+++ b/src/Sham/DataGenerator.php
@@ -466,6 +466,22 @@ class DataGenerator
}
/**
+ * Generates and adds fake data for a choice attribute on a entity.
+ *
+ * @param EntityInterface $entity an instance of the entity to fill with fake data.
+ * @param AttributeInterface $attribute an instance of the Choice to fill with fake data.
+ * @param array $options array of options to customize fake data creation.
+ *
+ * @return void
+ */
+ protected function addChoice(EntityInterface $entity, AttributeInterface $attribute, array $options = array())
+ {
+ $allowed_values = $attribute->getOption('allowed_values');
+ $choice = $allowed_values[array_rand($allowed_values)];
+ $this->setValue($entity, $attribute, $choice, $options);
+ }
+
+ /**
* Generates and adds fake data for a KeyValue on a entity.
*
* @param EntityInterface $entity an instance of the entity to fill with fake data.
|
Support for Choice in DataGenerator
|
diff --git a/Neos.Flow/Classes/Core/Bootstrap.php b/Neos.Flow/Classes/Core/Bootstrap.php
index <HASH>..<HASH> 100644
--- a/Neos.Flow/Classes/Core/Bootstrap.php
+++ b/Neos.Flow/Classes/Core/Bootstrap.php
@@ -547,7 +547,7 @@ class Bootstrap
}
define('FLOW_ONLY_COMPOSER_LOADER', $onlyUseComposerAutoLoaderForPackageClasses);
- define('FLOW_VERSION_BRANCH', '5.1');
+ define('FLOW_VERSION_BRANCH', '5.2');
define('FLOW_APPLICATION_CONTEXT', (string)$this->context);
}
|
BUGFIX: Set FLOW_VERSION_BRANCH to <I>
|
diff --git a/src/Hodor/MessageQueue/Adapter/Amqp/Factory.php b/src/Hodor/MessageQueue/Adapter/Amqp/Factory.php
index <HASH>..<HASH> 100644
--- a/src/Hodor/MessageQueue/Adapter/Amqp/Factory.php
+++ b/src/Hodor/MessageQueue/Adapter/Amqp/Factory.php
@@ -17,7 +17,7 @@ class Factory implements FactoryInterface
/**
* @var ChannelFactory
*/
- private $channel_manager;
+ private $channel_factory;
/**
* @var Consumer[]
@@ -69,11 +69,11 @@ class Factory implements FactoryInterface
public function disconnectAll()
{
- if (!$this->channel_manager) {
+ if (!$this->channel_factory) {
return;
}
- $this->channel_manager->disconnectAll();
+ $this->channel_factory->disconnectAll();
}
/**
@@ -81,12 +81,12 @@ class Factory implements FactoryInterface
*/
private function getChannelFactory()
{
- if ($this->channel_manager) {
- return $this->channel_manager;
+ if ($this->channel_factory) {
+ return $this->channel_factory;
}
- $this->channel_manager = new ChannelFactory($this->config);
+ $this->channel_factory = new ChannelFactory($this->config);
- return $this->channel_manager;
+ return $this->channel_factory;
}
}
|
Rename channel manager variable to be consistent
The object is called channel factory everywhere else, and I think
'channel manager' is a relic from the past
|
diff --git a/cutlass/cf.go b/cutlass/cf.go
index <HASH>..<HASH> 100644
--- a/cutlass/cf.go
+++ b/cutlass/cf.go
@@ -184,11 +184,16 @@ func CountBuildpack(language string) (int, error) {
}
func CreateOrUpdateBuildpack(language, file, stack string) error {
- if err := createBuildpack(language, file); err != nil {
- return UpdateBuildpack(language, file, stack)
+ count, err := CountBuildpack(language)
+ if err != nil {
+ return err
}
- return nil
+ if count == 0 {
+ return createBuildpack(language, file)
+ }
+
+ return UpdateBuildpack(language, file, stack)
}
func (a *App) ConfirmBuildpack(version string) error {
|
Corrects create/update buildpack logic
Should always update, and only create if it does not exist
|
diff --git a/src/Core/Database/Exporter/MysqlExporter.php b/src/Core/Database/Exporter/MysqlExporter.php
index <HASH>..<HASH> 100644
--- a/src/Core/Database/Exporter/MysqlExporter.php
+++ b/src/Core/Database/Exporter/MysqlExporter.php
@@ -80,12 +80,15 @@ class MysqlExporter extends AbstractExporter
* @param $table
*
* @return mixed|null|string
+ *
+ * @throws \InvalidArgumentException
+ * @throws \RuntimeException
*/
protected function getInserts($table)
{
- $db = $this->db;
- $query = $db->getQuery(true);
- $iterator = $db->getReader($query->select('*')->from($table))->getIterator();
+ $db = $this->db;
+ $query = $db->getQuery(true);
+ $iterator = $db->getReader($query->select('*')->from($table))->getIterator();
if (!count($iterator))
{
@@ -101,7 +104,7 @@ class MysqlExporter extends AbstractExporter
$data = array_map(
function($d) use ($query)
{
- return $query->q($d);
+ return $query->q($d) ? : 'NULL';
},
$data
);
|
Fix Export SQL cannot restore #<I>
|
diff --git a/rpc_util.go b/rpc_util.go
index <HASH>..<HASH> 100644
--- a/rpc_util.go
+++ b/rpc_util.go
@@ -685,23 +685,17 @@ func rpcInfoFromContext(ctx context.Context) (s *rpcInfo, ok bool) {
// Code returns the error code for err if it was produced by the rpc system.
// Otherwise, it returns codes.Unknown.
//
-// Deprecated: use status.FromError and Code method instead.
+// Deprecated: use status.Code instead.
func Code(err error) codes.Code {
- if s, ok := status.FromError(err); ok {
- return s.Code()
- }
- return codes.Unknown
+ return status.Code(err)
}
// ErrorDesc returns the error description of err if it was produced by the rpc system.
// Otherwise, it returns err.Error() or empty string when err is nil.
//
-// Deprecated: use status.FromError and Message method instead.
+// Deprecated: use status.Convert and Message method instead.
func ErrorDesc(err error) string {
- if s, ok := status.FromError(err); ok {
- return s.Message()
- }
- return err.Error()
+ return status.Convert(err).Message()
}
// Errorf returns an error containing an error code and a description;
|
rpc_util: update deprecated messages (#<I>)
The status package now has `Convert()` and `Code()` utilities.
This patch updates the deprecation description for `ErrorDesc()` and
`Code()` to recommend using those functions, and forward the deprecated
functions to use the `status.Code()` and `status.Convert()` functions.
|
diff --git a/src/main/java/org/fluentd/logger/Config.java b/src/main/java/org/fluentd/logger/Config.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/fluentd/logger/Config.java
+++ b/src/main/java/org/fluentd/logger/Config.java
@@ -17,8 +17,5 @@
//
package org.fluentd.logger;
-public class Config {
-
- public static final String FLUENT_SENDER_CLASS = "fluentd.logger.sender.class";
-
-}
\ No newline at end of file
+public class Config implements Constants {
+}
diff --git a/src/main/java/org/fluentd/logger/Constants.java b/src/main/java/org/fluentd/logger/Constants.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/fluentd/logger/Constants.java
+++ b/src/main/java/org/fluentd/logger/Constants.java
@@ -19,4 +19,8 @@ package org.fluentd.logger;
public interface Constants {
+ String FLUENT_SENDER_CLASS = "fluentd.logger.sender.class";
+
+ String FLUENT_RECONNECTOR_CLASS = "fluentd.logger.reconnector.class";
+
}
|
changed Config and Constants classes
|
diff --git a/l/tests/test_core.py b/l/tests/test_core.py
index <HASH>..<HASH> 100644
--- a/l/tests/test_core.py
+++ b/l/tests/test_core.py
@@ -3,23 +3,7 @@ from unittest import TestCase
from bp.memory import MemoryFS, MemoryPath
-from l.core import ls, show
-
-
-class TestLS(TestCase):
- def setUp(self):
- self.fs = MemoryFS()
- self.root = MemoryPath(fs=self.fs, path=("test-dir",))
- self.root.createDirectory()
-
- def test_it_lists_directories(self):
- one, two = self.root.child("one"), self.root.child("two")
- one.setContent("")
- two.setContent("")
-
- files = ls(path=self.root)
-
- self.assertEqual(files, [one, two])
+from l import core
class TestShow(TestCase):
@@ -30,7 +14,7 @@ class TestShow(TestCase):
def assertShows(self, result, **kwargs):
self.assertEqual(
- show(**kwargs),
+ core.show(**kwargs),
dedent(result).strip("\n") + "\n",
)
|
Remove this for now, it's useless.
|
diff --git a/example/elements.js b/example/elements.js
index <HASH>..<HASH> 100644
--- a/example/elements.js
+++ b/example/elements.js
@@ -10,6 +10,11 @@ regl.clear({
depth: 1
})
+var lineWidth = 3
+if (lineWidth > regl.limits.lineWidthDims[1]) {
+ lineWidth = regl.limits.lineWidthDims[1]
+}
+
regl({
frag: `
precision mediump float;
@@ -49,5 +54,5 @@ regl({
[3, 4]
],
- lineWidth: 3
+ lineWidth: lineWidth
})()
diff --git a/example/graph.js b/example/graph.js
index <HASH>..<HASH> 100644
--- a/example/graph.js
+++ b/example/graph.js
@@ -362,6 +362,11 @@ const renderPoints = regl({
elements: null
})
+var lineWidth = 2
+if (lineWidth > regl.limits.lineWidthDims[1]) {
+ lineWidth = regl.limits.lineWidthDims[1]
+}
+
const renderEdges = regl({
vert: `
precision highp float;
@@ -402,7 +407,7 @@ const renderEdges = regl({
depth: {enable: false, mask: false},
count: ARCS.length,
primitive: 'lines',
- lineWidth: 2
+ lineWidth: lineWidth
})
const splatMouse = regl({
|
Fix so that 'elements' and 'graph' respect the max lineWidth of the device.
|
diff --git a/aws-java-sdk-sqs/src/main/java/com/amazonaws/services/sqs/buffered/QueueBuffer.java b/aws-java-sdk-sqs/src/main/java/com/amazonaws/services/sqs/buffered/QueueBuffer.java
index <HASH>..<HASH> 100644
--- a/aws-java-sdk-sqs/src/main/java/com/amazonaws/services/sqs/buffered/QueueBuffer.java
+++ b/aws-java-sdk-sqs/src/main/java/com/amazonaws/services/sqs/buffered/QueueBuffer.java
@@ -174,6 +174,8 @@ class QueueBuffer {
rq, callback);
future.setBuffer(this);
return future;
+ } else if (handler != null) {
+ return realSqs.receiveMessageAsync(rq, handler);
} else {
return realSqs.receiveMessageAsync(rq);
}
|
When bypassing buffered receives, pass through the AsyncHandler to receiveMessageAsync if present.
|
diff --git a/src/Auth/User/Provider.php b/src/Auth/User/Provider.php
index <HASH>..<HASH> 100644
--- a/src/Auth/User/Provider.php
+++ b/src/Auth/User/Provider.php
@@ -9,13 +9,13 @@ final class Provider implements \Illuminate\Contracts\Auth\UserProvider, \Auth0\
/**
* A repository instance.
*/
- private Repository $repository;
+ private \Auth0\Laravel\Contract\Auth\User\Repository $repository;
/**
* @inheritdoc
*/
public function __construct(
- \Auth0\Laravel\Auth\User\Repository $repository
+ \Auth0\Laravel\Contract\Auth\User\Repository $repository
) {
$this->repository = $repository;
}
|
Update `Auth\User\Provider::__construct()` to accept a Repository Interface, rather than Class (#<I>)
|
diff --git a/tests/unit/Dotenv_FileTest.php b/tests/unit/Dotenv_FileTest.php
index <HASH>..<HASH> 100644
--- a/tests/unit/Dotenv_FileTest.php
+++ b/tests/unit/Dotenv_FileTest.php
@@ -54,7 +54,9 @@ class Dotenv_FileTest extends PHPUnit_Framework_TestCase
*/
public function it_throws_an_exception_if_the_file_is_not_writable()
{
- Dotenv_File::writable($this->get_fixture_path('env-unwritable'));
+ $filepath = $this->get_fixture_path('env-unwritable');
+ chmod($filepath, 0444);
+ Dotenv_File::writable($filepath);
}
/**
|
ensure file is not writable in test
|
diff --git a/lib/tower_cli/resources/group.py b/lib/tower_cli/resources/group.py
index <HASH>..<HASH> 100644
--- a/lib/tower_cli/resources/group.py
+++ b/lib/tower_cli/resources/group.py
@@ -226,6 +226,20 @@ class Resource(models.Resource):
isid = self._get_inventory_source_id(group)
return isrc.update(isid, monitor=monitor, timeout=timeout, **kwargs)
+ @resources.command(use_fields_as_options=False)
+ @click.option('--group', type=types.Related('group'))
+ @click.option('--parent', type=types.Related('group'))
+ def associate(self, group, parent):
+ """Associate this group with the specified group."""
+ return self._assoc('children', parent, group)
+
+ @resources.command(use_fields_as_options=False)
+ @click.option('--group', type=types.Related('group'))
+ @click.option('--parent', type=types.Related('group'))
+ def disassociate(self, group, parent):
+ """Disassociate this group from the specified group."""
+ return self._disassoc('children', parent, group)
+
def _get_inventory_source_id(self, group):
"""Return the inventory source ID given a group dictionary returned
from the Tower API.
|
Allow associate/disassociate on group to allow for child groups.
|
diff --git a/internal/services/automation/automation_account_data_source.go b/internal/services/automation/automation_account_data_source.go
index <HASH>..<HASH> 100644
--- a/internal/services/automation/automation_account_data_source.go
+++ b/internal/services/automation/automation_account_data_source.go
@@ -51,7 +51,7 @@ func dataSourceAutomationAccountRead(d *pluginsdk.ResourceData, meta interface{}
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()
- id := parse.NewAutomationAccountID(client.SubscriptionID, d.Get("name").(string), d.Get("resource_group_name").(string))
+ id := parse.NewAutomationAccountID(client.SubscriptionID, d.Get("resource_group_name").(string), d.Get("name").(string))
resp, err := client.Get(ctx, id.ResourceGroup, id.Name)
if err != nil {
|
Automation datasource initialization
Invert resource group name and account name for datasource Automation account to fix an not found error.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.