diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/MEA_package/ProgramFiles/regression_tests.py b/MEA_package/ProgramFiles/regression_tests.py index <HASH>..<HASH> 100755 --- a/MEA_package/ProgramFiles/regression_tests.py +++ b/MEA_package/ProgramFiles/regression_tests.py @@ -28,9 +28,6 @@ def create_options_parser(): # install it if os.p...
removed the /usr/share sundials loc as we dont need it
diff --git a/manticore/platforms/linux.py b/manticore/platforms/linux.py index <HASH>..<HASH> 100644 --- a/manticore/platforms/linux.py +++ b/manticore/platforms/linux.py @@ -868,7 +868,7 @@ class Linux(Platform): for mpath in env['LD_LIBRARY_PATH'].split(":"): interpreter_path_fil...
Fixed variable name typo. Issue #<I>. (#<I>)
diff --git a/src/client/websocket/packets/WebSocketPacketManager.js b/src/client/websocket/packets/WebSocketPacketManager.js index <HASH>..<HASH> 100644 --- a/src/client/websocket/packets/WebSocketPacketManager.js +++ b/src/client/websocket/packets/WebSocketPacketManager.js @@ -95,6 +95,11 @@ class WebSocketPacketManag...
"knock, knock. who's there. discord, lol" (#<I>)
diff --git a/src/main/java/com/microsoft/aad/adal4j/AuthenticationAuthority.java b/src/main/java/com/microsoft/aad/adal4j/AuthenticationAuthority.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/microsoft/aad/adal4j/AuthenticationAuthority.java +++ b/src/main/java/com/microsoft/aad/adal4j/AuthenticationAuthorit...
adding login.microsoftonline.us to Authority trusted hosts list
diff --git a/src/Watson/Sitemap/Sitemap.php b/src/Watson/Sitemap/Sitemap.php index <HASH>..<HASH> 100644 --- a/src/Watson/Sitemap/Sitemap.php +++ b/src/Watson/Sitemap/Sitemap.php @@ -136,7 +136,17 @@ class Sitemap */ public function xml() { - return $this->renderSitemap()->getOriginalContent(); +...
Add method to get original content from index (#<I>)
diff --git a/lib/faker/business.rb b/lib/faker/business.rb index <HASH>..<HASH> 100644 --- a/lib/faker/business.rb +++ b/lib/faker/business.rb @@ -10,7 +10,7 @@ module Faker end def credit_card_expiry_date - ::Date.today + (365 * rand(1..4)) + ::Date.today + (365 * (rand(4) + 1)) en...
fixed for compatibility with ruby <I>
diff --git a/library/src/com/johnliu/swipefinish/core/SwipeFinishActivity.java b/library/src/com/johnliu/swipefinish/core/SwipeFinishActivity.java index <HASH>..<HASH> 100644 --- a/library/src/com/johnliu/swipefinish/core/SwipeFinishActivity.java +++ b/library/src/com/johnliu/swipefinish/core/SwipeFinishActivity.java @...
Add some comments for SwipeFinshActivity.
diff --git a/controllers/FrontController.php b/controllers/FrontController.php index <HASH>..<HASH> 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -221,9 +221,9 @@ class FrontController $video = $this->download->getJSON($url, $format); $client = new \GuzzleHttp\C...
Don't include Content-Length for now
diff --git a/telegram_handler/formatters.py b/telegram_handler/formatters.py index <HASH>..<HASH> 100644 --- a/telegram_handler/formatters.py +++ b/telegram_handler/formatters.py @@ -32,7 +32,7 @@ class StyledFormatter(TelegramFormatter): def __init__(self, *args, **kwargs): if 'escape_message' in kwarg...
Setting escape_message field missed
diff --git a/web/concrete/core/models/file.php b/web/concrete/core/models/file.php index <HASH>..<HASH> 100644 --- a/web/concrete/core/models/file.php +++ b/web/concrete/core/models/file.php @@ -443,11 +443,14 @@ class Concrete5_Model_File extends Object { if ($fvID == null) { $fvID = $this->fvID; // approved ve...
Fix Version Display in Dashboard Fix version display in dashboard view. `$this->fv` was storing on file version and caching that. This caused the same version as the first one to always be returned. Change to `CacheLocal::set()` `CacheLocal::getEntry()` Former-commit-id: 4fd6fa<I>b2e<I>deeb<I>ff3cbb8c<I>cbf<I>fe0f
diff --git a/verisure/session.py b/verisure/session.py index <HASH>..<HASH> 100644 --- a/verisure/session.py +++ b/verisure/session.py @@ -91,6 +91,7 @@ class Session(object): self._request_cookies = None # The login with stored cookies failed, try to get a new one + last_exception = None...
Raise on login error, after all attempts are exhausted (#<I>)
diff --git a/lib/nucleon/action/node/provision.rb b/lib/nucleon/action/node/provision.rb index <HASH>..<HASH> 100644 --- a/lib/nucleon/action/node/provision.rb +++ b/lib/nucleon/action/node/provision.rb @@ -69,7 +69,7 @@ class Provision < Nucleon.plugin_class(:nucleon, :cloud_action) end ...
Adding time output variable to the provision node action provider.
diff --git a/lib/iso/iban.rb b/lib/iso/iban.rb index <HASH>..<HASH> 100644 --- a/lib/iso/iban.rb +++ b/lib/iso/iban.rb @@ -2,6 +2,7 @@ require 'iso/iban/specification' require 'iso/iban/version' +require 'yaml' module ISO
Require yaml.
diff --git a/django_jenkins/runner.py b/django_jenkins/runner.py index <HASH>..<HASH> 100644 --- a/django_jenkins/runner.py +++ b/django_jenkins/runner.py @@ -136,10 +136,11 @@ class CITestSuiteRunner(DiscoverRunner): """ Continuous integration test runner """ - def __init__(self, output_dir, with_rep...
Allow to use pdb under jenkins Close #<I>
diff --git a/great_expectations/data_context/datasource/databricks_generator.py b/great_expectations/data_context/datasource/databricks_generator.py index <HASH>..<HASH> 100644 --- a/great_expectations/data_context/datasource/databricks_generator.py +++ b/great_expectations/data_context/datasource/databricks_generator....
Update timestamp generation for databricks_generator
diff --git a/lib/fog/ibm/models/compute/server.rb b/lib/fog/ibm/models/compute/server.rb index <HASH>..<HASH> 100644 --- a/lib/fog/ibm/models/compute/server.rb +++ b/lib/fog/ibm/models/compute/server.rb @@ -150,7 +150,7 @@ module Fog # Expires the instance immediately def expire! - expire_a...
[ibm] Set expire a few seconds in the future since it takes a while to process
diff --git a/ssllabs-scan.go b/ssllabs-scan.go index <HASH>..<HASH> 100644 --- a/ssllabs-scan.go +++ b/ssllabs-scan.go @@ -391,19 +391,19 @@ func invokeGetRepeatedly(url string) (*http.Response, []byte, error) { return resp, body, nil } else { - if err.Error() == "EOF" { + if strings.Contains(err.Error(), ...
Fix retry on HTTP EOF.
diff --git a/modeshape-jcr/src/main/java/org/modeshape/jcr/JcrSession.java b/modeshape-jcr/src/main/java/org/modeshape/jcr/JcrSession.java index <HASH>..<HASH> 100644 --- a/modeshape-jcr/src/main/java/org/modeshape/jcr/JcrSession.java +++ b/modeshape-jcr/src/main/java/org/modeshape/jcr/JcrSession.java @@ -1256,14 +1256...
MODE-<I>: Add permission checking using ACM within authorizer block
diff --git a/src/Response/Status.php b/src/Response/Status.php index <HASH>..<HASH> 100644 --- a/src/Response/Status.php +++ b/src/Response/Status.php @@ -65,11 +65,11 @@ class Status implements ResponseInterface switch ($payload) { case 'OK': case 'QUEUED': - if (!isse...
Apply easy micro-optimization.
diff --git a/router/routes.go b/router/routes.go index <HASH>..<HASH> 100644 --- a/router/routes.go +++ b/router/routes.go @@ -150,11 +150,12 @@ func (rm *RouteManager) Route(route *Route, logstream chan *Message) { } func (rm *RouteManager) RoutingFrom(containerID string) bool { - routing := false for _, router ...
Simplify and add early exit to RoutingFrom
diff --git a/xerox/darwin.py b/xerox/darwin.py index <HASH>..<HASH> 100644 --- a/xerox/darwin.py +++ b/xerox/darwin.py @@ -14,7 +14,7 @@ def copy(string): """Copy given string into system clipboard.""" try: subprocess.Popen(['pbcopy'], stdin=subprocess.PIPE).communicate(str(unicode(string))) - exc...
Use `except Exception as why` syntax rather than `except Exception, why`
diff --git a/src/array.js b/src/array.js index <HASH>..<HASH> 100644 --- a/src/array.js +++ b/src/array.js @@ -69,6 +69,9 @@ class RynoArray extends RynoObject { // Public: Returns the current length of the array. get length() { return this.__elements__.length; } + // Public: Returns the backing native array. ...
Adds Array#native property.
diff --git a/test/actions/pulp3/orchestration/file_delete_test.rb b/test/actions/pulp3/orchestration/file_delete_test.rb index <HASH>..<HASH> 100644 --- a/test/actions/pulp3/orchestration/file_delete_test.rb +++ b/test/actions/pulp3/orchestration/file_delete_test.rb @@ -9,7 +9,7 @@ class FileDeleteTest < ActiveSupport:...
Fixes #<I> - repairs file delete test setup
diff --git a/lib/ways.js b/lib/ways.js index <HASH>..<HASH> 100644 --- a/lib/ways.js +++ b/lib/ways.js @@ -35,11 +35,15 @@ module.exports = function(pattern, runner, destroyer, dependency){ exports = module.exports; +exports.init = function() { + dispatch(this.pathname()); +}; + exports.mode = function (m){ r...
adding `init` method to keep state clean
diff --git a/src/main/java/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java b/src/main/java/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java index <HASH>..<HASH> 100755 --- a/src/main/java/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java +++ b/src/main/java/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java @@ -181,7 +181,7 ...
make an envy class have to dominate other enviors
diff --git a/release/golden_notebook_tests/workloads/torch_tune_serve_test.py b/release/golden_notebook_tests/workloads/torch_tune_serve_test.py index <HASH>..<HASH> 100644 --- a/release/golden_notebook_tests/workloads/torch_tune_serve_test.py +++ b/release/golden_notebook_tests/workloads/torch_tune_serve_test.py @@ -1...
[train/serve] Fix torch tune serve test (#<I>) #<I> broke the smoke test as it was not run on CI - this PR hotfixes this
diff --git a/rest-provider/src/main/java/org/jboss/pressgang/ccms/wrapper/RESTTranslatedCSNodeV1Wrapper.java b/rest-provider/src/main/java/org/jboss/pressgang/ccms/wrapper/RESTTranslatedCSNodeV1Wrapper.java index <HASH>..<HASH> 100644 --- a/rest-provider/src/main/java/org/jboss/pressgang/ccms/wrapper/RESTTranslatedCSNo...
Fixed a bug where the Translated CSNode Revision attribute wasn't being set to be saved.
diff --git a/web/opensubmit/admin/submission.py b/web/opensubmit/admin/submission.py index <HASH>..<HASH> 100644 --- a/web/opensubmit/admin/submission.py +++ b/web/opensubmit/admin/submission.py @@ -233,11 +233,8 @@ class SubmissionAdmin(ModelAdmin): ''' if db_field.name == "grading": sub...
Show only assignment grading options, fixes regression of #<I>
diff --git a/emit/router.py b/emit/router.py index <HASH>..<HASH> 100644 --- a/emit/router.py +++ b/emit/router.py @@ -278,9 +278,12 @@ class Router(object): pass for origin in resolved: - self.routes.setdefault(origin, set()) - self.routes[origin].add(desti...
fix too much logging in regenerate_routes
diff --git a/downhill/base.py b/downhill/base.py index <HASH>..<HASH> 100644 --- a/downhill/base.py +++ b/downhill/base.py @@ -132,7 +132,8 @@ class Optimizer(util.Registrar(str('Base'), (), {})): yield vel_tm1, vel_t if self.nesterov: # https://github.com/lisa-lab...
Reformulate nesterov update after rereading paper.
diff --git a/account/src/test/java/com/ning/billing/account/AccountTestSuite.java b/account/src/test/java/com/ning/billing/account/AccountTestSuite.java index <HASH>..<HASH> 100644 --- a/account/src/test/java/com/ning/billing/account/AccountTestSuite.java +++ b/account/src/test/java/com/ning/billing/account/AccountTest...
account: make AccountTestSuite abstract
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index <HASH>..<HASH> 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -26,7 +26,7 @@ module ActiveRecord def test_initialize_single_values relation = Relati...
value_methods on Relation are public methods
diff --git a/src/javascript/runtime/RuntimeClient.js b/src/javascript/runtime/RuntimeClient.js index <HASH>..<HASH> 100644 --- a/src/javascript/runtime/RuntimeClient.js +++ b/src/javascript/runtime/RuntimeClient.js @@ -48,6 +48,7 @@ define('moxie/runtime/RuntimeClient', [ constructor = Runtime.getConstructor(type...
RuntimeClient: Add missing return after fallback.
diff --git a/tests/Unit/Suites/Product/Block/FilterNavigationBlockTest.php b/tests/Unit/Suites/Product/Block/FilterNavigationBlockTest.php index <HASH>..<HASH> 100644 --- a/tests/Unit/Suites/Product/Block/FilterNavigationBlockTest.php +++ b/tests/Unit/Suites/Product/Block/FilterNavigationBlockTest.php @@ -46,10 +46,11 ...
Issue #<I>: Refactor FilterNavigationBlockTest
diff --git a/etcdctlv3/main.go b/etcdctlv3/main.go index <HASH>..<HASH> 100644 --- a/etcdctlv3/main.go +++ b/etcdctlv3/main.go @@ -43,9 +43,9 @@ var ( func init() { rootCmd.PersistentFlags().StringVar(&globalFlags.Endpoints, "endpoint", "127.0.0.1:2378", "gRPC endpoint") - rootCmd.PersistentFlags().StringVar(&glob...
etcdctlv3: secure is not HTTPS
diff --git a/treeherder/etl/push_loader.py b/treeherder/etl/push_loader.py index <HASH>..<HASH> 100644 --- a/treeherder/etl/push_loader.py +++ b/treeherder/etl/push_loader.py @@ -160,6 +160,15 @@ class GithubPushTransformer(GithubTransformer): URL_BASE = "https://api.github.com/repos/{}/{}/compare/{}...{}" + ...
Bug <I> - Fix KeyError in tag push situation of GithubPushTransformer (#<I>) * fix: KeyError when GithubPushTransformer.get_branch's called when tag push triggers * chore: remove unused whitespace
diff --git a/lib/active_record/postgresql_extensions/types.rb b/lib/active_record/postgresql_extensions/types.rb index <HASH>..<HASH> 100644 --- a/lib/active_record/postgresql_extensions/types.rb +++ b/lib/active_record/postgresql_extensions/types.rb @@ -6,7 +6,23 @@ module ActiveRecord class PostgreSQLAdapter ...
Only return base and user-created types and not TOAST types and the like.
diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go index <HASH>..<HASH> 100644 --- a/cmd/torrent/main.go +++ b/cmd/torrent/main.go @@ -183,6 +183,9 @@ func main() { func mainErr() error { tagflag.Parse(&flags) defer envpprof.Stop() + if stdoutAndStderrAreSameFile() { + log.Default = log.Logger{log.StreamLogge...
cmd/torrent: Move log setup earlier to avoid race
diff --git a/src/commands-api.js b/src/commands-api.js index <HASH>..<HASH> 100644 --- a/src/commands-api.js +++ b/src/commands-api.js @@ -22,6 +22,7 @@ import { locatorBuilders } from "./record"; export const selenium = new Selenium(BrowserBot.createForWindow(window)); let contentSideexTabId = window.contentSideex...
keep the reference to the locator builder
diff --git a/src/tablesort.js b/src/tablesort.js index <HASH>..<HASH> 100644 --- a/src/tablesort.js +++ b/src/tablesort.js @@ -117,7 +117,10 @@ }; // Sort as number if a currency key exists or number - if (item.match(/^-?[£\x24Û¢´]\d/) || item.match(/^-?(\d+[,\.]?)+(E[\-+][\d]+)?%...
Fix #<I>: Recognized € as currency - Recognize both "€5" and "5€" - Also recognize if space in between: "€ 5", "5 €", "$5"
diff --git a/devices/philips.js b/devices/philips.js index <HASH>..<HASH> 100644 --- a/devices/philips.js +++ b/devices/philips.js @@ -1843,6 +1843,15 @@ module.exports = [ ota: ota.zigbeeOTA, }, { + zigbeeModel: ['3418331P6'], + model: '3418331P6', + vendor: 'Philips', + ...
Add <I>P6 (#<I>) * Add support for <I>P6 * add colortemp for <I>P6 * Update philips.js * Update philips.js
diff --git a/parse.go b/parse.go index <HASH>..<HASH> 100644 --- a/parse.go +++ b/parse.go @@ -157,15 +157,13 @@ func (p *parser) next() { } return case DQUOTE: + p.pos = Pos(p.npos + 1) switch b { case '`', '"', '$': - p.pos = Pos(p.npos + 1) p.advanceTok(p.dqToken(b)) case '\n': - p.pos++ ...
parse: clean up position logic in next()
diff --git a/lib/foodcritic/rake_task.rb b/lib/foodcritic/rake_task.rb index <HASH>..<HASH> 100644 --- a/lib/foodcritic/rake_task.rb +++ b/lib/foodcritic/rake_task.rb @@ -24,8 +24,11 @@ module FoodCritic desc "Lint Chef cookbooks" task(name) do result = FoodCritic::Linter.new.check(files, o...
Reduce unnecessary blank lines from console output if there's nothing to print. We only print the food critic reviews if there's a warning and fail with a proper message if there's any.
diff --git a/openquake/engine/performance.py b/openquake/engine/performance.py index <HASH>..<HASH> 100644 --- a/openquake/engine/performance.py +++ b/openquake/engine/performance.py @@ -204,7 +204,7 @@ class EnginePerformanceMonitor(PerformanceMonitor): is intended for debugging purposes. """ ...
Fixed an error happening when the memory stats are not available (None instead of an integer) Former-commit-id: <I>cbd<I>c<I>f4c7ba4dd<I>d8d2b0fdd
diff --git a/scot/var.py b/scot/var.py index <HASH>..<HASH> 100644 --- a/scot/var.py +++ b/scot/var.py @@ -123,7 +123,7 @@ class VARBase(): R = np.array([[acm(m-k) for k in range(self.p)] for m in range(self.p)]) R = np.concatenate(np.concatenate(R, -2), -1) - c = np.linalg.solve(R, r) + ...
switched to scipy solver
diff --git a/source/main/org/freecompany/redline/payload/Contents.java b/source/main/org/freecompany/redline/payload/Contents.java index <HASH>..<HASH> 100644 --- a/source/main/org/freecompany/redline/payload/Contents.java +++ b/source/main/org/freecompany/redline/payload/Contents.java @@ -46,6 +46,7 @@ public class Co...
Add builtin entries for /root and /etc/bash_completion.d
diff --git a/billy/tests/fixtures/ex/districts.py b/billy/tests/fixtures/ex/districts.py index <HASH>..<HASH> 100644 --- a/billy/tests/fixtures/ex/districts.py +++ b/billy/tests/fixtures/ex/districts.py @@ -1,7 +1,7 @@ districts = [{u'_id': u'ex-lower-1', u'abbr': u'ex', - u'boundary_id': u'fake_boudary_id-1...
changed boudary_id to Boston's district
diff --git a/lib/getDevices.js b/lib/getDevices.js index <HASH>..<HASH> 100644 --- a/lib/getDevices.js +++ b/lib/getDevices.js @@ -26,7 +26,7 @@ module.exports = function(fromDevice, query, owner, callback) { devicedata.forEach(function(device){ if(securityImpl.canDiscover(fromDevice, device)){ ...
Removed type=user condition in getDevices
diff --git a/parthial/built_ins.py b/parthial/built_ins.py index <HASH>..<HASH> 100644 --- a/parthial/built_ins.py +++ b/parthial/built_ins.py @@ -91,3 +91,9 @@ def lisp_cdr(self, ctx, l): cdr = l.val[1:] return ctx.env.new(LispList(cdr)) +@built_in(default_globals, 'list', count_args=False) +def lisp_list(...
Fixed an incredibly stupid typo bug.
diff --git a/caravel/forms.py b/caravel/forms.py index <HASH>..<HASH> 100644 --- a/caravel/forms.py +++ b/caravel/forms.py @@ -113,7 +113,9 @@ class FormFactory(object): viz = self.viz datasource = viz.datasource default_metric = datasource.metrics_combo[0][0] - default_groupby = datas...
closes #<I> (#<I>)
diff --git a/u2fdemo/main.go b/u2fdemo/main.go index <HASH>..<HASH> 100644 --- a/u2fdemo/main.go +++ b/u2fdemo/main.go @@ -51,7 +51,13 @@ func registerResponse(w http.ResponseWriter, r *http.Request) { return } - reg, err := u2f.Register(regResp, *challenge, nil) + config := &u2f.Config{ + // Chrome 66+ doesn't...
u2fdemo: Disable attestation verify by default due to new Chrome default policy
diff --git a/mimesis/__init__.py b/mimesis/__init__.py index <HASH>..<HASH> 100755 --- a/mimesis/__init__.py +++ b/mimesis/__init__.py @@ -32,6 +32,8 @@ from .providers import ( Transport, ) +from mimesis.schema import Schema, Field + __all__ = [ "Address", "BaseDataProvider", @@ -56,6 +58,9 @@ __all...
Add Schema and Field to __init__.py
diff --git a/karma.conf.js b/karma.conf.js index <HASH>..<HASH> 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -26,6 +26,10 @@ module.exports = function(config) { } }, + mochaReporter: { + showDiff: true + }, + webpackMiddleware: { noInfo: true }
turn on diffing in karma-reporter
diff --git a/azure/src/test/java/com/microsoft/azure/management/TestCdn.java b/azure/src/test/java/com/microsoft/azure/management/TestCdn.java index <HASH>..<HASH> 100644 --- a/azure/src/test/java/com/microsoft/azure/management/TestCdn.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestCdn.java @@ -87,7 ...
big fix in CDN unit test (it was broken)
diff --git a/ui/src/shared/components/Annotation.js b/ui/src/shared/components/Annotation.js index <HASH>..<HASH> 100644 --- a/ui/src/shared/components/Annotation.js +++ b/ui/src/shared/components/Annotation.js @@ -29,7 +29,8 @@ const Annotation = ({annotation, dygraph}) => <div className="dygraph-annotation" ...
Improve debuggability of annotations This is ultimately going to be removed
diff --git a/source/Core/UtilsObject.php b/source/Core/UtilsObject.php index <HASH>..<HASH> 100644 --- a/source/Core/UtilsObject.php +++ b/source/Core/UtilsObject.php @@ -154,7 +154,9 @@ class UtilsObject */ public static function setClassInstance($className, $instance) { - $className = strtolowe...
Ensure that class cache works correctly in oxNew Class cache setter should act same as getter. Before setter would always lower case class name, and getter only for not namespaced classes. Classes without namespace should be in lowercase beacause they path's are different and class name is just a key to get path. Clas...
diff --git a/drools-persistence-jpa/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java b/drools-persistence-jpa/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java index <HASH>..<HASH> 100644 --- a/drools-persistence-jpa/src/main/java/org/drools/persistence/jta/JtaTransactionManager.jav...
- throw exception if no user transaction was found
diff --git a/lib/rack-timeout.rb b/lib/rack-timeout.rb index <HASH>..<HASH> 100644 --- a/lib/rack-timeout.rb +++ b/lib/rack-timeout.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -require_relative 'rack/timeout' +require 'rack/timeout' if defined?(Rails) && [3,4].include?(Rails::VERSION::MAJOR) class Rack::Timeout::Railti...
no need for require_relative here
diff --git a/pwnypack/flow.py b/pwnypack/flow.py index <HASH>..<HASH> 100644 --- a/pwnypack/flow.py +++ b/pwnypack/flow.py @@ -15,6 +15,7 @@ class ProcessChannel(object): def __init__(self, *arguments): self._process = subprocess.Popen( arguments, + bufsize=0, stdin=su...
Python3 fixes for flow. - Use latin1 for echo mode as not everything will be encodable as utf-8. - Disable buffering on subprocess.
diff --git a/src/config/createLatestConfig.js b/src/config/createLatestConfig.js index <HASH>..<HASH> 100644 --- a/src/config/createLatestConfig.js +++ b/src/config/createLatestConfig.js @@ -66,9 +66,9 @@ export function createHelper({ modern = false, minified = false, runtime = true, // changed from default. Mo...
Another round trying without external-helpers
diff --git a/src/main/java/com/semanticcms/openfile/servlet/OpenFile.java b/src/main/java/com/semanticcms/openfile/servlet/OpenFile.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/semanticcms/openfile/servlet/OpenFile.java +++ b/src/main/java/com/semanticcms/openfile/servlet/OpenFile.java @@ -96,7 +96,8 @@ fin...
Each lock object now a small empty class to help identify lock contention. The lock contention profiler in NetBeans is just showing "java.lang.Object" all over, and can't seem to get from the lock object id to the actual object in the heap dump using OQL (id not found).
diff --git a/js/bitfinex.js b/js/bitfinex.js index <HASH>..<HASH> 100644 --- a/js/bitfinex.js +++ b/js/bitfinex.js @@ -678,7 +678,9 @@ module.exports = class bitfinex extends Exchange { } } if (market !== undefined) - symbol = market['symbol']; + symbol = market['sym...
[bitfinex1] made parse order apply a default symbol if one can't be mapped (required for delisted symbols such as BCHUSD)
diff --git a/panels/dashcontrol/module.js b/panels/dashcontrol/module.js index <HASH>..<HASH> 100644 --- a/panels/dashcontrol/module.js +++ b/panels/dashcontrol/module.js @@ -5,7 +5,7 @@ angular.module('kibana.dashcontrol', []) var _d = { group : "default", save : { - gist: true, + gist: false,...
Fixed gist loading, saving will require registration of your domain
diff --git a/txtemplate/templates.py b/txtemplate/templates.py index <HASH>..<HASH> 100644 --- a/txtemplate/templates.py +++ b/txtemplate/templates.py @@ -138,6 +138,7 @@ class GenshiTemplateAdapter(object): self._stream = None self.template = template self.delayedCall = None + self.se...
Option for serialize method in Genshi templates (now defaults to 'html', was implicitly 'xml').
diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -154,7 +154,11 @@ public class GitlabAPI { } public List<GitlabCommit> get...
support merge requests from a different project (fork) in getCommits()
diff --git a/lib/Storeit.js b/lib/Storeit.js index <HASH>..<HASH> 100644 --- a/lib/Storeit.js +++ b/lib/Storeit.js @@ -4,6 +4,7 @@ var Q = require("q"); var _ = require("underscore"); var pubit = require("pubit-as-promised"); var whatsDifferent = require("./utils").whatsDifferent; +var previously = require("./utils"...
Publish a `previousPartial` as a third parameter to `modified` event.
diff --git a/packages/node_modules/@webex/internal-plugin-wdm/src/config.js b/packages/node_modules/@webex/internal-plugin-wdm/src/config.js index <HASH>..<HASH> 100644 --- a/packages/node_modules/@webex/internal-plugin-wdm/src/config.js +++ b/packages/node_modules/@webex/internal-plugin-wdm/src/config.js @@ -13,7 +13,...
fix(internal-plugin-wdm): hotfix possible error trigger Update config.device.defaults.name to also validate that process.title is a string before attempting to run the String.trim() command.
diff --git a/spec/ospec/runner.rb b/spec/ospec/runner.rb index <HASH>..<HASH> 100644 --- a/spec/ospec/runner.rb +++ b/spec/ospec/runner.rb @@ -176,6 +176,7 @@ module Kernel # FIXME: remove def ruby_version_is(*); end def pending(*); end + def language_version(*); end end module MSpec diff --git a/spec/rub...
Update some language specs from rubyspec
diff --git a/test/cases/coerced_tests.rb b/test/cases/coerced_tests.rb index <HASH>..<HASH> 100644 --- a/test/cases/coerced_tests.rb +++ b/test/cases/coerced_tests.rb @@ -23,6 +23,28 @@ class UniquenessValidationTest < ActiveRecord::TestCase end end end + + # Same as original coerced test except that it...
Coerce test to handle default case-insensitive collation (#<I>)
diff --git a/clustering/server/src/main/java/org/wildfly/clustering/server/singleton/ServiceLifecycle.java b/clustering/server/src/main/java/org/wildfly/clustering/server/singleton/ServiceLifecycle.java index <HASH>..<HASH> 100644 --- a/clustering/server/src/main/java/org/wildfly/clustering/server/singleton/ServiceLife...
Ignore service state transition failures due to removed services.
diff --git a/lib/ldapter/entry.rb b/lib/ldapter/entry.rb index <HASH>..<HASH> 100644 --- a/lib/ldapter/entry.rb +++ b/lib/ldapter/entry.rb @@ -502,7 +502,8 @@ module Ldapter private :check_server_contraints # For new objects, does an LDAP add. For existing objects, does an LDAP - # modify. This only se...
Document #save and #save!
diff --git a/tests/test_main.py b/tests/test_main.py index <HASH>..<HASH> 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,3 +1,4 @@ +import sys import asyncio import os import time @@ -36,6 +37,11 @@ def test_sigterm(): assert not loop.is_closed() +@pytest.mark.skipif(sys.version_info >= (3, ...
Skip uvloop test on nightly.
diff --git a/src/pyctd/manager/database.py b/src/pyctd/manager/database.py index <HASH>..<HASH> 100755 --- a/src/pyctd/manager/database.py +++ b/src/pyctd/manager/database.py @@ -29,8 +29,8 @@ from ..constants import bcolors log = logging.getLogger(__name__) alchemy_pandas_dytpe_mapper = { - sqltypes.Text: np.un...
changed np.unicode to np.pbject in alchemy_pandas_dytpe_mapper
diff --git a/lib/draper/decorated_enumerable_proxy.rb b/lib/draper/decorated_enumerable_proxy.rb index <HASH>..<HASH> 100644 --- a/lib/draper/decorated_enumerable_proxy.rb +++ b/lib/draper/decorated_enumerable_proxy.rb @@ -27,7 +27,7 @@ module Draper alias :is_a? :kind_of? def ==(other) - @wrapped_coll...
Fixing problem when comparing two decorated collections with eq matcher on rspec expect method
diff --git a/src/org/openscience/cdk/qsar/model/R2/RModel.java b/src/org/openscience/cdk/qsar/model/R2/RModel.java index <HASH>..<HASH> 100644 --- a/src/org/openscience/cdk/qsar/model/R2/RModel.java +++ b/src/org/openscience/cdk/qsar/model/R2/RModel.java @@ -32,8 +32,6 @@ public abstract class RModel implements IModel ...
made the unique var name method more robust and also modified to convert -ve values of the nuemric part to +ve git-svn-id: <URL>
diff --git a/src/Vinelab/Cdn/Providers/AwsS3Provider.php b/src/Vinelab/Cdn/Providers/AwsS3Provider.php index <HASH>..<HASH> 100755 --- a/src/Vinelab/Cdn/Providers/AwsS3Provider.php +++ b/src/Vinelab/Cdn/Providers/AwsS3Provider.php @@ -137,6 +137,7 @@ class AwsS3Provider extends Provider implements ProviderInterface ...
fix an issue for non-pem users
diff --git a/PHPCompatibility/Tests/BaseSniffTest.php b/PHPCompatibility/Tests/BaseSniffTest.php index <HASH>..<HASH> 100644 --- a/PHPCompatibility/Tests/BaseSniffTest.php +++ b/PHPCompatibility/Tests/BaseSniffTest.php @@ -272,7 +272,7 @@ class BaseSniffTest extends TestCase private function assertForType($issues,...
BaseSniffTest: fail test on missing message, don't error When an (unexpected) exception is thrown by a test, the test will be marked as "Errored", not as "Failed". With that in mind, when an error/warning is expected on a certain line and it isn't found, the test should fail, not error. Fixed now.
diff --git a/QuickBooks/IPP/Service/TaxAgency.php b/QuickBooks/IPP/Service/TaxAgency.php index <HASH>..<HASH> 100644 --- a/QuickBooks/IPP/Service/TaxAgency.php +++ b/QuickBooks/IPP/Service/TaxAgency.php @@ -25,4 +25,9 @@ class QuickBooks_IPP_Service_TaxAgency extends QuickBooks_IPP_Service { return parent::_query(...
Update TaxAgency.php Add add() method
diff --git a/spool/spoolverb.py b/spool/spoolverb.py index <HASH>..<HASH> 100644 --- a/spool/spoolverb.py +++ b/spool/spoolverb.py @@ -38,7 +38,7 @@ class Spoolverb(object): self.meta = meta self.version = version self.num_editions = num_editions - self.edition_number = edition_num + ...
loan spoolverb now supports empty num_editions parameters. Used when loaning a piece
diff --git a/mod/forum/lib.php b/mod/forum/lib.php index <HASH>..<HASH> 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -138,7 +138,22 @@ function forum_update_instance($forum) { notify('Warning! There is more than one discussion in this forum - using the most recent'); $disc...
MDL-<I> recovery of broken single simple discussions after old reset
diff --git a/packages/ember-metal/lib/core.js b/packages/ember-metal/lib/core.js index <HASH>..<HASH> 100644 --- a/packages/ember-metal/lib/core.js +++ b/packages/ember-metal/lib/core.js @@ -167,7 +167,7 @@ if (typeof Ember.EXTEND_PROTOTYPES === 'undefined') { Ember.LOG_STACKTRACE_ON_DEPRECATION = (Ember.ENV.LOG_STACK...
Clarify that SHIM_ES5 only adds Array methods I spent a little time today trying to figure out why the SHIM_ES5 setting wasn't shimming Function#bind — and its because this flag only enables Array method shims. Added clarification.
diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb index <HASH>..<HASH> 100644 --- a/spec/dummy/config/environments/test.rb +++ b/spec/dummy/config/environments/test.rb @@ -30,7 +30,7 @@ Rails.application.configure do config.action_dispatch.show_exceptions = false # Dis...
fix admin sitemap feature specs Enable forgery protection so we have a csrf-token in the dom that our ajax lib expects. Also wait for the sitemap spinner to disappear before acting with the dom with capybara
diff --git a/test/helper.rb b/test/helper.rb index <HASH>..<HASH> 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -16,6 +16,9 @@ puts "Testing with Rails #{Rails.version}" require 'dalli' require 'logger' +require 'active_support/time' +require 'active_support/cache/dalli_store' + Dalli.logger = Logger.new(STD...
Explicitly include the Dalli cache adapter and ActiveSupport::Time to avoid intermittent failures in CI
diff --git a/lib/rest-sugar-client.js b/lib/rest-sugar-client.js index <HASH>..<HASH> 100644 --- a/lib/rest-sugar-client.js +++ b/lib/rest-sugar-client.js @@ -50,6 +50,10 @@ function op(method, r, q) { request.get({url: r + '/' + id, qs: o}, handle(cb)); } + else if(funkit....
Make it possible to pass cb as the first param Ie. api.count(cb) should work now.
diff --git a/alot/buffers.py b/alot/buffers.py index <HASH>..<HASH> 100644 --- a/alot/buffers.py +++ b/alot/buffers.py @@ -6,6 +6,7 @@ import settings import commands from walker import PipeWalker from helper import shorten_author_string +from db import NonexistantObjectError class Buffer(object): @@ -228,7 +22...
ThreadBuffer rebuilds to SolidFill if thread nonexistant ThreadBuffer will display as urwid.SolidFill if the displayed thread seized to exist. This could happen for example if the last message of that thread has been removed.
diff --git a/aws/resource_aws_lb_listener.go b/aws/resource_aws_lb_listener.go index <HASH>..<HASH> 100644 --- a/aws/resource_aws_lb_listener.go +++ b/aws/resource_aws_lb_listener.go @@ -92,6 +92,7 @@ func resourceAwsLbListener() *schema.Resource { "order": { Type: schema.TypeInt, Optiona...
resource/aws_lb_listener: Set action order to Computed While the acceptance testing is not finding this scenario, the order value may return as 1. This may be caused by web console updates.
diff --git a/components/remotes/remotes.js b/components/remotes/remotes.js index <HASH>..<HASH> 100644 --- a/components/remotes/remotes.js +++ b/components/remotes/remotes.js @@ -92,7 +92,6 @@ class RemotesViewModel { updateRemotes() { return this.server.getPromise('/remotes', { path: this.repoPath() }) ...
Update components/remotes/remotes.js
diff --git a/openquake/job/__init__.py b/openquake/job/__init__.py index <HASH>..<HASH> 100644 --- a/openquake/job/__init__.py +++ b/openquake/job/__init__.py @@ -80,7 +80,7 @@ def run_job(job_file, output_type): a_job.set_status('running') try: - results = a_job.launch() + a_j...
Only print file names when they are written to disk. Former-commit-id: 5b<I>cb1e2f<I>da7ddac<I>a<I>c7b0b0a<I>
diff --git a/HardwareSource.py b/HardwareSource.py index <HASH>..<HASH> 100644 --- a/HardwareSource.py +++ b/HardwareSource.py @@ -433,7 +433,7 @@ class HardwareSourceDataBuffer(object): # select the preferred item. # TODO: better mechanism for selecting preferred item at start of acquisition. ...
Rework source panel to not use combobox pop-up. svn r<I>
diff --git a/moskito-core/src/main/java/net/anotheria/moskito/core/predefined/AbstractStatsFactory.java b/moskito-core/src/main/java/net/anotheria/moskito/core/predefined/AbstractStatsFactory.java index <HASH>..<HASH> 100644 --- a/moskito-core/src/main/java/net/anotheria/moskito/core/predefined/AbstractStatsFactory.jav...
removed unneeded import (pmd)
diff --git a/opentrons_sdk/drivers/motor.py b/opentrons_sdk/drivers/motor.py index <HASH>..<HASH> 100644 --- a/opentrons_sdk/drivers/motor.py +++ b/opentrons_sdk/drivers/motor.py @@ -7,6 +7,11 @@ import serial from opentrons_sdk.util import log +JSON_ERROR = None +if sys.version_info > (3, 4): + JSON_ERROR = Va...
json throws diff error depending on python version
diff --git a/odl/test/solvers/functional/default_functionals_test.py b/odl/test/solvers/functional/default_functionals_test.py index <HASH>..<HASH> 100644 --- a/odl/test/solvers/functional/default_functionals_test.py +++ b/odl/test/solvers/functional/default_functionals_test.py @@ -583,7 +583,7 @@ def test_weighted_pro...
MAINT: Replace 'divide' by '/' in test.
diff --git a/tests/Functional/CheckerManagerTest.php b/tests/Functional/CheckerManagerTest.php index <HASH>..<HASH> 100644 --- a/tests/Functional/CheckerManagerTest.php +++ b/tests/Functional/CheckerManagerTest.php @@ -42,7 +42,7 @@ class CheckerManagerTest extends TestCase /** * @expectedException \Invali...
Test fixed Test failed due to the modification introduced by #<I>
diff --git a/casviewer/blobs.go b/casviewer/blobs.go index <HASH>..<HASH> 100644 --- a/casviewer/blobs.go +++ b/casviewer/blobs.go @@ -84,7 +84,7 @@ func returnBlob(ctx context.Context, w http.ResponseWriter, cl *client.Client, b // readBlob reads the blob from CAS. func readBlob(ctx context.Context, cl *client.Cli...
casviewer: fix build This is follow up for <URL>
diff --git a/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb b/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb index <HASH>..<HASH> 100644 --- a/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb +++ b/lib/fog/vcloud_directo...
Add EnableLogging field to FirewallService XML
diff --git a/lib/components/src/theme.js b/lib/components/src/theme.js index <HASH>..<HASH> 100644 --- a/lib/components/src/theme.js +++ b/lib/components/src/theme.js @@ -25,6 +25,8 @@ export const normal = { mainTextColor: baseFonts.color, dimmedTextColor: 'rgba(0,0,0,0.4)', highlightColor: '#9fdaff', + succ...
ADD success & fail colours to theme
diff --git a/lib/events-ha-node.js b/lib/events-ha-node.js index <HASH>..<HASH> 100644 --- a/lib/events-ha-node.js +++ b/lib/events-ha-node.js @@ -73,7 +73,9 @@ class EventsHaNode extends EventsNode { switch (type) { case INTEGRATION_UNLOADED: case INTEGRATION_NOT_LOADED: - ...
fix: stop enabling trigger-state node on connection to HA Fixes: #<I>
diff --git a/securesystemslib/keys.py b/securesystemslib/keys.py index <HASH>..<HASH> 100755 --- a/securesystemslib/keys.py +++ b/securesystemslib/keys.py @@ -602,8 +602,8 @@ def format_metadata_to_key(key_metadata): keytype = key_metadata['keytype'] key_value = key_metadata['keyval'] - # Convert 'key_value' t...
Fix bug in _get_keyid() The hash_algorithm argument to _get_keyid() wasn't correctly being used
diff --git a/go/vt/wrangler/wrangler.go b/go/vt/wrangler/wrangler.go index <HASH>..<HASH> 100644 --- a/go/vt/wrangler/wrangler.go +++ b/go/vt/wrangler/wrangler.go @@ -94,7 +94,7 @@ func (wr *Wrangler) ChangeType(tabletAlias naming.TabletAlias, dbType naming.Tab // You don't have a choice - you must wait for // co...
ChangeType should use the wrangler's action timeout.
diff --git a/lib/mementus.rb b/lib/mementus.rb index <HASH>..<HASH> 100644 --- a/lib/mementus.rb +++ b/lib/mementus.rb @@ -1,5 +1,5 @@ require 'virtus' require 'axiom-memory-adapter' -require 'mementus/version' -require 'mementus/model' +require_relative 'mementus/version' +require_relative 'mementus/model' diff --...
Use before hook in collection spec to deal with gc issues