diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/.rspec b/.rspec
index <HASH>..<HASH> 100644
--- a/.rspec
+++ b/.rspec
@@ -1 +1,2 @@
---color
\ No newline at end of file
+--color
+--format documentation
diff --git a/lib/storify/client.rb b/lib/storify/client.rb
index <HASH>..<HASH> 100644
--- a/lib/storify/client.rb
+++ b/lib/storify/client.rb
@@ -27,4 +27,8 @@ class Storify::Client
self
end
+
+ def authenticated
+ !@token.nil?
+ end
end
\ No newline at end of file
diff --git a/spec/client_auth_spec.rb b/spec/client_auth_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/client_auth_spec.rb
+++ b/spec/client_auth_spec.rb
@@ -7,6 +7,7 @@ describe "Storify::Client -- Authentication" do
it "should retrieve an auth token on success" do
@client.auth(get_password).token.should_not be_nil
+ @client.authenticated.should be_true
end
it "should raise an API error on failure" do
|
additional auth spec and interface refactoring
|
diff --git a/base/project.js b/base/project.js
index <HASH>..<HASH> 100644
--- a/base/project.js
+++ b/base/project.js
@@ -202,10 +202,9 @@ Project.prototype.route = function project_route (request, view, next) {
var parts = request.url.pathname.split('/');
// if the uri starts wiht a forward slash, we will have an empty string at the start of the array
var part = parts.shift();
- console.log(parts);
+
// loop through every part separated by slashes and incrementally check them against the routes
while (part = parts.shift()) {
- console.log('checking part:' + part + ' [' + parts.length + ']');
route = this._partMatches(routes, part, request);
// if we found a matching route
@@ -213,7 +212,6 @@ Project.prototype.route = function project_route (request, view, next) {
break;
}
- console.log('route found');
// if we need to dig deeper
if (route.routes && parts.length) {
routes = route.routes;
@@ -248,7 +246,7 @@ Project.prototype._partMatches = function project__partMatches (routes, request_
}
if (url_part[0] === '#') {
- if (Number(request_url) != NaN) {
+ if (!isNaN(Number(request_url))) {
request.url.query[url_part.substring(1)] = request_url;
return routes[url_part];
}
|
remove some logging and fix the url routing on digits
|
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index <HASH>..<HASH> 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -54,10 +54,8 @@ I18n.enforce_available_locales = false
# Register danish language for testing
I18n.backend.store_translations 'da', {}
I18n.backend.store_translations 'pt-BR', {}
-ORIGINAL_LOCALES = I18n.available_locales.map(&:to_s).sort
FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
-FIXTURES = Pathname.new(FIXTURE_LOAD_PATH)
module RackTestUtils
def body_to_string(body)
|
Removing unused constants from abstract_unit
|
diff --git a/spec/integration/deployment_spec.rb b/spec/integration/deployment_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/integration/deployment_spec.rb
+++ b/spec/integration/deployment_spec.rb
@@ -88,7 +88,6 @@ describe 'deployment integrations' do
context 'canceling a deploy job' do
it 'should spawn a job and then successfully cancel it' do
- pending 'hangs when canceling during or before package compilation'
deploy_result = deploy_simple(no_track: true)
task_id = get_task_id(deploy_result, 'running')
@@ -106,4 +105,4 @@ describe 'deployment integrations' do
expect(error_event['message']).to eq("Task #{task_id} cancelled")
end
end
-end
\ No newline at end of file
+end
|
Re-enable pending spec since [#<I>] was fixed
|
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,13 +1,12 @@
module.exports = function(config) {
+ var browsers = process.env.TRAVIS
+ ? [ 'PhantomJS' ]
+ : [ 'PhantomJS', 'Chrome', 'Firefox', 'Safari' ];
+
config.set({
frameworks: [ 'hydro' ],
singleRun: true,
- browsers: [
- 'PhantomJS',
- 'Chrome',
- 'Firefox',
- 'Safari'
- ],
+ browsers: browsers,
files: [
'test/*.js'
],
|
Make karma pick up only PhantomJS when on Travis CI
|
diff --git a/lib/rom/repository/version.rb b/lib/rom/repository/version.rb
index <HASH>..<HASH> 100644
--- a/lib/rom/repository/version.rb
+++ b/lib/rom/repository/version.rb
@@ -1,5 +1,5 @@
module ROM
class Repository
- VERSION = '0.3.1'.freeze
+ VERSION = '1.0.0.beta1'.freeze
end
end
|
Bump to <I>.beta1
|
diff --git a/docs/source/conf.py b/docs/source/conf.py
index <HASH>..<HASH> 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -64,9 +64,9 @@ copyright = u'2012, BNPB/AIFDR/GFDRR'
# built documents.
#
# The short X.Y version.
-version = '0.2.0'
+version = '0.3.0'
# The full version, including alpha/beta/rc tags.
-release = '0.2.0'
+release = '0.3.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
|
Updated source version in master to <I>
|
diff --git a/lib/ovirt_metrics.rb b/lib/ovirt_metrics.rb
index <HASH>..<HASH> 100644
--- a/lib/ovirt_metrics.rb
+++ b/lib/ovirt_metrics.rb
@@ -43,7 +43,7 @@ module OvirtMetrics
end
def self.disconnect
- OvirtHistory.connection.disconnect!
+ OvirtHistory.remove_connection
end
def self.vm_realtime(vm_id, start_time = nil, end_time = nil)
|
Properly disconnect
disconnect! disconnects the only the adapter connection; remove_connection
removes the connection for this class and will disconnect the correct
connection pool.
<URL>
|
diff --git a/orderer/consensus/etcdraft/chain_test.go b/orderer/consensus/etcdraft/chain_test.go
index <HASH>..<HASH> 100644
--- a/orderer/consensus/etcdraft/chain_test.go
+++ b/orderer/consensus/etcdraft/chain_test.go
@@ -465,15 +465,18 @@ var _ = Describe("Chain", func() {
// use to prepare the Orderer Values
BeforeEach(func() {
chainID := "mychannel"
+ values := make(map[string]*common.ConfigValue)
configEnv = newConfigEnv(chainID,
- common.HeaderType_ORDERER_TRANSACTION,
- &common.ConfigUpdateEnvelope{ConfigUpdate: []byte("test channel creation envelope")})
+ common.HeaderType_CONFIG,
+ newConfigUpdateEnv(chainID, values),
+ )
configSeq = 0
}) // BeforeEach block
It("should be able to create a channel", func() {
err := chain.Configure(configEnv, configSeq)
Expect(err).NotTo(HaveOccurred())
+ Eventually(support.WriteConfigBlockCallCount).Should(Equal(1))
})
})
}) // Context block for type A config
|
[FAB-<I>] Fix failed UT
The UT being fixed in this CR submits a malformed config env,
which crashes test. It passed because we never wait for the
block to be committed and shut down test early.
Change-Id: I<I>ccbf<I>d8ffb<I>d<I>e<I>a<I>b<I>d<I>e
|
diff --git a/activerecord/lib/active_record/dynamic_scope_match.rb b/activerecord/lib/active_record/dynamic_scope_match.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/dynamic_scope_match.rb
+++ b/activerecord/lib/active_record/dynamic_scope_match.rb
@@ -1,4 +1,11 @@
module ActiveRecord
+
+ # = Active Record Dynamic Scope Match
+ #
+ # Provides dynamic attribute-based scopes such as <tt>scoped_by_price(4.99)</tt>
+ # if, for example, the <tt>Product</tt> has an attribute with that name. You can
+ # chain more <tt>scoped_by_* </tt> methods after the other. It acts like a named
+ # scope except that it's dynamic.
class DynamicScopeMatch
def self.match(method)
ds_match = self.new(method)
|
Added description and title to Dynamic Scope Match
|
diff --git a/lib/util/escape-path.js b/lib/util/escape-path.js
index <HASH>..<HASH> 100644
--- a/lib/util/escape-path.js
+++ b/lib/util/escape-path.js
@@ -3,7 +3,8 @@ module.exports = function escapePath(p) {
var p = encodeURIComponent(p)
.replace(/%2F/g, '/')
.replace(/\)/g, '%29')
- .replace(/\(/g, '%28');
+ .replace(/\(/g, '%28')
+ .replace(/!/g,'%21');
if (p[0] === '/') { p = p.slice(1); }
return p;
}
|
Added support to ! in path
|
diff --git a/Processor.php b/Processor.php
index <HASH>..<HASH> 100644
--- a/Processor.php
+++ b/Processor.php
@@ -449,6 +449,16 @@ class Processor
$target->{'@reverse'} = new Object();
}
$target = $target->{'@reverse'};
+
+ if (false === is_array($value)) {
+ $value = array($value);
+ }
+
+ foreach ($value as $val) {
+ if (property_exists($val, '@value') || property_exists($val, '@list')) {
+ throw new SyntaxException('Detected invalid value in @reverse-map (only nodes are allowed', $val);
+ }
+ }
}
if (is_array($expProperty)) {
@@ -649,7 +659,7 @@ class Processor
if ('@reverse' === $keyword) {
if (false === is_object($value)) {
- throw new SyntaxException("Invalid value for $keyword detected (must be an object).", $value);
+ throw new SyntaxException('Detected invalid value for @reverse (must be an object).', $value);
}
$this->expand($value, $activectx, $keyword, $frame);
|
Ensure reverse properties only contain nodes
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -255,11 +255,11 @@ BitArray.from32Integer = function(num) {
BitArray.fromRedis =
BitArray.fromBuffer = function(buf) {
- var bits = []
+ var bits = ''
for (var i = 0; i < buf.length; i++) {
- bits = bits.concat(BitArray.from32Integer(buf[i]).toJSON())
+ bits += BitArray.from32Integer(buf[i]).__bits.join('')
}
- return new BitArray().set(bits)
+ return new BitArray().set(bits.split('').map(i => parseInt(i)))
}
/**
|
Performance enhancement on fromBuffer
The performance of Array.concat was taking a hit when using a buffer that <I> bytes in length. Appending to a string is faster
|
diff --git a/src/Illuminate/Foundation/Http/FormRequest.php b/src/Illuminate/Foundation/Http/FormRequest.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Foundation/Http/FormRequest.php
+++ b/src/Illuminate/Foundation/Http/FormRequest.php
@@ -207,7 +207,7 @@ class FormRequest extends Request implements ValidatesWhenResolved
* Get the validated data from the request.
*
* @param string|null $key
- * @param string|array|null $default
+ * @param mixed $default
* @return mixed
*/
public function validated($key = null, $default = null)
|
Update FormRequest.php (#<I>)
|
diff --git a/tests/PoolTest.php b/tests/PoolTest.php
index <HASH>..<HASH> 100644
--- a/tests/PoolTest.php
+++ b/tests/PoolTest.php
@@ -149,6 +149,13 @@ class PoolTest extends \PHPUnit_Framework_TestCase
*/
public function testReserveWithNoJobsDoesNotTakeLongerThanTimeout()
{
+ $connection = $this->createMockConnection('host:123');
+ $this->collection->expects($this->any())
+ ->method('getAvailableKeys')
+ ->will($this->returnValue(['host:123', 'host:456']));
+ $this->collection->expects($this->any())
+ ->method('sendToExact')
+ ->will($this->returnValue(['connection' => $connection, 'response' => false]));
$startTime = time();
$this->pool->reserve(2);
$totalTime = time() - $startTime;
|
Fix failing pool test requiring returns from the mocks
|
diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index <HASH>..<HASH> 100644
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -1285,7 +1285,7 @@ class jsportal {
* Prints the JavaScript code needed to set up AJAX for the course.
*/
function print_javascript($courseid, $return=false) {
- global $CFG, $USER;
+ global $CFG, $USER, $OUTPUT;
$blocksoutput = $output = '';
for ($i=0; $i<count($this->blocks); $i++) {
|
ajaxlib MDL-<I> Fixed minor bug because of missing global
|
diff --git a/mambustruct.py b/mambustruct.py
index <HASH>..<HASH> 100644
--- a/mambustruct.py
+++ b/mambustruct.py
@@ -15,6 +15,12 @@ class MambuStructIterator:
return item
class MambuStruct(object):
+ def __getitem__(self, key):
+ return self.attrs[key]
+
+ def __str__(self):
+ return self.__class__.__name__ + " - " + str(self.attrs)
+
# Initializa a partir de un diccionario con los elementos de la cuenta
def init(self, attrs={}):
self.attrs = attrs
|
MambuStructs get array and printable functionality
|
diff --git a/spec/core/nil/and_spec.rb b/spec/core/nil/and_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/core/nil/and_spec.rb
+++ b/spec/core/nil/and_spec.rb
@@ -6,7 +6,7 @@ describe "NilClass#&" do
(nil & true).should == false
(nil & false).should == false
(nil & "").should == false
- (nil & 'x').should == false
+ (nil & mock('x')).should == false
end
end
|
fix typo in NilClass#and spec
|
diff --git a/tests/LCRun2Test.php b/tests/LCRun2Test.php
index <HASH>..<HASH> 100644
--- a/tests/LCRun2Test.php
+++ b/tests/LCRun2Test.php
@@ -1,6 +1,6 @@
<?php
/**
- * Generated by build/gen_test on 2014-02-26 at 05:34:15.
+ * Generated by build/gen_test
*/
require_once('src/lightncandy.php');
diff --git a/tests/LightnCandyTest.php b/tests/LightnCandyTest.php
index <HASH>..<HASH> 100644
--- a/tests/LightnCandyTest.php
+++ b/tests/LightnCandyTest.php
@@ -1,6 +1,6 @@
<?php
/**
- * Generated by build/gen_test on 2014-02-26 at 05:34:15.
+ * Generated by build/gen_test
*/
require_once('src/lightncandy.php');
|
Auto generated tests from Travis [ci skip]
|
diff --git a/addok/core.py b/addok/core.py
index <HASH>..<HASH> 100644
--- a/addok/core.py
+++ b/addok/core.py
@@ -303,8 +303,6 @@ class Search(BaseHelper):
self.step_only_commons,
self.step_no_meaningful_but_common_try_autocomplete,
self.step_bucket_with_meaningful,
- self.step_check_bucket_full,
- self.step_check_cream,
self.step_reduce_with_other_commons,
self.step_autocomplete,
self.step_check_bucket_full,
|
Always try to autocomplete while bucket is not overflown
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,10 @@ ENCODING = "utf8"
pkg_info = {}
+def need_pytest():
+ return set(["pytest", "test", "ptr"]).intersection(sys.argv)
+
+
with open(os.path.join(MODULE_NAME, "__version__.py")) as f:
exec(f.read(), pkg_info)
@@ -40,8 +44,7 @@ with open(os.path.join(REQUIREMENT_DIR, "docs_requirements.txt")) as f:
DOCS_REQUIRES = [line.strip() for line in f if line.strip()]
SETUPTOOLS_REQUIRES = ["setuptools>=38.3.0"]
-NEEDS_PYTEST = set(["pytest", "test", "ptr"]).intersection(sys.argv)
-PYTEST_RUNNER_REQUIRES = ["pytest-runner"] if NEEDS_PYTEST else []
+PYTEST_RUNNER_REQUIRES = ["pytest-runner"] if need_pytest() else []
setuptools.setup(
name=MODULE_NAME,
|
Extract a function that gets pytest-runner requirement
|
diff --git a/tests/test_symbolic.py b/tests/test_symbolic.py
index <HASH>..<HASH> 100644
--- a/tests/test_symbolic.py
+++ b/tests/test_symbolic.py
@@ -20,10 +20,10 @@ import nose
def test_concretization_strategies():
initial_memory = {0: b'A', 1: b'B', 2: b'C', 3: b'D'}
- s = angr.SimState(arch='AMD64', memory_backer=initial_memory)
+ s = angr.SimState(arch='AMD64', dict_memory_backer=initial_memory)
# sanity check
- nose.tools.assert_equal(s.solver.eval_upto(s.memory.load(3, 1), 2, cast_to=bytes), [b'D'])
+ nose.tools.assert_equal(s.solver.eval_upto(s.memory.load(3, size=1), 2, cast_to=bytes), [b'D'])
x = s.solver.BVS('x', s.arch.bits)
s.add_constraints(x >= 1)
|
Fix test_symbolic.
|
diff --git a/src/test/java/hex/DeepLearningSpiralsTest.java b/src/test/java/hex/DeepLearningSpiralsTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/hex/DeepLearningSpiralsTest.java
+++ b/src/test/java/hex/DeepLearningSpiralsTest.java
@@ -47,7 +47,7 @@ public class DeepLearningSpiralsTest extends TestUtil {
p.source = frame;
p.response = frame.lastVec();
p.validation = null;
- p.score_interval = 10;
+ p.score_interval = 2;
p.ignored_cols = null;
p.train_samples_per_iteration = 0; //sync once per period
p.quiet_mode = true;
|
Speed up DLSpiralsTest by scoring more often and triggering early stopping more likely.
|
diff --git a/lib/Cpdf.php b/lib/Cpdf.php
index <HASH>..<HASH> 100644
--- a/lib/Cpdf.php
+++ b/lib/Cpdf.php
@@ -5763,7 +5763,7 @@ EOT;
if ($eight_bit) {
// with gamma correction
$gammacorr = 2.2;
- $pixel = pow((((127 - $alpha) * 255 / 127) / 255), $gammacorr) * 255;
+ $pixel = round(pow((((127 - $alpha) * 255 / 127) / 255), $gammacorr) * 255);
} else {
// without gamma correction
$pixel = (127 - $alpha) * 2;
|
Round pixel color for 8-bit PNG with transparency
When processing the alpha channel in CPDF. Addresses PHP <I> compatibility issue.
|
diff --git a/psiturk/experiment.py b/psiturk/experiment.py
index <HASH>..<HASH> 100644
--- a/psiturk/experiment.py
+++ b/psiturk/experiment.py
@@ -491,7 +491,8 @@ def start_exp():
condition=part.cond,
counterbalance=part.counterbalance,
adServerLoc=ad_server_location,
- mode = mode
+ mode = mode,
+ contact_address=CONFIG.get('HIT Configuration', 'contact_email_on_error')
)
@app.route('/inexp', methods=['POST'])
|
make contact_address available to exp.html
|
diff --git a/task/backend/analytical_storage_test.go b/task/backend/analytical_storage_test.go
index <HASH>..<HASH> 100644
--- a/task/backend/analytical_storage_test.go
+++ b/task/backend/analytical_storage_test.go
@@ -66,24 +66,22 @@ func TestAnalyticalStore(t *testing.T) {
ts.BucketService = storage.NewBucketService(ts.BucketService, ab.storageEngine)
- go func() {
- <-ctx.Done()
- ab.Close(t)
- }()
-
authCtx := icontext.SetAuthorizer(ctx, &influxdb.Authorization{
Permissions: influxdb.OperPermissions(),
})
return &servicetest.System{
- TaskControlService: svcStack,
- TaskService: svcStack,
- OrganizationService: ts.OrganizationService,
- UserService: ts.UserService,
- UserResourceMappingService: ts.UserResourceMappingService,
- AuthorizationService: authSvc,
- Ctx: authCtx,
- }, cancelFunc
+ TaskControlService: svcStack,
+ TaskService: svcStack,
+ OrganizationService: ts.OrganizationService,
+ UserService: ts.UserService,
+ UserResourceMappingService: ts.UserResourceMappingService,
+ AuthorizationService: authSvc,
+ Ctx: authCtx,
+ }, func() {
+ cancelFunc()
+ ab.Close(t)
+ }
},
)
}
|
chore: Closing in goroutine causes race with logging framework
|
diff --git a/lib/SiftResponse.php b/lib/SiftResponse.php
index <HASH>..<HASH> 100644
--- a/lib/SiftResponse.php
+++ b/lib/SiftResponse.php
@@ -17,6 +17,6 @@ class SiftResponse {
}
public function isOk() {
- return $this->apiStatus == 0;
+ return $this->apiStatus === 0;
}
}
\ No newline at end of file
|
Using === to compare apiStatus
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -55,13 +55,9 @@ function DubAPI(auth, callback) {
that._.self = new SelfModel(body.data);
- that._.reqHandler.queue({method: 'GET', url: endpoints.authToken}, function(code, body) {
- if (code !== 200) return callback(new DubAPIRequestError(code, that._.reqHandler.endpoint(endpoints.authToken)));
+ that._.sokHandler.connect();
- that._.sokHandler.connect(body.data.token);
-
- callback(undefined, that);
- });
+ callback(undefined, that);
});
});
}
|
Removed extra authToken request
|
diff --git a/src/cli/commands/parseOptions.js b/src/cli/commands/parseOptions.js
index <HASH>..<HASH> 100644
--- a/src/cli/commands/parseOptions.js
+++ b/src/cli/commands/parseOptions.js
@@ -115,11 +115,11 @@ function parseCommandOptions(command, notManaged) {
let name;
// See if we can match the option against anything.
- if (notManaged[option.name]) {
+ if (notManaged[option.name] !== undefined) {
value = notManaged[option.name];
delete notManaged[option.name];
name = option.name;
- } else if (notManaged[option.alias]) {
+ } else if (notManaged[option.alias] !== undefined) {
value = notManaged[option.alias];
delete notManaged[option.alias];
name = option.alias;
|
Fixed a problem where an option was false, when using --no-option
|
diff --git a/container/core.py b/container/core.py
index <HASH>..<HASH> 100644
--- a/container/core.py
+++ b/container/core.py
@@ -119,7 +119,7 @@ def cmdrun_build(base_path, project_name, engine_name, var_file=None,
if engine_obj.service_is_running('conductor'):
engine_obj.stop_container(conductor_container_id, forcefully=True)
- if not kwargs.get('devel'):
+ if conductor_container_id is None or not kwargs.get('devel'):
if engine_obj.CAP_BUILD_CONDUCTOR:
conductor_img_id = engine_obj.build_conductor_image(
base_path,
|
Build conductor if none exists in `--devel` mode
If `--devel` is used but the conductor is not built, ansible-container
fails right now. With this patch, we'll autobuild the conductor even if
the user has specified devel mode which would normally skip that step.
|
diff --git a/code/libraries/koowa/template/filter/alias.php b/code/libraries/koowa/template/filter/alias.php
index <HASH>..<HASH> 100644
--- a/code/libraries/koowa/template/filter/alias.php
+++ b/code/libraries/koowa/template/filter/alias.php
@@ -32,7 +32,6 @@ class KTemplateFilterAlias extends KTemplateFilterAbstract implements KTemplateF
'@template(' => '$this->loadIdentifier(',
'@route(' => '$this->getView()->createRoute(',
'@escape(' => '$this->getView()->escape(',
- '@toolbar(' => '$this->renderHelper(\'toolbar.render\'',
);
/**
|
Removed @toolbar() alias for the time being.
|
diff --git a/middleware/fileStore.js b/middleware/fileStore.js
index <HASH>..<HASH> 100644
--- a/middleware/fileStore.js
+++ b/middleware/fileStore.js
@@ -22,7 +22,7 @@ module.exports = function (options) {
},
responseExists: function (url) {
- return fs.exists(this.filename(url))
+ return fs.exists(this.filename(url) + '.json')
},
writeResponse: function (url, response) {
@@ -38,11 +38,10 @@ module.exports = function (options) {
return fs
.mkdirs(path)
.then(function () {
- return fs.writeFile(filename + '.json', responseJson)
- })
- .then(function () {
writeStreamToFile(filename, fileStream).catch(function (e) {
console.error((e && e.stack) || e)
+ }).then(function () {
+ return fs.writeFile(filename + '.json', responseJson)
})
response.body = responseStream
|
file cache: write header file after request is finished
|
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -7,7 +7,6 @@ class PagesController < AlchemyController
caches_action(
:show,
- :layout => false,
:cache_path => proc { url_for(:action => :show, :urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
:if => proc do
if Alchemy::Config.get(:cache_pages)
|
Fixes page caching. Closes #<I>
|
diff --git a/test/term_buffer.js b/test/term_buffer.js
index <HASH>..<HASH> 100644
--- a/test/term_buffer.js
+++ b/test/term_buffer.js
@@ -100,14 +100,14 @@ describe('TermBuffer', function() {
});
it("resize correctly to smaller size", function() {
var t = newTermBuffer(80,24);
- t.write("line1\n");
+ t.write("line1\n");
t.resize(2,2);
- t.write("ab\n");
+ t.write("ab\n");
expect(t.toString()).to.be("ab\n");
});
it("resize correctly to bigger size", function() {
var t = newTermBuffer(80,24);
- t.write("line1\n");
+ t.write("line1\n");
t.resize(80,28);
expect(t.toString()).to.be("\n\n\n\nline1");
});
|
using tabs for indention.
|
diff --git a/quilt/patch.py b/quilt/patch.py
index <HASH>..<HASH> 100644
--- a/quilt/patch.py
+++ b/quilt/patch.py
@@ -20,8 +20,9 @@
# 02110-1301 USA
import os
+import os.path
-from quilt.utils import Process
+from quilt.utils import Process, Directory, File
class Patch(object):
@@ -41,3 +42,24 @@ class Patch(object):
cmd.append(patch_file)
Process(cmd).run(cwd=cwd)
+
+
+class RollbackPatch(object):
+
+ def __init__(self, cwd, backup_dir):
+ self.cwd = Directory(cwd)
+ self.backup_dir = Directory(backup_dir)
+ (dirs, files) = self.backup_dir.content()
+
+ for dir in dirs:
+ newdir = self.cwd + dir
+ if not newdir.exists():
+ newdir.create()
+
+ for file in files:
+ file = File(file)
+ backup_file = self.backup_dir + file
+ rollback_file = self.cwd + file
+ if rollback_file.exists():
+ rollback_file.delete()
+ backup_file.link(rollback_file)
|
Add a RollbackPatch class
The RollbackPatch class that hard links the backup file created by patch
to the file that should be restored.
|
diff --git a/code/photini/metadata_gexiv2.py b/code/photini/metadata_gexiv2.py
index <HASH>..<HASH> 100644
--- a/code/photini/metadata_gexiv2.py
+++ b/code/photini/metadata_gexiv2.py
@@ -30,7 +30,7 @@ class MetadataHandler(object):
return self._md.save_file(self._path)
def get_tags(self):
- return self._md.get_tags()
+ return self._md.get_exif_tags() + self._md.get_iptc_tags() + self._md.get_xmp_tags()
def get_exif_tags(self):
return self._md.get_exif_tags()
|
Bug fix: some versions of gexiv2 don't have get_tags method.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -225,6 +225,12 @@ function prepare(options, context, ns, hxmlContent, jsTempFile) {
}
}
+ if (name == '--macro') {
+ // quote macro value
+ args.push(`"${value}"`);
+ continue;
+ }
+
args.push(value);
}
}
|
Macro with single quotes need to be quoted
|
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -570,18 +570,11 @@ class Form implements \IteratorAggregate, FormInterface
}
foreach ($this->children as $name => $child) {
- if (!isset($submittedData[$name])) {
- $submittedData[$name] = null;
- }
+ $child->bind(isset($submittedData[$name]) ? $submittedData[$name] : null);
+ unset($submittedData[$name]);
}
- foreach ($submittedData as $name => $value) {
- if ($this->has($name)) {
- $this->children[$name]->bind($value);
- } else {
- $this->extraData[$name] = $value;
- }
- }
+ $this->extraData = $submittedData;
// If the form is compound, the default data in view format
// is reused. The data of the children is merged into this
|
[Form] optimized the binding of child forms and calculation of extra data
|
diff --git a/src/util.js b/src/util.js
index <HASH>..<HASH> 100644
--- a/src/util.js
+++ b/src/util.js
@@ -289,7 +289,7 @@ const util = {
*/
printDebug: function (str) {
if (debugMode) {
- console.log(str);
+ console.log('[OpenPGP.js debug]', str);
}
},
@@ -300,7 +300,7 @@ const util = {
*/
printDebugError: function (error) {
if (debugMode) {
- console.error(error);
+ console.error('[OpenPGP.js debug]', error);
}
},
|
`printDebug`: add label to identify source of the log (#<I>)
|
diff --git a/app/helpers/tenon/asset_helper.rb b/app/helpers/tenon/asset_helper.rb
index <HASH>..<HASH> 100644
--- a/app/helpers/tenon/asset_helper.rb
+++ b/app/helpers/tenon/asset_helper.rb
@@ -6,7 +6,15 @@ module Tenon
else
i = image_tag(default_asset_thumbnail(asset))
end
- link_to(i, [:edit, asset], default_options)
+ asset_icon_link(asset, i)
+ end
+
+ def asset_icon_link(asset, icon)
+ if asset.is_image?
+ link_to(icon, [:crop, asset], crop_options(asset))
+ else
+ link_to(icon, asset.attachment.url, target: '_')
+ end
end
def default_asset_thumbnail(asset)
@@ -19,6 +27,16 @@ module Tenon
private
+ def crop_options(asset)
+ {
+ class: 'asset-crop',
+ data: {
+ 'asset-id' => asset.id,
+ 'post-crop-handler' => 'Tenon.features.AssetListPostCropHandler'
+ }
+ }
+ end
+
def default_options
{
'data-modal-remote' => true,
|
Make the image load the crop view rather than the edit title window
|
diff --git a/src/Hander.php b/src/Hander.php
index <HASH>..<HASH> 100644
--- a/src/Hander.php
+++ b/src/Hander.php
@@ -17,4 +17,38 @@ namespace SlaxWeb\Cache;
*/
abstract class Handler
{
+ /**
+ * Write
+ *
+ * Write data to cache with the given name and data. The data must be in the
+ * string format.
+ *
+ * @param string $name Data name
+ * @param string $data Data to cache
+ * @return self
+ */
+ abstract public function write(string $name, string $data): Handler;
+
+ /**
+ * Data exists
+ *
+ * Checks if the data exists in the cache and retuns a bool value.
+ *
+ * @param string $name Data name
+ * @return bool
+ */
+ abstract public function exists(string $name): bool;
+
+ /**
+ * Get data
+ *
+ * Gets the data from the cache based on the received name. If data is not found
+ * a 'CachedDataNotFoundException' is thrown.
+ *
+ * @param string $name Data name
+ * @return string
+ *
+ * @exceptions \SlaxWeb\Cache\Exception\CachedDataNotFoundException
+ */
+ abstract public function get(string $name): string;
}
|
add basic abstract methods to the abstract handler
|
diff --git a/particles/utils.py b/particles/utils.py
index <HASH>..<HASH> 100644
--- a/particles/utils.py
+++ b/particles/utils.py
@@ -189,16 +189,15 @@ def distribute_work(f, inputs, outputs=None, nprocs=1, out_key='output'):
def distinct_seeds(k):
- """ returns k distinct seeds for random number generation
+ """generates k distinct seeds for random number generation.
"""
- seeds = []
- for _ in range(k):
- while True:
- s = random.randint(MAX_INT_32)
- if s not in seeds:
- break
- seeds.append(s)
- return seeds
+ while(True):
+ seeds = random.randint(MAX_INT_32, size=2 * k) # birthday's problem
+ unique_seeds = np.unique(seeds)
+ if len(unique_seeds) >= k:
+ break
+ random.shuffle(unique_seeds)
+ return(unique_seeds[:k])
class seeder(object):
|
faster implementation of distinct_seeds in utils
|
diff --git a/cursorcontext.go b/cursorcontext.go
index <HASH>..<HASH> 100644
--- a/cursorcontext.go
+++ b/cursorcontext.go
@@ -134,6 +134,8 @@ func (ti *token_iterator) extract_struct_type() string {
if !ti.go_back() {
return ""
}
+ } else if ti.token().tok == token.COMMA {
+ return ti.extract_struct_type()
}
if ti.token().tok != token.IDENT {
return ""
|
Better cursor context deduction for array of structs literals.
<URL>
|
diff --git a/lib/rib/runner.rb b/lib/rib/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/rib/runner.rb
+++ b/lib/rib/runner.rb
@@ -74,7 +74,7 @@ module Rib::Runner
puts(Rib::VERSION)
exit
- when /[^-]+/
+ when /^[^-]/
load_command(arg)
else
|
runner.rb: fixed command detecting
|
diff --git a/lib/mongoid/reloading.rb b/lib/mongoid/reloading.rb
index <HASH>..<HASH> 100644
--- a/lib/mongoid/reloading.rb
+++ b/lib/mongoid/reloading.rb
@@ -24,7 +24,8 @@ module Mongoid
changed_attributes.clear
apply_defaults
reload_relations
- run_callbacks(:initialize)
+ run_callbacks(:find) unless _find_callbacks.empty?
+ run_callbacks(:initialize) unless _initialize_callbacks.empty?
self
end
diff --git a/spec/mongoid/callbacks_spec.rb b/spec/mongoid/callbacks_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/mongoid/callbacks_spec.rb
+++ b/spec/mongoid/callbacks_spec.rb
@@ -107,6 +107,21 @@ describe Mongoid::Callbacks do
from_db.impressions.should eq(1)
end
end
+
+ context "when the document is reloaded" do
+
+ let(:from_db) do
+ Player.find(player.id)
+ end
+
+ before do
+ from_db.reload
+ end
+
+ it "executes the callback" do
+ from_db.impressions.should eq(1)
+ end
+ end
end
context "when the callback is on an embedded document" do
|
Ensure reload calls after_find callbacks. [ close #<I> ]
|
diff --git a/pyemu/en.py b/pyemu/en.py
index <HASH>..<HASH> 100644
--- a/pyemu/en.py
+++ b/pyemu/en.py
@@ -214,6 +214,7 @@ class Ensemble(pd.DataFrame):
"""
df = kwargs.pop("df")
assert isinstance(df,pd.DataFrame)
+ df.columns = [c.lower() for c in df.columns]
mean_values = kwargs.pop("mean_values",df.mean(axis=0))
e = cls(data=df,index=df.index,columns=df.columns,
mean_values=mean_values,**kwargs)
|
cast column names to lower in ensemble from_dataframe
|
diff --git a/mod/bigbluebuttonbn/classes/local/proxy/bigbluebutton_proxy.php b/mod/bigbluebuttonbn/classes/local/proxy/bigbluebutton_proxy.php
index <HASH>..<HASH> 100644
--- a/mod/bigbluebuttonbn/classes/local/proxy/bigbluebutton_proxy.php
+++ b/mod/bigbluebuttonbn/classes/local/proxy/bigbluebutton_proxy.php
@@ -80,7 +80,10 @@ class bigbluebutton_proxy extends proxy_base {
if (!is_null($createtime)) {
$data['createTime'] = $createtime;
}
-
+ $currentlang = current_language();
+ if (!empty(trim($currentlang))) {
+ $data['userdata-bbb_override_default_locale'] = $currentlang;
+ }
return self::action_url('join', $data);
}
|
MDL-<I> mod_bigbluebuttonbn: align language with user's preference
* Pick BBB UI language from Moodle user profile language instead of
preferred browser language
|
diff --git a/src/python/turicreate/test/test_one_shot_object_detector.py b/src/python/turicreate/test/test_one_shot_object_detector.py
index <HASH>..<HASH> 100644
--- a/src/python/turicreate/test/test_one_shot_object_detector.py
+++ b/src/python/turicreate/test/test_one_shot_object_detector.py
@@ -125,7 +125,7 @@ class OneObjectDetectorSmokeTest(unittest.TestCase):
def test_create_with_single_image(self):
image = self.train[0][self.feature]
model = tc.one_shot_object_detector.create(
- image, 'custom_logo', backgrounds=self.backgrounds)
+ image, 'custom_logo', backgrounds=self.backgrounds, max_iterations=1)
def test_create_with_missing_value(self):
sf = self.train.append(tc.SFrame({self.feature: tc.SArray([None], dtype=tc.Image), self.target: [self.train[self.target][0]]}))
|
accelerate OSOD unit test (#<I>)
|
diff --git a/scrypture.py b/scrypture.py
index <HASH>..<HASH> 100644
--- a/scrypture.py
+++ b/scrypture.py
@@ -37,7 +37,7 @@ registered_scripts = [
'quick_hash',
'convert_epoch_time',
'file_hash',
-'curl_to_requests_ui'
+#'curl_to_requests'
]
|
disabled curl_to_requests
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -10,6 +10,7 @@ module.exports = {
rulesConfig: {
"no-async-in-loops": 1,
"no-commented-tests": 0,
+ "no-ok-equality": 1,
"resolve-async": 2
}
};
|
Added default rule configuration for no-ok-equality.
|
diff --git a/lib/styleguide.js b/lib/styleguide.js
index <HASH>..<HASH> 100644
--- a/lib/styleguide.js
+++ b/lib/styleguide.js
@@ -244,7 +244,7 @@ function jsonSections(sections) {
experimental: section.experimental(),
reference: section.reference(),
markup: section.markup() ? section.markup().toString() : null
- }
+ }
});
}
|
Preserve undefined and false markup() results
|
diff --git a/lib/cf/version.rb b/lib/cf/version.rb
index <HASH>..<HASH> 100644
--- a/lib/cf/version.rb
+++ b/lib/cf/version.rb
@@ -1,3 +1,3 @@
module CF
- VERSION = "4.1.0rc1".freeze
+ VERSION = "4.1.0rc2".freeze
end
|
Bump to <I>rc2
|
diff --git a/lib/appsignal.rb b/lib/appsignal.rb
index <HASH>..<HASH> 100644
--- a/lib/appsignal.rb
+++ b/lib/appsignal.rb
@@ -222,15 +222,9 @@ module Appsignal
# Sets the log level and sets the logger. Uses a file-based logger or the
# STDOUT-based logger. See the `:log` configuration option.
#
- # @param path_arg [nil] Deprecated param. Use the `:log_path`
- # configuration option instead.
# @return [void]
# @since 0.7.0
- def start_logger(path_arg = nil)
- if path_arg
- logger.info("Setting the path in start_logger has no effect anymore, set it in the config instead")
- end
-
+ def start_logger
if config && config[:log] == "file" && config.log_file_path
start_file_logger(config.log_file_path)
else
|
Remove deprecated `path_arg` argument from Appsignal.start_logger
Part of #<I>.
|
diff --git a/capi_experimental/deployment.go b/capi_experimental/deployment.go
index <HASH>..<HASH> 100644
--- a/capi_experimental/deployment.go
+++ b/capi_experimental/deployment.go
@@ -97,6 +97,10 @@ var _ = CapiExperimentalDescribe("deployment", func() {
Expect(deploymentGuid).ToNot(BeEmpty())
webishProcessType := fmt.Sprintf("web-deployment-%s", deploymentGuid)
+ secondDeploymentGuid := CreateDeployment(appGuid)
+ Expect(secondDeploymentGuid).ToNot(BeEmpty())
+ secondWebishProcessType := fmt.Sprintf("web-deployment-%s", secondDeploymentGuid)
+
Eventually(func() int {
guid := GetProcessGuidForType(appGuid, "web")
Expect(guid).ToNot(BeEmpty())
@@ -107,6 +111,10 @@ var _ = CapiExperimentalDescribe("deployment", func() {
return GetProcessGuidForType(appGuid, webishProcessType)
}).Should(BeEmpty())
+ Eventually(func() string {
+ return GetProcessGuidForType(appGuid, secondWebishProcessType)
+ }).Should(BeEmpty())
+
Eventually(func() int {
guid := GetProcessGuidForType(appGuid, "web")
Expect(guid).ToNot(BeEmpty())
|
Test the "deployment train" scenario in ZDT deployment test
Tests the happy-path scenario where two deployments for the same app
are occurring simultaneously
[finishes #<I>]
|
diff --git a/src/adapters/aol.js b/src/adapters/aol.js
index <HASH>..<HASH> 100644
--- a/src/adapters/aol.js
+++ b/src/adapters/aol.js
@@ -85,6 +85,7 @@ var AolAdapter = function AolAdapter() {
return {
adContainerId: _dummyUnit(bid.params.adContainerId),
+ server: bid.params.server, // By default, DAC.js will use the US region endpoint (adserver.adtechus.com)
sizeid: bid.params.sizeId,
pageid: bid.params.pageId,
secure: false,
|
Supporting adtech endpoint customization
|
diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index <HASH>..<HASH> 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -71,7 +71,7 @@ CodeMirror.defineSimpleMode("nsis",{
{regex: /[-+\/*=<>!]+/, token: "operator"},
// Variable
- {regex: /\$\w[\w\.]+/, token: "variable"},
+ {regex: /\$\w[\w\.]*/, token: "variable"},
// Constant
{regex: /\${[\!\w\.:-]+}/, token: "variable-2"},
|
[nsis mode] improve variable pattern
Follow-up to #<I> to support single letter variable names
|
diff --git a/lib/action_kit_api/page.rb b/lib/action_kit_api/page.rb
index <HASH>..<HASH> 100644
--- a/lib/action_kit_api/page.rb
+++ b/lib/action_kit_api/page.rb
@@ -2,16 +2,21 @@ require 'action_kit_api'
class ActionKitApi
class PageFactory
- end
-
- class Page < PageFactory
+ def create(name)
+ end
+
def self.find_by_name(name)
+ Page.new
end
def self.find_by_id(id)
+ Page.new
end
+ end
- def self.valid?
+ class Page < PageFactory
+ def valid?
+ return true
end
end
end
|
Fleshed out Page and PageFactory just enough to get cucumber to pass
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -295,7 +295,8 @@ function getLink(response, link) {
var pred = function(resource) {
return resource.sys.type === type && resource.sys.id === id;
};
- return _.find(response.items, pred) || _.find(response.includes[type], pred);
+ return _.find(response.items, pred) ||
+ response.includes && _.find(response.includes[type], pred);
}
function walkMutate(input, pred, mutator) {
|
Fix responses which don't have includes
|
diff --git a/fbo.js b/fbo.js
index <HASH>..<HASH> 100644
--- a/fbo.js
+++ b/fbo.js
@@ -4,8 +4,6 @@ var Texture = require( './texture' );
/**
* @class
* @param {WebGLRenderingContext} gl the webgl context this Fbo belongs to
- * @param {uint} width initial width of the fbo, the size can be later changed using Fbo#resize()
- * @param {uint} height initial height of the fbo, the size can be later changed using Fbo#resize()
* @param {Object} [opts]
* @param {boolean} [opts.depth=false] if true, a depth renderbuffer is attached
* @param {boolean} [opts.stencil=false] if true, a stencil renderbuffer is attached
|
fixed Fbo ctor doc
|
diff --git a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java
index <HASH>..<HASH> 100644
--- a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java
+++ b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java
@@ -1972,10 +1972,16 @@ public class ReferenceCountedOpenSslEngine extends SSLEngine implements Referenc
private SSLEngineResult.HandshakeStatus mayFinishHandshake(SSLEngineResult.HandshakeStatus status)
throws SSLException {
- if (status == NOT_HANDSHAKING && handshakeState != HandshakeState.FINISHED) {
- // If the status was NOT_HANDSHAKING and we not finished the handshake we need to call
- // SSL_do_handshake() again
- return handshake();
+ if (status == NOT_HANDSHAKING) {
+ if (handshakeState != HandshakeState.FINISHED) {
+ // If the status was NOT_HANDSHAKING and we not finished the handshake we need to call
+ // SSL_do_handshake() again
+ return handshake();
+ }
+ if (!isDestroyed() && SSL.bioLengthNonApplication(networkBIO) > 0) {
+ // We have something left that needs to be wrapped.
+ return NEED_WRAP;
+ }
}
return status;
}
|
Ensure we always wrap if there is something left to be send to the remote peer (#<I>)
Motivation:
We need to ensure we call wrap as long as there is something left to be send to the remote peer in cases of non-application data (like for example alerts).
Modifications:
Check the pending data and based on it return NEED_WRAP even when the handshake was done.
Result:
Always produce alerts etc
|
diff --git a/lib/preact.rb b/lib/preact.rb
index <HASH>..<HASH> 100644
--- a/lib/preact.rb
+++ b/lib/preact.rb
@@ -49,14 +49,12 @@ module Preact
logger.error "[Preact] No event specified, not logging event"
return nil
end
-
- person = configuration.convert_to_person(user).as_json
if event.is_a?(String)
preact_event = ActionEvent.new({
:name => event,
:timestamp => Time.now.to_f
- }).as_json
+ })
elsif event.is_a?(Hash)
preact_event = ActionEvent.new(event)
elsif !event.is_a?(ActionEvent)
@@ -67,8 +65,10 @@ module Preact
# attach the account info to the event
preact_event.account = configuration.convert_to_account(account).as_json
end
+
+ person = configuration.convert_to_person(user)
- send_log(person, preact_event)
+ send_log(person.as_json, preact_event.as_json)
end
def update_person(user)
|
fixed issue with string event_name + account
|
diff --git a/test/test_git_deploy.go b/test/test_git_deploy.go
index <HASH>..<HASH> 100644
--- a/test/test_git_deploy.go
+++ b/test/test_git_deploy.go
@@ -119,10 +119,9 @@ func (s *GitDeploySuite) runBuildpackTest(t *c.C, name string, resources []strin
t.Assert(push, Succeeds)
t.Assert(push, OutputContains, "Creating release")
t.Assert(push, OutputContains, "Application deployed")
+ t.Assert(push, OutputContains, "Added default web=1 formation")
t.Assert(push, OutputContains, "* [new branch] master -> master")
- t.Assert(r.flynn("scale", "web=1"), Succeeds)
-
route := name + ".dev"
newRoute := r.flynn("route", "add", "http", route)
t.Assert(newRoute, Succeeds)
|
test: Remove unnecessary scale after git push
The receiver already adds a web=1 formation, so the scale command after
the push always exits with "requested scale equals current scale,
nothing to do!".
|
diff --git a/lib/rom/adapter/sequel.rb b/lib/rom/adapter/sequel.rb
index <HASH>..<HASH> 100644
--- a/lib/rom/adapter/sequel.rb
+++ b/lib/rom/adapter/sequel.rb
@@ -9,7 +9,8 @@ module ROM
attr_reader :connection
def self.schemes
- [:sqlite, :jdbc]
+ %i(ado amalgalite cubrid db2 dbi do fdbsql firebird ibmdb informix jdbc
+ mysql mysql2 odbc openbase oracle postgres sqlanywhere sqlite swift tinytds)
end
def initialize(*args)
diff --git a/spec/unit/rom/adapter/sequel_spec.rb b/spec/unit/rom/adapter/sequel_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/rom/adapter/sequel_spec.rb
+++ b/spec/unit/rom/adapter/sequel_spec.rb
@@ -12,4 +12,13 @@ describe Adapter::Sequel do
end
end
end
+
+ describe ".schemes" do
+ it "returns a list of schemes supported by Sequel" do
+ schemes = %i(ado amalgalite cubrid db2 dbi do fdbsql firebird ibmdb informix jdbc
+ mysql mysql2 odbc openbase oracle postgres sqlanywhere sqlite swift tinytds)
+
+ expect(described_class.schemes).to eq schemes
+ end
+ end
end
|
Add support for all Sequel-backed RDBMS
Closes #<I>
|
diff --git a/Kwf/Model/Iterator/Packages.php b/Kwf/Model/Iterator/Packages.php
index <HASH>..<HASH> 100644
--- a/Kwf/Model/Iterator/Packages.php
+++ b/Kwf/Model/Iterator/Packages.php
@@ -33,6 +33,7 @@ class Kwf_Model_Iterator_Packages implements Iterator
$s->limit($this->_packageSize, $this->_currentOffset);
$this->_currentOffset += $this->_packageSize;
//$this->_innerIterator->getModel()->clearRows();
+ Kwf_Model_Abstract::clearAllRows();
$this->_innerIterator->rewind();
$ret = $this->_innerIterator->valid();
}
|
clear rows in packages iterator
it's the whole point of this iterator to use less memory
|
diff --git a/src/main/java/net/jodah/failsafe/AsyncExecution.java b/src/main/java/net/jodah/failsafe/AsyncExecution.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/jodah/failsafe/AsyncExecution.java
+++ b/src/main/java/net/jodah/failsafe/AsyncExecution.java
@@ -36,8 +36,6 @@ public final class AsyncExecution<R> extends AbstractExecution<R> {
// The outer-most function that executions begin with
private Function<AsyncExecution<R>, CompletableFuture<ExecutionResult>> outerFn;
private final boolean asyncExecution;
- // Whether a policy executor completed post execution
- private final boolean[] policyPostExecuted;
final FailsafeFuture<R> future;
// Per-attempt state --
@@ -45,6 +43,8 @@ public final class AsyncExecution<R> extends AbstractExecution<R> {
volatile boolean recordCalled;
// The future for the thread that the innerFn is running in
volatile Future<?> innerFuture;
+ // Whether a policy executor completed post execution
+ private final boolean[] policyPostExecuted;
AsyncExecution(List<Policy<R>> policies, Scheduler scheduler, FailsafeFuture<R> future, boolean asyncExecution,
Function<AsyncExecution<R>, CompletableFuture<ExecutionResult>> innerFn) {
|
Clarify that AsyncExecution.policyPostExecuted is per-attempt state
|
diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java
index <HASH>..<HASH> 100644
--- a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java
+++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java
@@ -1390,7 +1390,7 @@ public abstract class AbstractCacheRecordStore<R extends CacheRecord, CRM extend
Data key = entry.getKey();
Object value = entry.getValue();
if (value != null) {
- put(key, value, null, null, false, true, IGNORE_COMPLETION);
+ put(key, value, null, SOURCE_NOT_AVAILABLE, false, true, IGNORE_COMPLETION);
keysLoaded.add(key);
}
}
|
Fixed a missing SOURCE_NOT_AVAILABLE in AbstractCacheRecordStore.loadAll()
|
diff --git a/mode/css/css.js b/mode/css/css.js
index <HASH>..<HASH> 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -54,7 +54,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
if (/[\d.]/.test(stream.peek())) {
stream.eatWhile(/[\w.%]/);
return ret("number", "unit");
- } else if (stream.match(/^[^-]+-/)) {
+ } else if (stream.match(/^\w+-/)) {
return ret("meta", "meta");
}
} else if (/[,+>*\/]/.test(ch)) {
|
[css mode] Fixing a vendor prefix highlighting bug
A more detailed problem description in issue #<I>
|
diff --git a/lib/OktaHelpers.js b/lib/OktaHelpers.js
index <HASH>..<HASH> 100644
--- a/lib/OktaHelpers.js
+++ b/lib/OktaHelpers.js
@@ -64,8 +64,8 @@ function constructRecoveryQuestion(question, answer) {
*/
function constructCredentials(password, question, answer) {
var credentials = {};
- credentials.password = constructPassword(password);
- credentials.recovery_question = constructRecoveryQuestion(question, answer);
+ if(password) credentials.password = constructPassword(password);
+ if(question && answer) credentials.recovery_question = constructRecoveryQuestion(question, answer);
return credentials;
}
/**
|
Modified Helpers --> constructCredentials to allow a credentials object containing only the password to be created as this is a valid credentials object for creating a new profile.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -39,13 +39,15 @@ module.exports = function(config, fn) {
// return cached instance
if (fn._questions) return fn._questions;
+ var cwd = app.cwd || process.cwd();
var opts = utils.merge({}, app.options, config);
opts.data = app.cache.data || {};
- opts.cwd = app.cwd || process.cwd();
+ opts.cwd = cwd;
var Questions = app.Questions;
var questions = new Questions(opts);
fn._questions = questions;
+ questions.cwd = cwd;
var data = questions.data;
questions.on('ask', app.emit.bind(app, 'ask'));
|
ensure app.cwd is propagated onto app.questions
|
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index <HASH>..<HASH> 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -488,7 +488,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
`bin/rails g scaffold User name:string age:integer;
bin/rails db:migrate`
end
- assert_match(/8 runs, 13 assertions, 0 failures, 0 errors/, `bin/rails test 2>&1`)
+ assert_match(/8 runs, 10 assertions, 0 failures, 0 errors/, `bin/rails test 2>&1`)
end
end
@@ -502,7 +502,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
`bin/rails g scaffold User name:string age:integer;
bin/rails db:migrate`
end
- assert_match(/8 runs, 13 assertions, 0 failures, 0 errors/, `bin/rails test 2>&1`)
+ assert_match(/8 runs, 10 assertions, 0 failures, 0 errors/, `bin/rails test 2>&1`)
end
end
|
Fix more assertion counts.
Follow up to e<I>f<I>.
|
diff --git a/jax/interpreters/xla.py b/jax/interpreters/xla.py
index <HASH>..<HASH> 100644
--- a/jax/interpreters/xla.py
+++ b/jax/interpreters/xla.py
@@ -187,7 +187,7 @@ translations[core.identity_p] = lambda c, x: x
def zeros_like_translation_rule(c, x):
def _zeros_like(shape):
if shape.is_tuple():
- return c.Tuple(*tuple(_zeros_like(x) for x in shape.tuple_shapes()))
+ return c.Tuple(*(_zeros_like(x) for x in shape.tuple_shapes()))
else:
return c.Broadcast(c.Constant(onp.array(0, shape.element_type())),
shape.dimensions())
|
Write *(...) rather than *tuple(...).
|
diff --git a/i3ipc/i3ipc.py b/i3ipc/i3ipc.py
index <HASH>..<HASH> 100644
--- a/i3ipc/i3ipc.py
+++ b/i3ipc/i3ipc.py
@@ -589,7 +589,7 @@ class Connection(object):
def event_socket_teardown(self):
if self.sub_socket:
- self.sub_socket.shutdown(socket.SHUT_WR)
+ self.sub_socket.shutdown(socket.SHUT_RDWR)
self.sub_socket = None
def event_socket_poll(self):
|
use SHUT_RDWR for socket shutdown
|
diff --git a/reporters/beyond_compare.go b/reporters/beyond_compare.go
index <HASH>..<HASH> 100644
--- a/reporters/beyond_compare.go
+++ b/reporters/beyond_compare.go
@@ -1,5 +1,9 @@
package reporters
+import (
+ "runtime"
+)
+
type beyondCompare struct{}
// NewBeyondCompareReporter creates a new reporter for Beyond Compare 4.
@@ -9,7 +13,13 @@ func NewBeyondCompareReporter() Reporter {
func (s *beyondCompare) Report(approved, received string) bool {
xs := []string{received, approved}
- programName := "C:/Program Files/Beyond Compare 4/BComp.exe"
+ var programName string
+ switch runtime.GOOS {
+ case "windows":
+ programName = "C:/Program Files/Beyond Compare 4/BComp.exe"
+ case "darwin":
+ programName = "/Applications/Beyond Compare.app/Contents/MacOS/bcomp"
+ }
return launchProgram(programName, approved, xs...)
}
|
add OS X support for beyond compare
|
diff --git a/app/assets/javascripts/govuk_publishing_components/components/feedback.js b/app/assets/javascripts/govuk_publishing_components/components/feedback.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/govuk_publishing_components/components/feedback.js
+++ b/app/assets/javascripts/govuk_publishing_components/components/feedback.js
@@ -76,7 +76,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
this.somethingIsWrongButton.addEventListener('click', function (e) {
this.timerFunction = function () {
- this.timer = this.timer + 0.5
+ this.timer = this.timer + 1
this.timerHoneyPot.setAttribute('value', this.timer)
}
this.timerInterval = setInterval(this.timerFunction.bind(this), 500)
|
Use integer instead of float
Simplifies the implementation working with integers
|
diff --git a/src/angular-gridster.js b/src/angular-gridster.js
index <HASH>..<HASH> 100644
--- a/src/angular-gridster.js
+++ b/src/angular-gridster.js
@@ -1156,10 +1156,17 @@
oldSizeX = item.sizeX,
oldSizeY = item.sizeY,
hasCallback = gridster.resizable && gridster.resizable.resize;
- item.row = gridster.pixelsToRows(elmY, false);
- item.col = gridster.pixelsToColumns(elmX, false);
- item.sizeX = gridster.pixelsToColumns(elmW, true);
- item.sizeY = gridster.pixelsToRows(elmH, true);
+
+ var row = gridster.pixelsToRows(elmY, false);
+ var col = gridster.pixelsToColumns(elmX, false);
+ var sizeX = gridster.pixelsToColumns(elmW, true);
+ var sizeY = gridster.pixelsToRows(elmH, true);
+ if (gridster.pushing !== false || gridster.getItems(row, col, sizeX, sizeY, item).length === 0) {
+ item.row = row;
+ item.col = col;
+ item.sizeX = sizeX;
+ item.sizeY = sizeY;
+ }
if (
hasCallback || item.row !== oldRow || item.col !== oldCol || item.sizeX !== oldSizeX || item.sizeY !== oldSizeY
|
Fix disabling pushing for resizing too
|
diff --git a/test/class_builder_test.rb b/test/class_builder_test.rb
index <HASH>..<HASH> 100644
--- a/test/class_builder_test.rb
+++ b/test/class_builder_test.rb
@@ -38,13 +38,13 @@ class ClassBuilderTest < Test::Unit::TestCase
context 'the find_signal method' do
should 'find the signal "test" for TestObj' do
- builder = GirFFI::Builder::Class.new 'Everything', 'TestObj'
+ builder = GirFFI::Builder::Class.new 'Regress', 'TestObj'
sig = builder.find_signal 'test'
assert_equal 'test', sig.name
end
should 'find the signal "test" for TestSubObj' do
- builder = GirFFI::Builder::Class.new 'Everything', 'TestSubObj'
+ builder = GirFFI::Builder::Class.new 'Regress', 'TestSubObj'
sig = builder.find_signal 'test'
assert_equal 'test', sig.name
end
|
Make tests in ClassBuilderTest pass by changing Everything to Regress.
|
diff --git a/src/server/pps/persist/server/rethink_api_server.go b/src/server/pps/persist/server/rethink_api_server.go
index <HASH>..<HASH> 100644
--- a/src/server/pps/persist/server/rethink_api_server.go
+++ b/src/server/pps/persist/server/rethink_api_server.go
@@ -363,7 +363,8 @@ func (a *rethinkAPIServer) UpdatePipelineInfo(ctx context.Context, request *pers
if request.CreatedAt != nil {
return nil, ErrTimestampSet
}
- if err := a.updateMessage(pipelineInfosTable, request); err != nil {
+ doc := gorethink.Expr(request).Without("CreatedAt")
+ if _, err := a.getTerm(pipelineInfosTable).Insert(doc, gorethink.InsertOpts{Conflict: "update"}).RunWrite(a.session); err != nil {
return nil, err
}
return google_protobuf.EmptyInstance, nil
|
UpdatePipeline no longer clears CreatedAt field.
|
diff --git a/shared/tooltip.js b/shared/tooltip.js
index <HASH>..<HASH> 100644
--- a/shared/tooltip.js
+++ b/shared/tooltip.js
@@ -12,13 +12,12 @@ class UIManager {
.attr("class", "tooltip")
.style("font-size", "2em")
.style("opacity", 0)
- .style("padding", "4em");
+ .style("padding", "2em");
this.stateToggle = renderer.root.append("div")
.attr("class", "stateButtonDiv")
.style("right" , 0)
.style("bottom", 0)
- .style("padding", "4em")
.append("input")
.attr("class", "stateButton")
.attr("type", "button")
@@ -60,7 +59,7 @@ class UIManager {
.style("opacity", 1);
this.tip
.text("agent: " + d.data.label)
- .style('color', d.data.color.brighter());
+ .style('color', d.data.color);
}
|
modified viz to look fit within application
|
diff --git a/tests/test_package.py b/tests/test_package.py
index <HASH>..<HASH> 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -53,5 +53,5 @@ def test_sign_file_with_identity(monkeypatch):
pkg.sign('gpg', 'identity')
except IOError:
pass
- args = ('gpg', '--detach-sign', '-a', filename, '--local-user', 'identity')
+ args = ('gpg', '--detach-sign', '--local-user', 'identity', '-a', filename)
assert replaced_check_call.calls == [pretend.call(args)]
diff --git a/twine/package.py b/twine/package.py
index <HASH>..<HASH> 100644
--- a/twine/package.py
+++ b/twine/package.py
@@ -143,9 +143,10 @@ class PackageFile(object):
def sign(self, sign_with, identity):
print("Signing {0}".format(self.basefilename))
- gpg_args = (sign_with, "--detach-sign", "-a", self.filename)
+ gpg_args = (sign_with, "--detach-sign")
if identity:
gpg_args += ("--local-user", identity)
+ gpg_args += ("-a", self.filename)
subprocess.check_call(gpg_args)
with open(self.signed_filename, "rb") as gpg:
|
Place --local-user and argument in middle of sign
Placing --local-user and its argument after the filename makes gpg
think it is the file you're trying to sign. This was re-ordered
accidentally during my refacorting efforts which broke signing.
Closes #<I>
|
diff --git a/src/primitives.js b/src/primitives.js
index <HASH>..<HASH> 100644
--- a/src/primitives.js
+++ b/src/primitives.js
@@ -46,7 +46,7 @@
*
* example:
*
- * const arrays = twgl.primitives.createPlaneArrays(1);
+ * const arrays = twgl.primitives.createPlaneVertices(1);
* twgl.primitives.reorientVertices(arrays, m4.rotationX(Math.PI * 0.5));
* const bufferInfo = twgl.createBufferInfoFromArrays(gl, arrays);
*
|
Fix comment in primitives.js
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
name='yoti',
version=VERSION,
packages=find_packages(),
- license='OTHER',
+ license='MIT',
description='The Yoti Python SDK, providing API support for Login, Verify (2FA) and Age Verification.',
long_description=long_description,
url='https://github.com/getyoti/yoti-python-sdk',
@@ -24,7 +24,7 @@ setup(
},
classifiers=[
'Development Status :: 5 - Production/Stable',
- 'License :: Other/Proprietary License',
+ 'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Intended Audience :: Developers',
'Programming Language :: Python',
|
[SDK-<I>]: Updated setup.py after changing license
|
diff --git a/lib/zyps.rb b/lib/zyps.rb
index <HASH>..<HASH> 100644
--- a/lib/zyps.rb
+++ b/lib/zyps.rb
@@ -196,7 +196,7 @@ class Color
attr_accessor :red, :green, :blue
def initialize (red = 1, green = 1, blue = 1)
- @red, @green, @blue = red, green, blue
+ self.red, self.green, self.blue = red, green, blue
end
#Automatically constrains value to the range 0 - 1.
|
Color.new was allowing channel values > 1; fixed.
|
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index <HASH>..<HASH> 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -624,6 +624,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
defKeywords: words("class val var object interface fun"),
atoms: words("true false null this"),
hooks: {
+ "@": function(stream) {
+ stream.eatWhile(/[\w\$_]/);
+ return "meta";
+ },
'"': function(stream, state) {
state.tokenize = tokenKotlinString(stream.match('""'));
return state.tokenize(stream, state);
|
[clike] Support @-identifiers in Kotlin mode
|
diff --git a/kaybee/app.py b/kaybee/app.py
index <HASH>..<HASH> 100644
--- a/kaybee/app.py
+++ b/kaybee/app.py
@@ -14,8 +14,10 @@ import dectate
from kaybee.plugins.debugdumper.action import DumperAction
from kaybee.plugins.events import EventAction
+from kaybee.plugins.resources.action import ResourceAction
class kb(dectate.App):
event = dectate.directive(EventAction)
dumper = dectate.directive(DumperAction)
+ resource = dectate.directive(ResourceAction)
|
@wip Forgot to add resource as an action.
|
diff --git a/src/bootstrap.php b/src/bootstrap.php
index <HASH>..<HASH> 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -17,6 +17,9 @@ namespace Fuel\Common;
// register the services of this composer library
\Dependency::getInstance()->registerService(new ServicesProvider);
+// alias helper classes to global
+\Alias::alias('Fuel\Common\Str', 'Str');
+
/**
* FuelPHP Composer library application bootstrap
*/
|
aliased Str helper class to global
|
diff --git a/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java b/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java
@@ -32,6 +32,7 @@ import org.acegisecurity.MockApplicationContext;
* The HttpSessionEventPublisher tests
*
* @author Ray Krueger
+ * @version $Id$
*/
public class HttpSessionEventPublisherTests extends TestCase {
//~ Methods ================================================================
@@ -90,7 +91,7 @@ public class HttpSessionEventPublisherTests extends TestCase {
pub.getContext();
fail("IllegalArgumentException expected, the context is null");
} catch (IllegalArgumentException e) {
- e.printStackTrace();
+ assertTrue(true);
}
}
}
|
Removed printStackTrace from expected exception.
|
diff --git a/test/Utils/Flex/FlexExecCommandTest.php b/test/Utils/Flex/FlexExecCommandTest.php
index <HASH>..<HASH> 100644
--- a/test/Utils/Flex/FlexExecCommandTest.php
+++ b/test/Utils/Flex/FlexExecCommandTest.php
@@ -125,10 +125,9 @@ class FlexExecCommandTest extends \PHPUnit_Framework_TestCase
]
);
// Check the contents of the generated cloudbuild.yaml
- $cloudbuild = file_get_contents("$this->workdir/cloudbuild.yaml");
- $this->assertEquals(
- file_get_contents($cloudbuildYaml),
- $cloudbuild
+ $this->assertFileEquals(
+ $cloudbuildYaml,
+ sprintf('%s/cloudbuild.yaml', $this->workdir)
);
}
|
Use assertFileEquals (#<I>)
|
diff --git a/symphony/lib/boot/defines.php b/symphony/lib/boot/defines.php
index <HASH>..<HASH> 100644
--- a/symphony/lib/boot/defines.php
+++ b/symphony/lib/boot/defines.php
@@ -242,15 +242,19 @@ define_safe('__SECURE__',
/**
* The root url directory.
+ * This constant will always ends with '/'
+ * to avoid problems when the root is simply /
+ *
+ * @since Symphony 2.7.0
* @var string
*/
-define_safe('DIRROOT', rtrim(dirname(server_safe('PHP_SELF')), '\/'));
+define_safe('DIRROOT', rtrim(dirname(server_safe('PHP_SELF')), '\/') . '/');
/**
* The current domain name.
* @var string
*/
-define_safe('DOMAIN', HTTP_HOST . DIRROOT);
+define_safe('DOMAIN', HTTP_HOST . rtrim(DIRROOT, '/'));
/**
* The base URL of this Symphony install, minus the symphony path.
|
Make sure the DIRROOT constant ends with a /
This should make is easier to use it.
Re: #<I>
Picked from b6d9edbb<I>
|
diff --git a/migrator.go b/migrator.go
index <HASH>..<HASH> 100644
--- a/migrator.go
+++ b/migrator.go
@@ -171,8 +171,7 @@ func (m Migrator) Reset() error {
// CreateSchemaMigrations sets up a table to track migrations. This is an idempotent
// operation.
-func (m Migrator) CreateSchemaMigrations() error {
- c := m.Connection
+func CreateSchemaMigrations(c *Connection) error {
mtn := c.MigrationTableName()
err := c.Open()
if err != nil {
@@ -197,6 +196,12 @@ func (m Migrator) CreateSchemaMigrations() error {
})
}
+// CreateSchemaMigrations sets up a table to track migrations. This is an idempotent
+// operation.
+func (m Migrator) CreateSchemaMigrations() error {
+ return CreateSchemaMigrations(m.Connection)
+}
+
// Status prints out the status of applied/pending migrations.
func (m Migrator) Status(out io.Writer) error {
err := m.CreateSchemaMigrations()
|
feat: make CreateSchemaMigrations independent of the migrator (#<I>)
|
diff --git a/ceph_deploy/connection.py b/ceph_deploy/connection.py
index <HASH>..<HASH> 100644
--- a/ceph_deploy/connection.py
+++ b/ceph_deploy/connection.py
@@ -16,8 +16,8 @@ def get_connection(hostname, username, logger, threads=5, use_sudo=None):
conn = remoto.Connection(
hostname,
logger=logger,
- sudo=use_sudo,
threads=threads,
+ detect_sudo=True,
)
# Set a timeout value in seconds to disconnect and move on
|
use the new sudo detection magic from remoto
|
diff --git a/aiosparql/__init__.py b/aiosparql/__init__.py
index <HASH>..<HASH> 100644
--- a/aiosparql/__init__.py
+++ b/aiosparql/__init__.py
@@ -1,2 +1,2 @@
-__version__ = version = "0.1.1"
+__version__ = version = "0.1.2"
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
|
Bumped to version <I>
|
diff --git a/docs/src/Home.js b/docs/src/Home.js
index <HASH>..<HASH> 100644
--- a/docs/src/Home.js
+++ b/docs/src/Home.js
@@ -25,7 +25,7 @@ var Home = React.createClass({
<p>Learn Ligo in a few simple steps.</p>
<Link to="hello world" className="call-to-action">Hello World</Link>
<p></p>
- <a href="/">Demo</a>
+ <a href="/demo">Demo</a>
<a href="https://github.com/HewlettPackard/Ligo">GitHub</a>
</Panel>
</Panel>
|
Fixing the path for the demo app.
|
diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb
index <HASH>..<HASH> 100644
--- a/activeresource/test/cases/base_test.rb
+++ b/activeresource/test/cases/base_test.rb
@@ -5,6 +5,7 @@ require "fixtures/street_address"
require "fixtures/beast"
require "fixtures/proxy"
require 'active_support/core_ext/hash/conversions'
+require 'mocha'
class BaseTest < Test::Unit::TestCase
def setup
|
method_missing errors on activeresource tests, mocha is not required there
[#<I> state:committed]
|
diff --git a/tags/image.js b/tags/image.js
index <HASH>..<HASH> 100644
--- a/tags/image.js
+++ b/tags/image.js
@@ -16,7 +16,7 @@ steal.then(function() {
*/
DocumentJS.tags.image = {
add: function( line ) {
- var m = line.match(/^\s*@image\s*([\w\.\/]*)\s*([\w]*)\s*([\w]*)\s*(.*)/)
+ var m = line.match(/^\s*@image\s*([^\s]+)\s*([\w]*)\s*([\w]*)\s*(.*)/)
if ( m ) {
var src = m[1] ? m[1].toLowerCase() : '';
|
fix for images w/ special characters in them breaking
|
diff --git a/test/units/geminabox/proxy/splicer_test.rb b/test/units/geminabox/proxy/splicer_test.rb
index <HASH>..<HASH> 100644
--- a/test/units/geminabox/proxy/splicer_test.rb
+++ b/test/units/geminabox/proxy/splicer_test.rb
@@ -46,11 +46,6 @@ module Geminabox
)
end
- def test_local_file_path
- expected = File.expand_path(file_name, Geminabox::Server.data)
- assert_equal expected, splice.local_path
- end
-
# This test seems unstable, and I'm not sure why.
def xtest_local_file_path
expected = File.expand_path(file_name, File.join(Geminabox::Server.data, 'proxy'))
|
Test was hidden by same name.
Removing it as it seems to never pass.
|
diff --git a/cmd/utils.go b/cmd/utils.go
index <HASH>..<HASH> 100644
--- a/cmd/utils.go
+++ b/cmd/utils.go
@@ -265,9 +265,9 @@ func NewCustomHTTPTransport() http.RoundTripper {
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}).DialContext,
- MaxIdleConns: 100,
- MaxIdleConnsPerHost: 100,
- IdleConnTimeout: 90 * time.Second,
+ MaxIdleConns: 1024,
+ MaxIdleConnsPerHost: 1024,
+ IdleConnTimeout: 30 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
TLSClientConfig: &tls.Config{RootCAs: globalRootCAs},
|
Increased MaxIdleConnsPerHost to prevent excessive re-connections and TIME_WAIT when more than <I> clients are using minio (#<I>)
|
diff --git a/xmantissa/test/test_stats.py b/xmantissa/test/test_stats.py
index <HASH>..<HASH> 100644
--- a/xmantissa/test/test_stats.py
+++ b/xmantissa/test/test_stats.py
@@ -31,6 +31,18 @@ class RemoteStatsCollectorTest(BoxReceiverFactoryPowerupTestMixin, unittest.Test
self.sender = CollectingSender()
self.receiver.startReceivingBoxes(self.sender)
+
+ def tearDown(self):
+ """
+ Ensure the log observer added by L{setUp} is removed.
+ """
+ try:
+ log.removeObserver(self.receiver._emit)
+ except ValueError:
+ # The test removed it already.
+ pass
+
+
def test_deliverStatEvents(self):
"""
When a L{RemoteStatsCollector} is active, it sends AMP boxes
|
Merge fix-log-observers-<I>
Author: exarkun
Reviewer: washort
Fixes: #<I>
Clean up stats-related log observers at the end of the stats tests
so that global state is the same before and after those tests and
to avoid keeping a ton of extra data in memory for the entire test
suite run.
|
diff --git a/admin/index.php b/admin/index.php
index <HASH>..<HASH> 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -350,8 +350,7 @@
/// If successful, continue upgrading roles and setting everything properly
if ($status) {
if (empty($CFG->rolesactive)) {
-
- /// Groups upgrade is now in core above.
+ // Groups upgrade is now in core above.
// Upgrade to the roles system.
moodle_install_roles();
@@ -359,13 +358,10 @@
} else if (!update_capabilities()) {
print_error('cannotupgradecapabilities', 'debug');
}
+
// update core events
events_update_definition();
- require_once($CFG->libdir.'/statslib.php');
- if (!stats_upgrade_for_roles_wrapper()) {
- notify('Couldn\'t upgrade the stats tables to use the new roles system');
- }
if (set_config("version", $version)) {
remove_dir($CFG->dataroot . '/cache', true); // flush cache
notify($strdatabasesuccess, "green");
|
MDL-<I> Old stats upgrade that we don't need any more
|
diff --git a/lib/model.js b/lib/model.js
index <HASH>..<HASH> 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -459,12 +459,12 @@ assign(derived, {
Object.keys(CONNECTION_STRING_OPTIONS).forEach((item) => {
if (typeof this[item] !== 'undefined' && !req.query[item]) {
- if (item === 'compression' && this.compression) {
- if (this.compression.compressors) {
+ if (item === 'compression') {
+ if (this.compression && this.compression.compressors) {
req.query.compressors = this.compression.compressors.join(',');
}
- if (this.compression.zlibCompressionLevel) {
+ if (this.compression && this.compression.zlibCompressionLevel) {
req.query.zlibCompressionLevel = this.compression.zlibCompressionLevel;
}
} else if (item === 'authMechanismProperties') {
|
refactor: clean uri from an empty compression (#<I>)
|
diff --git a/LeanMapper/Result.php b/LeanMapper/Result.php
index <HASH>..<HASH> 100644
--- a/LeanMapper/Result.php
+++ b/LeanMapper/Result.php
@@ -144,9 +144,6 @@ class Result implements \Iterator
if (!isset($this->data[$id])) {
throw new InvalidArgumentException("Missing row with ID $id.");
}
- if (!$this->isDetached($id) and !array_key_exists($key, $this->data[$id])) {
- throw new InvalidArgumentException("Missing field '$key' in row.");
- }
if ($key === 'id' and !$this->isDetached($id)) {
throw new InvalidArgumentException("ID can only be set in detached rows.");
}
|
LeanMapper\Result: removed impractical obstruction in setDataEntry
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.