hash
stringlengths
40
40
diff
stringlengths
131
26.7k
message
stringlengths
7
694
project
stringlengths
5
67
split
stringclasses
1 value
diff_languages
stringlengths
2
24
c815b7d12589b6f662c4e5895da44e1c489ef9f3
diff --git a/internal/location/schema.go b/internal/location/schema.go index <HASH>..<HASH> 100644 --- a/internal/location/schema.go +++ b/internal/location/schema.go @@ -10,13 +10,6 @@ func Schema() *pluginsdk.Schema { return commonschema.Location() } -func HashCode(location interface{}) int { - // NOTE: this is intentionally not present upstream as the only usage is deprecated - // and so this can be removed in 3.0 - loc := location.(string) - return pluginsdk.HashString(Normalize(loc)) -} - func StateFunc(input interface{}) string { return location.StateFunc(input) } diff --git a/internal/services/containers/container_registry_resource.go b/internal/services/containers/container_registry_resource.go index <HASH>..<HASH> 100644 --- a/internal/services/containers/container_registry_resource.go +++ b/internal/services/containers/container_registry_resource.go @@ -1132,7 +1132,9 @@ func resourceContainerRegistrySchema() map[string]*pluginsdk.Schema { Type: pluginsdk.TypeString, ValidateFunc: validation.StringIsNotEmpty, }, - Set: location.HashCode, + Set: func(input interface{}) int { + return pluginsdk.HashString(location.Normalize(input.(string))) + }, } }
refactor: removing the old `HashCode` function
terraform-providers_terraform-provider-azurerm
train
go,go
e1445c27bf5b2f74725d0d7853daf49d1cf74464
diff --git a/umis/umis.py b/umis/umis.py index <HASH>..<HASH> 100644 --- a/umis/umis.py +++ b/umis/umis.py @@ -151,9 +151,28 @@ def tagcount(genemap, sam, out, output_evidence_table, positional): genes.to_csv(out) +@click.command() +@click.argument('fastq', type=click.File('r')) +def cb_histogram(fastq): + ''' Counts the number of reads for each cellular barcode + + Expects formatted fastq files. + ''' + parser_re = re.compile('(.*):CELL_(?P<CB>.*):UMI_(.*)\\n(.*)\\n\\+\\n(.*)\\n') + + counter = collections.Counter() + for read in stream_fastq(fastq): + match = parser_re.search(read).groupdict() + counter[match['CB']] += 1 + + for bc, count in counter.most_common(): + sys.stdout.write('{}\t{}\n'.format(bc, count)) + + @click.group() def umis(): pass umis.add_command(fastqtransform) umis.add_command(tagcount) +umis.add_command(cb_histogram)
Added command to calculate CB histogram from formatted fastq
vals_umis
train
py
10ff2e11125309ecaef2c5e6d22abd7122732e9c
diff --git a/petl/test/io/test_json_unicode.py b/petl/test/io/test_json_unicode.py index <HASH>..<HASH> 100644 --- a/petl/test/io/test_json_unicode.py +++ b/petl/test/io/test_json_unicode.py @@ -27,5 +27,5 @@ def test_json_unicode(): assert a[0] == b['id'] assert a[1] == b['name'] - actual = fromjson(fn) + actual = fromjson(fn, header=['id', 'name']) ieq(tbl, actual)
fix tests for change in field ordering behaviour
petl-developers_petl
train
py
5670993d8ce0167444cfd663708d82f4f9068c8f
diff --git a/assets/src/org/ruboto/ScriptInfo.java b/assets/src/org/ruboto/ScriptInfo.java index <HASH>..<HASH> 100644 --- a/assets/src/org/ruboto/ScriptInfo.java +++ b/assets/src/org/ruboto/ScriptInfo.java @@ -5,6 +5,19 @@ public class ScriptInfo { private String scriptName; private Object rubyInstance; + public void setFromIntent(android.context.Intent intent) { + android.os.Bundle configBundle = intent.getBundleExtra("Ruboto Config"); + + if (configBundle != null) { + if (configBundle.containsKey("ClassName")) { + setRubyClassName(configBundle.getString("ClassName")); + } + if (configBundle.containsKey("Script")) { + setScriptName(configBundle.getString("Script")); + } + } + } + public String getRubyClassName() { if (rubyClassName == null && scriptName != null) { return Script.toCamelCase(scriptName);
Added a method to configure from an intent
ruboto_ruboto
train
java
9d61a9a13171c94e55779d166d81599cdd0f9cb7
diff --git a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java @@ -47,7 +47,7 @@ public abstract class AbstractDiskSpaceMonitor extends NodeMonitor { if(size!=null && size.size > getThresholdBytes() && c.isOffline() && c.getOfflineCause() instanceof DiskSpace) if(this.getClass().equals(((DiskSpace)c.getOfflineCause()).getTrigger())) if(getDescriptor().markOnline(c)) { - LOGGER.warning(Messages.DiskSpaceMonitor_MarkedOnline(c.getName())); + LOGGER.info(Messages.DiskSpaceMonitor_MarkedOnline(c.getName())); } return size; }
When a node is back to normal, INFO seems enough I think the other way round is acceptable as a WARNING. I think when a node becomes available again, INFO is enough (even more given Jenkins has INFO as displayed by default)
jenkinsci_jenkins
train
java
c2d8e456787dbbd896fac2d7f09a2d044536112d
diff --git a/src/Patchwork/Controller/AdminController.php b/src/Patchwork/Controller/AdminController.php index <HASH>..<HASH> 100644 --- a/src/Patchwork/Controller/AdminController.php +++ b/src/Patchwork/Controller/AdminController.php @@ -248,6 +248,7 @@ class AdminController implements ControllerProviderInterface $image->move($dir, $file); $bean->setImage($dir, $file); + R::store($bean); } } }
added forgotten re-save directive after image upload
neemzy_patchwork-core
train
php
27f0e9bf97755d8e5a8c6bee4bafe19af975c418
diff --git a/java-speech/samples/snippets/src/main/java/com/example/speech/Recognize.java b/java-speech/samples/snippets/src/main/java/com/example/speech/Recognize.java index <HASH>..<HASH> 100644 --- a/java-speech/samples/snippets/src/main/java/com/example/speech/Recognize.java +++ b/java-speech/samples/snippets/src/main/java/com/example/speech/Recognize.java @@ -735,8 +735,6 @@ public class Recognize { .setEncoding(AudioEncoding.LINEAR16) .setLanguageCode("en-US") .setSampleRateHertz(8000) - // Enhanced models are only available to projects that - // opt in for audio data collection. .setUseEnhanced(true) // A model must be specified to use enhanced model. .setModel("phone_call")
samples: Data logging opt-in is no longer required for enhanced models (#<I>)
googleapis_google-cloud-java
train
java
2a2ef118e2a7624601efa1021879b08835dc64e8
diff --git a/src/Administration/Resources/administration/src/module/sw-media/mixin/mediagrid-listener.mixin.js b/src/Administration/Resources/administration/src/module/sw-media/mixin/mediagrid-listener.mixin.js index <HASH>..<HASH> 100644 --- a/src/Administration/Resources/administration/src/module/sw-media/mixin/mediagrid-listener.mixin.js +++ b/src/Administration/Resources/administration/src/module/sw-media/mixin/mediagrid-listener.mixin.js @@ -86,7 +86,7 @@ Mixin.register('mediagrid-listener', { }, handleMediaGridItemPlay({ item }) { - if (this.isList) { + if (this.isListSelect) { this._handleSelection(item); return; } @@ -129,7 +129,9 @@ Mixin.register('mediagrid-listener', { return; } - this.selectedItems.push(item); + if (!this.isItemSelected(item)) { + this.selectedItems.push(item); + } }, _handleShiftSelect(item) {
Don't remove selection when autoplay is clicked; don't select items twice
shopware_platform
train
js
80464b4dbe704879c5ee3f98078fccf54f48ab7f
diff --git a/lib/unread/scopes.rb b/lib/unread/scopes.rb index <HASH>..<HASH> 100644 --- a/lib/unread/scopes.rb +++ b/lib/unread/scopes.rb @@ -15,7 +15,7 @@ module Unread where('read_marks.id IS NULL') if global_time_stamp = user.read_mark_global(self).try(:timestamp) - result = result.where("#{table_name}.#{readable_options[:on]} > '#{global_time_stamp.to_s(:db)}'") + result = result.where("#{table_name}.#{readable_options[:on]} > ?", global_time_stamp) end result
fix the time zone bug in readable unread_by scope
ledermann_unread
train
rb
8f739c8ebe6f5dac6bc906a5f7b57bef61c0e274
diff --git a/server/server.js b/server/server.js index <HASH>..<HASH> 100644 --- a/server/server.js +++ b/server/server.js @@ -19,8 +19,8 @@ function Server(expressApp, options) { this.viewEngine = this.options.viewEngine || new ViewEngine(); - this.errorHandler = this.options.errorHandler = this.options.errorHandler || - middleware.errorHandler(this.options); + this.errorHandler = this.options.errorHandler = + this.options.errorHandler || middleware.errorHandler(this.options); this.router = new Router(this.options);
Small style tweak in server.js
rendrjs_rendr
train
js
4359733c6456a1533703e5a3f978346003404c3b
diff --git a/hgtools/__init__.py b/hgtools/__init__.py index <HASH>..<HASH> 100644 --- a/hgtools/__init__.py +++ b/hgtools/__init__.py @@ -418,7 +418,7 @@ def version_calc_plugin(dist, attr, value): """ Handler for parameter to setup(use_hg_version=value) """ - if not value: return + if not value or not 'hg_version' in attr: return # if the user indicates an increment, use it increment = value if 'increment' in attr else None dist.metadata.version = calculate_version(increment)
Ensure the version_calc_plugin is only activated when the hgtools setup parameters are supplied. Fixes #1
jaraco_hgtools
train
py
dedc09378573a328673b04c0e0e1de4668092ef4
diff --git a/builder/pattern_assembler.js b/builder/pattern_assembler.js index <HASH>..<HASH> 100644 --- a/builder/pattern_assembler.js +++ b/builder/pattern_assembler.js @@ -157,7 +157,7 @@ function getpatternbykey(key, patternlab){ for(var i = 0; i < patternlab.patterns.length; i++){ - switch (key) { + switch(key) { case patternlab.patterns[i].key: case patternlab.patterns[i].subdir + '/' + patternlab.patterns[i].fileName: case patternlab.patterns[i].subdir + '/' + patternlab.patterns[i].fileName + '.mustache':
deleting space in control structure to match set standard
pattern-lab_patternengine-node-underscore
train
js
363d6427670c6ded6e7fdcad8cfcc1a173ce95e8
diff --git a/src/Router/Router.php b/src/Router/Router.php index <HASH>..<HASH> 100644 --- a/src/Router/Router.php +++ b/src/Router/Router.php @@ -38,6 +38,13 @@ class Router protected $routeProvider; /** + * Whether the routes have been configured. + * + * @var boolean + */ + protected $routesConfigured = false; + + /** * Constructor. * * @param RouterAdaptorInterface $adaptor The Router Adaptor. @@ -112,7 +119,11 @@ class Router */ protected function route(Request $request, $response = null) { - $this->adaptor->configureRoutes($this->routeProvider); + if (!$this->routesConfigured) { + $this->adaptor->configureRoutes($this->routeProvider); + $this->routesConfigured = true; + } + $routeDetails = $this->adaptor->route($request); if ($routeDetails === false) {
Allow the router to be called repeatedly without attempting to configure routes multiple times
weavephp_weave
train
php
f103b29b3d33f942f8431e09de12db5bef34b1b3
diff --git a/tests/test_base.py b/tests/test_base.py index <HASH>..<HASH> 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -605,6 +605,9 @@ class TestURLTrafaret(unittest.TestCase): res = str(t.URL().check('http://пример.рф/resource/?param=value#anchor')) self.assertEqual(res, 'http://xn--e1afmkfd.xn--p1ai/resource/?param=value#anchor') + res = t.URL().check('http://example_underscore.net/resource/?param=value#anchor') + self.assertEqual(res, 'http://example_underscore.net/resource/?param=value#anchor') + res = str(t.URL().check('http://user@example.net/resource/?param=value#anchor')) self.assertEqual(res, 'http://user@example.net/resource/?param=value#anchor')
Allow underscore in url domain part.
Deepwalker_trafaret
train
py
adfbe2d082de59ee2658a458e5246898f7f9f725
diff --git a/lib/starting_blocks/watcher.rb b/lib/starting_blocks/watcher.rb index <HASH>..<HASH> 100644 --- a/lib/starting_blocks/watcher.rb +++ b/lib/starting_blocks/watcher.rb @@ -10,7 +10,7 @@ module StartingBlocks location = dir.getwd all_files = Dir['**/*'] puts "Listening to: #{location}" - Listen.to(location) do |modified, added, removed| + listener = Listen.to(location) do |modified, added, removed| if modified.count > 0 StartingBlocks::Watcher.run_it modified[0], all_files, options end @@ -21,6 +21,7 @@ module StartingBlocks StartingBlocks::Watcher.delete_it removed[0], all_files, options end end + listener.listen! end def add_it(file_that_changed, all_files, options)
Block io when the watcher is running.
darrencauthon_starting_blocks
train
rb
ddb6f512f613f573773db374ce8a0b1587d9c834
diff --git a/spec/features/dot_notation_spec.rb b/spec/features/dot_notation_spec.rb index <HASH>..<HASH> 100644 --- a/spec/features/dot_notation_spec.rb +++ b/spec/features/dot_notation_spec.rb @@ -30,14 +30,14 @@ describe 'Dot-notation' do expect(config.option?('kek.pek.cheburek')).to eq(true) expect(config.option?('kek.pek')).to eq(true) expect(config.option?('kek')).to eq(true) - expect(config.option?('kek.cheburek.pek')).to eq(false) + expect(config.option?('kek.foo.bar')).to eq(true) expect(config.option?('kek.cheburek.pek')).to eq(false) expect(config.option?('kek.cheburek')).to eq(false) expect(config.setting?('kek.pek.cheburek')).to eq(true) expect(config.setting?('kek.pek')).to eq(true) expect(config.setting?('kek')).to eq(true) - expect(config.setting?('kek.cheburek.pek')).to eq(false) + expect(config.setting?('kek.foo.bar')).to eq(true) expect(config.setting?('kek.cheburek.pek')).to eq(false) expect(config.setting?('kek.cheburek')).to eq(false) end
[pretty-print-fix] typo in specs
0exp_qonfig
train
rb
47bae156e5e8765e52293b0543fdf223bda81db1
diff --git a/cmd/config.go b/cmd/config.go index <HASH>..<HASH> 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -11,3 +11,16 @@ type GoogleSafeBrowsingConfig struct { APIKey string DataDir string } + +// SyslogConfig defines the config for syslogging. +type SyslogConfig struct { + Network string + Server string + StdoutLevel *int +} + +// StatsdConfig defines the config for Statsd. +type StatsdConfig struct { + Server string + Prefix string +} diff --git a/cmd/shell.go b/cmd/shell.go index <HASH>..<HASH> 100644 --- a/cmd/shell.go +++ b/cmd/shell.go @@ -227,19 +227,6 @@ type Config struct { SubscriberAgreementURL string } -// SyslogConfig defines the config for syslogging. -type SyslogConfig struct { - Network string - Server string - StdoutLevel *int -} - -// StatsdConfig defines the config for Statsd. -type StatsdConfig struct { - Server string - Prefix string -} - // CAConfig structs have configuration information for the certificate // authority, including database parameters as well as controls for // issued certificates.
Move config structs into config.go.
letsencrypt_boulder
train
go,go
2ec3142d42480d179706895b6720578e05780951
diff --git a/SpiffWorkflow/specs/Celery.py b/SpiffWorkflow/specs/Celery.py index <HASH>..<HASH> 100644 --- a/SpiffWorkflow/specs/Celery.py +++ b/SpiffWorkflow/specs/Celery.py @@ -104,6 +104,7 @@ class Celery(TaskSpec): :param result_key: The key to use to store the results of the call in task.internal_data. If None, then dicts are expanded into internal_data and values are stored in 'result'. + :type merge_results: bool :param merge_results: merge the results in instead of overwriting existing fields. :type kwargs: dict
minor API doc addition for SpiffWorkflow.specs.Celery
knipknap_SpiffWorkflow
train
py
8b265106889ff02e5a4842b99667c7f147f3cddd
diff --git a/src/psd_tools/decoder/linked_layer.py b/src/psd_tools/decoder/linked_layer.py index <HASH>..<HASH> 100644 --- a/src/psd_tools/decoder/linked_layer.py +++ b/src/psd_tools/decoder/linked_layer.py @@ -10,7 +10,8 @@ from psd_tools.decoder.actions import decode_descriptor LinkedLayerCollection = pretty_namedtuple('LinkedLayerCollection', 'linked_list ') _LinkedLayer = pretty_namedtuple('LinkedLayer', - 'version unique_id filename filetype file_open_descriptor creator decoded') + 'version unique_id filename filetype file_open_descriptor ' + 'creator decoded uuid') class LinkedLayer(_LinkedLayer): @@ -66,12 +67,15 @@ def decode(data): else: file_open_descriptor = None decoded = fp.read(filelength) - layers.append( - LinkedLayer(version, unique_id, filename, filetype, file_open_descriptor, creator, decoded) - ) # Undocumented extra field if version == 5: uuid = read_unicode_string(fp) + else: + uuid = None + layers.append( + LinkedLayer(version, unique_id, filename, filetype, file_open_descriptor, + creator, decoded, uuid) + ) # Gobble up anything that we don't know how to decode expected_position = start + 8 + length # first 8 bytes contained the length if expected_position != fp.tell():
store the undocumented uuid
psd-tools_psd-tools
train
py
be2cc7896f90717595a54e4a8d11b705f40e0e7a
diff --git a/src/com/opencms/util/Encoder.java b/src/com/opencms/util/Encoder.java index <HASH>..<HASH> 100755 --- a/src/com/opencms/util/Encoder.java +++ b/src/com/opencms/util/Encoder.java @@ -1,7 +1,7 @@ /* * File : $Source: /alkacon/cvs/opencms/src/com/opencms/util/Attic/Encoder.java,v $ -* Date : $Date: 2002/09/05 12:51:52 $ -* Version: $Revision: 1.19 $ +* Date : $Date: 2002/11/02 10:33:25 $ +* Version: $Revision: 1.20 $ * * This library is part of OpenCms - * the Open Source Content Mananagement System @@ -85,6 +85,7 @@ public class Encoder { * @return The encoded source String */ public static String encode(String source, String encoding, boolean fallbackToDefaultEncoding) { + if (source == null) return null; if (encoding != null) { if (C_NEW_ENCODING_SUPPORTED) { try { @@ -121,6 +122,7 @@ public class Encoder { * @return The decoded source String */ public static String decode(String source, String encoding, boolean fallbackToDefaultDecoding) { + if (source == null) return null; if (encoding != null) { if (C_NEW_DECODING_SUPPORTED) { try {
Improved null handling on encode() and decode() methods
alkacon_opencms-core
train
java
fe7c32055a8309ba144fa52014273fbbded9f3f5
diff --git a/lib/beaker/hypervisor/docker.rb b/lib/beaker/hypervisor/docker.rb index <HASH>..<HASH> 100644 --- a/lib/beaker/hypervisor/docker.rb +++ b/lib/beaker/hypervisor/docker.rb @@ -279,6 +279,7 @@ module Beaker EOF when /archlinux/ dockerfile += <<-EOF + RUN pacman --noconfirm -Sy archlinux-keyring RUN pacman --noconfirm -Syu RUN pacman -S --noconfirm openssh #{Beaker::HostPrebuiltSteps::ARCHLINUX_PACKAGES.join(' ')} RUN ssh-keygen -A
update the arch keyring before other updates It is possible that the updates are signed by a gpg key that is missing in the keyring. So the keyring needs to be updated first. This is a known issue on archlinux systems that aren't updated frequently.
puppetlabs_beaker-docker
train
rb
b0189361efbb6ef5b56d4c3a6199b616944edea3
diff --git a/gulp/config.js b/gulp/config.js index <HASH>..<HASH> 100644 --- a/gulp/config.js +++ b/gulp/config.js @@ -52,6 +52,7 @@ class paths { get content() { return [ `${this.rootDir}/jspm_packages/**/*`, + `${this.sourceDir}/jspm.config.js`, `${this.rootDir}/**/*.jpg`, `${this.rootDir}/**/*.jpeg`, `${this.rootDir}/**/*.gif`,
Adding JSPM config as static content
Cratis_JavaScript.Pipeline
train
js
e1fa7ace6d0216010d9e3140e76ed679f74888f7
diff --git a/scriptworker/log.py b/scriptworker/log.py index <HASH>..<HASH> 100644 --- a/scriptworker/log.py +++ b/scriptworker/log.py @@ -51,8 +51,6 @@ def update_logging_config(context, log_name=None, file_name='worker.log'): # Rotating log file makedirs(context.config['log_dir']) - handler.setFormatter(formatter) - top_level_logger.addHandler(handler) top_level_logger.addHandler(logging.NullHandler())
stop rotating logs in scriptworker #<I>
mozilla-releng_scriptworker
train
py
a8e3a2029733a5223f2f9217ed68ef86499d058d
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java index <HASH>..<HASH> 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java @@ -199,7 +199,7 @@ public class ExecutionGraph implements AccessExecutionGraph { private final List<ExecutionJobVertex> verticesInCreationOrder; /** All intermediate results that are part of this graph. */ - private final ConcurrentHashMap<IntermediateDataSetID, IntermediateResult> intermediateResults; + private final Map<IntermediateDataSetID, IntermediateResult> intermediateResults; /** The currently executed tasks, for callbacks. */ private final ConcurrentHashMap<ExecutionAttemptID, Execution> currentExecutions; @@ -463,7 +463,7 @@ public class ExecutionGraph implements AccessExecutionGraph { this.userClassLoader = Preconditions.checkNotNull(userClassLoader, "userClassLoader"); this.tasks = new ConcurrentHashMap<>(16); - this.intermediateResults = new ConcurrentHashMap<>(16); + this.intermediateResults = new HashMap<>(16); this.verticesInCreationOrder = new ArrayList<>(16); this.currentExecutions = new ConcurrentHashMap<>(16);
[FLINK-<I>][runtime] Change Type of Field intermediateResults from ConcurrentHashMap to HashMap This closes #<I>.
apache_flink
train
java
5135b7fa8a7afa40bbd9051e1e35d273ced5bdec
diff --git a/src/select2.js b/src/select2.js index <HASH>..<HASH> 100644 --- a/src/select2.js +++ b/src/select2.js @@ -84,7 +84,7 @@ function init(Survey, $) { if (settings) { if (settings.ajax) { $el.select2(settings); - question.clearIncorrectValuesCallback = function () { }; + question.keepIncorrectValues = true; } else { settings.data = question.visibleChoices.map(function (choice) { return { @@ -140,7 +140,6 @@ function init(Survey, $) { .off("select2:select") .select2("destroy"); question.readOnlyChangedCallback = null; - question.clearIncorrectValuesCallback = null; } };
Set keepIncorrectValues flat to true value for select2
surveyjs_widgets
train
js
38d5c109981bb51dc3ba2309ca6152c49fc07f28
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index <HASH>..<HASH> 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -1462,7 +1462,7 @@ final class RouteCollectionTest extends CIUnitTestCase $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']); - $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth')); + $this->assertFalse($routes->reverseRoute('doc_item', 'sth')); } public function testRouteToWithoutSubdomainMatch()
fix: incorrect test `example.com` does not match`'subdomain' => '*'`, so the route is not registered.
codeigniter4_CodeIgniter4
train
php
64e459ff8fdf016c13bcac3bc0780c3dec1ba0b0
diff --git a/aws/resource_aws_ssm_maintenance_window_test.go b/aws/resource_aws_ssm_maintenance_window_test.go index <HASH>..<HASH> 100644 --- a/aws/resource_aws_ssm_maintenance_window_test.go +++ b/aws/resource_aws_ssm_maintenance_window_test.go @@ -759,7 +759,7 @@ resource "aws_ssm_maintenance_window" "test" { cutoff = 1 duration = 3 name = %q - schedule = "cron(0 16 ? * TUE *)" + schedule = "cron(0 16 ? * TUE#3 *)" schedule_offset = %d } `, rName, scheduleOffset)
tests/resource/aws_ssm_maintenance_window: Fix TestAccAWSSSMMaintenanceWindow_ScheduleOffset configuration Output from acceptance testing: ``` --- PASS: TestAccAWSSSMMaintenanceWindow_ScheduleOffset (<I>s) ```
terraform-providers_terraform-provider-aws
train
go
22f737cad83fbb572821ed7f283bb3e004d5ec3d
diff --git a/ext/numo/linalg/mkmf_linalg.rb b/ext/numo/linalg/mkmf_linalg.rb index <HASH>..<HASH> 100644 --- a/ext/numo/linalg/mkmf_linalg.rb +++ b/ext/numo/linalg/mkmf_linalg.rb @@ -23,10 +23,12 @@ def create_site_conf Fiddle.dlopen "libm.so" rescue (5..7).each do |i| - Fiddle.dlopen "libm.so.#{i}" - need_version = true - break - rescue + begin + Fiddle.dlopen "libm.so.#{i}" + need_version = true + break + rescue + end end if !need_version raise "failed to check whether dynamically linked shared object needs version suffix"
rescue in block is not valid for ruby version <= <I>
ruby-numo_numo-linalg
train
rb
1085d803f7991a206dd5d5b1a48e3ff620b12f7e
diff --git a/visualization/src/main/java/br/uff/ic/sel/noworkflow/controller/SQLiteReader.java b/visualization/src/main/java/br/uff/ic/sel/noworkflow/controller/SQLiteReader.java index <HASH>..<HASH> 100644 --- a/visualization/src/main/java/br/uff/ic/sel/noworkflow/controller/SQLiteReader.java +++ b/visualization/src/main/java/br/uff/ic/sel/noworkflow/controller/SQLiteReader.java @@ -74,8 +74,8 @@ public class SQLiteReader { int id = rs.getInt("id"); Map<String, String> arguments = getArguments(id); String returnValue = rs.getString("return"); - Timestamp start = rs.getTimestamp("start"); - Timestamp finish = rs.getTimestamp("finish"); + Timestamp start = Timestamp.valueOf(rs.getString("start")); + Timestamp finish = Timestamp.valueOf(rs.getString("finish")); String key = callerId + line + name; FunctionCall functionCall = functionCalls.get(key);
Fixing the way date is read from the database.
gems-uff_noworkflow
train
java
c5118a3a173a4330ab36a698f070b447b66db2d5
diff --git a/db/jig/mapper.php b/db/jig/mapper.php index <HASH>..<HASH> 100644 --- a/db/jig/mapper.php +++ b/db/jig/mapper.php @@ -67,7 +67,8 @@ class Mapper extends \DB\Cursor { * @param $key string **/ function clear($key) { - unset($this->document[$key]); + if ($key!='_id') + unset($this->document[$key]); } /** @@ -152,6 +153,7 @@ class Mapper extends \DB\Cursor { $cache=\Cache::instance(); $db=$this->db; $now=microtime(TRUE); + $data=array(); if (!$fw->get('CACHE') || !$ttl || !($cached=$cache->exists( $hash=$fw->hash($this->db->dir(). $fw->stringify(array($filter,$options))).'.jig',$data)) ||
Prohibit _id clear()
bcosca_fatfree-core
train
php
bfb7f1b3afb4ae2f3cd8e56bf566b044e329c7b0
diff --git a/src/FieldHandlers/Renderer/NumberRenderer.php b/src/FieldHandlers/Renderer/NumberRenderer.php index <HASH>..<HASH> 100644 --- a/src/FieldHandlers/Renderer/NumberRenderer.php +++ b/src/FieldHandlers/Renderer/NumberRenderer.php @@ -23,6 +23,11 @@ class NumberRenderer extends BaseRenderer /** * Render value * + * Supported options: + * + * * precision - integer value as to how many decimal points to render. + * Default: 2. + * * @throws \InvalidArgumentException when sanitize fails * @param mixed $value Value to render * @param array $options Rendering options @@ -38,8 +43,12 @@ class NumberRenderer extends BaseRenderer $result = (float)$result; + if (!isset($options['precision'])) { + $options['precision'] = static::PRECISION; + } + if (!empty($result) && is_numeric($result)) { - $result = number_format($result, static::PRECISION); + $result = number_format($result, $options['precision']); } else { $result = (string)$result; }
Added precision option to NumberRenderer (task #<I>)
QoboLtd_cakephp-csv-migrations
train
php
dc06d4bfb0abec35cc86770af84e963bb7ce1fa2
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index <HASH>..<HASH> 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1170,7 +1170,7 @@ class BasicsTest < ActiveRecord::TestCase def test_current_scope_is_reset Object.const_set :UnloadablePost, Class.new(ActiveRecord::Base) - UnloadablePost.send(:current_scope=, UnloadablePost.all) + UnloadablePost.current_scope = UnloadablePost.all UnloadablePost.unloadable klass = UnloadablePost diff --git a/activerecord/test/cases/scoping/relation_scoping_test.rb b/activerecord/test/cases/scoping/relation_scoping_test.rb index <HASH>..<HASH> 100644 --- a/activerecord/test/cases/scoping/relation_scoping_test.rb +++ b/activerecord/test/cases/scoping/relation_scoping_test.rb @@ -274,8 +274,8 @@ class RelationScopingTest < ActiveRecord::TestCase SpecialComment.unscoped.created end - assert_nil Comment.send(:current_scope) - assert_nil SpecialComment.send(:current_scope) + assert_nil Comment.current_scope + assert_nil SpecialComment.current_scope end def test_scoping_respects_current_class
`current_scope{,=}` are public methods `send` is not necessary.
rails_rails
train
rb,rb
f39d26498fd35d8139e6d2960cdd3edc21965cb2
diff --git a/packages/heroku-container-registry/commands/push.js b/packages/heroku-container-registry/commands/push.js index <HASH>..<HASH> 100644 --- a/packages/heroku-container-registry/commands/push.js +++ b/packages/heroku-container-registry/commands/push.js @@ -100,6 +100,7 @@ let push = async function (context, heroku) { } await Sanbashi.pushImage(job.resource) } + cli.log(`Your images have been successfully pushed. You can now release with them with the 'container:release' command.`) } catch (err) { cli.error(`Error: docker push exited with ${err}`, 1) return
Merge pull request #<I> from heroku/after-push-warning Mention container:release after a push
heroku_cli
train
js
bea4aecd60a70aa08933b50fca978e6ecae9b638
diff --git a/client/ansi/filters/ansi.js b/client/ansi/filters/ansi.js index <HASH>..<HASH> 100644 --- a/client/ansi/filters/ansi.js +++ b/client/ansi/filters/ansi.js @@ -81,7 +81,7 @@ function ansiparse(str) { for (var i = 0; i < str.length; i++) { if (matchingControl !== null) { - if (matchingControl == '\033' && str[i] == '\[') { + if (matchingControl === '\\033' && str[i] === '\\[') { // // We've matched full control code. Lets start matching formating data. // diff --git a/client/utils/ng-sortable-directive.js b/client/utils/ng-sortable-directive.js index <HASH>..<HASH> 100644 --- a/client/utils/ng-sortable-directive.js +++ b/client/utils/ng-sortable-directive.js @@ -1,6 +1,7 @@ 'use strict'; var _ = require('lodash'); +var $ = require('jquery'); var Sortable = require('sortable'); module.exports= function ($parse) {
linting, tests pass! Still broken on heroku and mail notifier
Strider-CD_strider
train
js,js
34f560cdb940d4bee5a072f63b03fefbe447b237
diff --git a/src/Readability.php b/src/Readability.php index <HASH>..<HASH> 100644 --- a/src/Readability.php +++ b/src/Readability.php @@ -53,7 +53,8 @@ class Readability extends Element implements ReadabilityInterface */ $score = 0; - if (!in_array(get_class($node), ['DOMDocument', 'DOMComment'])) { + // Check if the getAttribute is callable, as some elements lack of it (and calling it anyway throws an exception) + if (is_callable('getAttribute', false, $node)) { $hasScore = $node->getAttribute('data-readability'); if ($hasScore !== '') { // Node was initialized previously. Restoring score and setting flag. @@ -254,8 +255,8 @@ class Readability extends Element implements ReadabilityInterface */ public function setContentScore($score) { - if (!in_array(get_class($this->node), ['DOMDocument', 'DOMComment'])) { - + // Check if the getAttribute is callable, as some elements lack of it (and calling it anyway throws an exception) + if (is_callable('getAttribute', false, $node)) { $this->contentScore = (float)$score; // Set score in an attribute of the tag to prevent losing it while creating new Readability objects.
Improved the way we catch calls to getAttribute to elements that lack of that function
andreskrey_readability.php
train
php
ae756dd473d675d72a52c54aa809df0d16624b4c
diff --git a/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/Lane.java b/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/Lane.java index <HASH>..<HASH> 100644 --- a/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/Lane.java +++ b/modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/Lane.java @@ -12,6 +12,8 @@ */ package org.activiti.bpmn.model; +import org.codehaus.jackson.annotate.JsonBackReference; + import java.util.ArrayList; import java.util.List; @@ -32,6 +34,7 @@ public class Lane extends BaseElement { this.name = name; } + @JsonBackReference public Process getParentProcess() { return parentProcess; }
marked process property in lane as backreference, to avoid endless recursion and heap space error when marshalling json-model
Activiti_Activiti
train
java
47a93db3fd3f12959474685ea582a0e3012a7d71
diff --git a/src/DataTable/Selectable.js b/src/DataTable/Selectable.js index <HASH>..<HASH> 100644 --- a/src/DataTable/Selectable.js +++ b/src/DataTable/Selectable.js @@ -128,6 +128,7 @@ export default Component => { // remove unwatned props // see https://github.com/Hacker0x01/react-datepicker/issues/517#issuecomment-230171426 delete otherProps.onSelectionChanged; + delete otherProps.selectedRows; const realRows = selectable ? (rows || data).map((row, idx) => {
fix: react warning: Unknown prop `selectedRows` (#<I>)
tleunen_react-mdl
train
js
b1fd13d06c6a151d04dbb6176c844bd56c43240d
diff --git a/manuscripts/metrics/its.py b/manuscripts/metrics/its.py index <HASH>..<HASH> 100644 --- a/manuscripts/metrics/its.py +++ b/manuscripts/metrics/its.py @@ -96,6 +96,7 @@ class Closed(ITSMetrics): filters = {"state": "closed"} FIELD_COUNT = "id" FIELD_NAME = "url" + FIELD_DATE = "closed_at" class DaysToCloseMedian(ITSMetrics): @@ -162,8 +163,6 @@ class BMI(ITSMetrics): closed = self.closed_class(self.es_url, self.es_index, start=self.start, end=self.end, esfilters=esfilters_closed, interval=self.interval) - # For BMI we need when the ticket was closed - # closed.FIELD_DATE = "closed_at" opened = self.opened_class(self.es_url, self.es_index, start=self.start, end=self.end, esfilters=esfilters_opened, interval=self.interval)
[its] Use closed_at as FIELD_DATE for closed issues metrics
chaoss_grimoirelab-manuscripts
train
py
4e456f771c1f1a351af6f2c27e181fd14c96c967
diff --git a/examples/js/exchange-capabilities.js b/examples/js/exchange-capabilities.js index <HASH>..<HASH> 100644 --- a/examples/js/exchange-capabilities.js +++ b/examples/js/exchange-capabilities.js @@ -121,7 +121,7 @@ const isWindows = process.platform == 'win32' // fix for windows, as it doesn't 'withdraw', ]); - allItems.forEach (methodName => { + allItems.forEach (methodName => { total += 1 @@ -169,4 +169,4 @@ const isWindows = process.platform == 'win32' // fix for windows, as it doesn't log("\nMessy? Try piping to less (e.g. node script.js | less -S -R)\n".red) -}) () \ No newline at end of file +}) ()
Update exchange-capabilities.js
ccxt_ccxt
train
js
8bf5ec656e8e4531afaa158f53fb122c400afa96
diff --git a/lib/echo_uploads.rb b/lib/echo_uploads.rb index <HASH>..<HASH> 100644 --- a/lib/echo_uploads.rb +++ b/lib/echo_uploads.rb @@ -1,5 +1,7 @@ require 'echo_uploads/config' require 'echo_uploads/validation' +require 'echo_uploads/perm_file_saving' +require 'echo_uploads/temp_file_saving' require 'echo_uploads/model' require 'echo_uploads/file' require 'echo_uploads/abstract_store'
Forgot to require a couple files
jarrett_echo_uploads
train
rb
440a1c1a5a7648ba66d4e2f8a0bda21668f44381
diff --git a/cid.go b/cid.go index <HASH>..<HASH> 100644 --- a/cid.go +++ b/cid.go @@ -155,10 +155,6 @@ func NewCidV1(codecType uint64, mhash mh.Multihash) Cid { // Cid represents a self-describing content adressed // identifier. It is formed by a Version, a Codec (which indicates // a multicodec-packed content type) and a Multihash. -// Byte layout: [version, codec, multihash] -// - version uvarint -// - codec uvarint -// - hash mh.Multihash type Cid struct{ str string } // Nil can be used to represent a nil Cid, using Cid{} directly is
Removed description of layout of CID as it is not correct for CIDv0.
ipfs_go-cid
train
go
f3b2e875d4f90648fc0052fbe1fad64386de71c9
diff --git a/wffweb/src/main/java/com/webfirmframework/wffweb/server/page/BrowserPage.java b/wffweb/src/main/java/com/webfirmframework/wffweb/server/page/BrowserPage.java index <HASH>..<HASH> 100644 --- a/wffweb/src/main/java/com/webfirmframework/wffweb/server/page/BrowserPage.java +++ b/wffweb/src/main/java/com/webfirmframework/wffweb/server/page/BrowserPage.java @@ -3032,12 +3032,12 @@ public abstract class BrowserPage implements Serializable { if (Files.notExists(dirPath)) { try { Files.createDirectories(dirPath); + tempDirPath = dirPath; } catch (final IOException e) { LOGGER.severe( "The given path by useExternalDrivePath is invalid or it doesn't have read/write permission."); } } - tempDirPath = dirPath; } return tempDirPath;
Bug fix in getTempDirectory method in BrowserPage
webfirmframework_wff
train
java
424ab9a5f45e6ff73f49af768d80f6255a7a82c1
diff --git a/lib/nats/client.rb b/lib/nats/client.rb index <HASH>..<HASH> 100644 --- a/lib/nats/client.rb +++ b/lib/nats/client.rb @@ -590,7 +590,7 @@ module NATS end def process_info(info) #:nodoc: - @server_info = JSON.parse(info, :symbolize_keys => true, :symbolize_names => true) + @server_info = JSON.parse(info, :symbolize_keys => true, :symbolize_names => true, :symbol_keys => true) if @server_info[:ssl_required] && @ssl start_tls else diff --git a/lib/nats/ext/json.rb b/lib/nats/ext/json.rb index <HASH>..<HASH> 100644 --- a/lib/nats/ext/json.rb +++ b/lib/nats/ext/json.rb @@ -2,6 +2,11 @@ begin require 'yajl' require 'yajl/json_gem' rescue LoadError - require 'rubygems' - require 'json' + begin + require 'oj' + Oj.mimic_JSON() + rescue LoadError + require 'rubygems' + require 'json' + end end
Added support for the Oj JSON parser.
nats-io_ruby-nats
train
rb,rb
6bb1303ee0e03e6b72fff063d286f5e0e418d16c
diff --git a/lxd/project/project.go b/lxd/project/project.go index <HASH>..<HASH> 100644 --- a/lxd/project/project.go +++ b/lxd/project/project.go @@ -11,12 +11,13 @@ const Default = "default" // separator is used to delimit the project name from the suffix. const separator = "_" -// Prefix Add the "<project>_" prefix when the given project name is not "default". -func Prefix(project string, suffix string) string { - if project != Default { - suffix = fmt.Sprintf("%s%s%s", project, separator, suffix) +// Instance Adds the "<project>_" prefix to instance name when the given project name is not "default". +func Instance(projectName string, instanceName string) string { + if projectName != Default { + return fmt.Sprintf("%s%s%s", projectName, separator, instanceName) } - return suffix + + return instanceName } // InstanceParts takes a project prefixed Instance name string and returns the project and instance name.
lxd/project/project: Renames Prefix() to Instance() This is to indicate that this prefix function should only be used with instance names or objects that follow the same project prefix logic as instance names. This is for legacy project prefixes, where the "default" project did not have a prefix.
lxc_lxd
train
go
db777cfd714e1c3440fc13ac080db6c02d19fc2c
diff --git a/src/module.js b/src/module.js index <HASH>..<HASH> 100644 --- a/src/module.js +++ b/src/module.js @@ -1,5 +1,8 @@ /* eslint-disable import/no-extraneous-dependencies */ +import { join } from "path"; + /* covered by nuxt */ +import { move } from "fs-extra"; import _ from "lodash"; import { Utils } from "nuxt"; import chokidar from "chokidar"; @@ -166,6 +169,17 @@ export default function NetlifyCmsModule(moduleOptions) { }) }); } + + // Move cms folder from `dist/_nuxt` folder to `dist/` after nuxt generate + this.nuxt.plugin("generator", generator => { + generator.plugin("generate", async () => { + await move( + join(generator.distNuxtPath, config.adminPath).replace(/\/$/, ""), + join(generator.distPath, config.adminPath).replace(/\/$/, "") + ); + debug("Netlify CMS files copied"); + }); + }); } // REQUIRED if publishing as an NPM package
fix(module): properly move the CMS build to the `dist` folder on `nuxt generate` fixes #<I>
medfreeman_nuxt-netlify-cms-module
train
js
f996504bb5b16b27c5a89e9e2c471af3f2f621fb
diff --git a/salt/states/dockerio.py b/salt/states/dockerio.py index <HASH>..<HASH> 100644 --- a/salt/states/dockerio.py +++ b/salt/states/dockerio.py @@ -10,11 +10,6 @@ wrapper. The base supported wrapper type is `cgroups <https://en.wikipedia.org/wiki/Cgroups>`_, and the `Linux Kernel <https://en.wikipedia.org/wiki/Linux_kernel>`_. -.. warning:: - - This state module is beta. The API is subject to change. No promise - as to performance or functionality is yet present. - .. note:: This state module requires
The docker state is not in beta
saltstack_salt
train
py
ed34e673865130a2b77efcc5c44b883987f146b5
diff --git a/src/Kunstmaan/SeoBundle/Twig/SeoTwigExtension.php b/src/Kunstmaan/SeoBundle/Twig/SeoTwigExtension.php index <HASH>..<HASH> 100755 --- a/src/Kunstmaan/SeoBundle/Twig/SeoTwigExtension.php +++ b/src/Kunstmaan/SeoBundle/Twig/SeoTwigExtension.php @@ -94,8 +94,12 @@ class SeoTwigExtension extends Twig_Extension } - private function getSeoTitle(AbstractPage $entity) + private function getSeoTitle(AbstractPage $entity = null) { + if (is_null($entity)) { + return null; + } + $seo = $this->getSeoFor($entity); if (!is_null($seo)) { @@ -115,8 +119,12 @@ class SeoTwigExtension extends Twig_Extension * @param null $default If given we'll return this text if no SEO title was found. * @return string */ - public function getTitleForPageOrDefault(AbstractPage $entity, $default = null) + public function getTitleForPageOrDefault(AbstractPage $entity = null, $default = null) { + if (is_null($entity)) { + return $default; + } + $arr = array(); $arr[] = $this->getSeoTitle($entity);
Fix errors when called without an AbstractPage object This apparently happened when trying to access non-existant images in one of our projects.
Kunstmaan_KunstmaanBundlesCMS
train
php
a1194859caa6a666df4d7346bed76f993041f2ae
diff --git a/src/resources/assets/js/modules/enso/plugins/__.js b/src/resources/assets/js/modules/enso/plugins/__.js index <HASH>..<HASH> 100644 --- a/src/resources/assets/js/modules/enso/plugins/__.js +++ b/src/resources/assets/js/modules/enso/plugins/__.js @@ -8,8 +8,6 @@ const addMissingKey = (key) => { axios.patch('/api/system/localisation/addKey', { langKey: key }); store.commit('locale/addKey', key); } - - return key; }; Vue.prototype.__ = (key) => {
small refactor in __.js
laravel-enso_Core
train
js
ce4508fa9d71e7443358c211d26132087400ed32
diff --git a/lib/logstasher.rb b/lib/logstasher.rb index <HASH>..<HASH> 100644 --- a/lib/logstasher.rb +++ b/lib/logstasher.rb @@ -49,7 +49,7 @@ module LogStasher require 'logstash-event' self.suppress_app_logs(app) LogStasher::RequestLogSubscriber.attach_to :action_controller - self.logger = app.config.logstasher.logger || Logger.new("#{Rails.root}/log/logstash_#{Rails.env}.log") + self.logger = app.config.logstasher.logger || new_logger("#{Rails.root}/log/logstash_#{Rails.env}.log") self.logger.level = app.config.logstasher.log_level || Logger::WARN self.enabled = true end @@ -89,6 +89,13 @@ module LogStasher end EOM end + + private + + def new_logger(path) + FileUtils.touch path # prevent autocreate messages in log + Logger.new path + end end require 'logstasher/railtie' if defined?(Rails)
Prevent autocreate messages in log file
shadabahmed_logstasher
train
rb
a3b946be03884753818c3de1b5b589fc92f44e92
diff --git a/Net/ChaChing/WebSocket/Client.php b/Net/ChaChing/WebSocket/Client.php index <HASH>..<HASH> 100644 --- a/Net/ChaChing/WebSocket/Client.php +++ b/Net/ChaChing/WebSocket/Client.php @@ -277,26 +277,6 @@ class Net_ChaChing_WebSocket_Client ); } - // set socket receive timeout - $sec = intval($this->timeout / 1000); - $usec = ($this->timeout % 1000) * 1000; - - $result = socket_set_option( - $this->socket, - SOL_SOCKET, - SO_RCVTIMEO, - array('sec' => $sec, 'usec' => $usec) - ); - - if (!$result) { - throw new Net_ChaChing_WebSocket_Client_Exception( - sprintf( - 'Unable to set socket timeout: %s', - socket_strerror(socket_last_error()) - ) - ); - } - // set socket non-blocking for connect socket_set_nonblock($this->socket); @@ -314,6 +294,10 @@ class Net_ChaChing_WebSocket_Client socket_clear_error($this->socket); if ($errno === SOCKET_EINPROGRESS) { + // get connect timeout parts + $sec = intval($this->timeout / 1000); + $usec = ($this->timeout % 1000) * 1000; + $write = array($this->socket); $result = socket_select( $read = null,
Don't set SO_RCVTIMEO on socket. We only read in select loops with explicit timeouts.
silverorange_Net_Notifier
train
php
6579ca4a15c22ac48e3e215fe34668464dd4e6d9
diff --git a/lib/chronic/handler.rb b/lib/chronic/handler.rb index <HASH>..<HASH> 100644 --- a/lib/chronic/handler.rb +++ b/lib/chronic/handler.rb @@ -2,11 +2,11 @@ module Chronic class Handler # @return [Array] A list of patterns - attr_accessor :pattern + attr_reader :pattern # @return [Symbol] The method which handles this list of patterns. # This method should exist inside the {Handlers} module - attr_accessor :handler_method + attr_reader :handler_method # @param [Array] pattern A list of patterns to match tokens against # @param [Symbol] handler_method The method to be invoked when patterns
pattern/handler_method only need read access
mojombo_chronic
train
rb
29be59a65411d95604ef0dbfa3cb772d8571c431
diff --git a/library/src/com/nostra13/universalimageloader/core/download/ImageDownloader.java b/library/src/com/nostra13/universalimageloader/core/download/ImageDownloader.java index <HASH>..<HASH> 100644 --- a/library/src/com/nostra13/universalimageloader/core/download/ImageDownloader.java +++ b/library/src/com/nostra13/universalimageloader/core/download/ImageDownloader.java @@ -71,7 +71,7 @@ public interface ImageDownloader { } private boolean belongsTo(String uri) { - return uri.toLowerCase(Locale.getDefault()).startsWith(uriPrefix); + return uri.toLowerCase(Locale.US).startsWith(uriPrefix); } /** Appends scheme to incoming path */
Change Locale.getDefault() to Locale.US, us for url is better.
nostra13_Android-Universal-Image-Loader
train
java
20c3c9776a49adfbc28c2bfde10e1de8fbc6b6b2
diff --git a/postcodepy/postcodepy.py b/postcodepy/postcodepy.py index <HASH>..<HASH> 100644 --- a/postcodepy/postcodepy.py +++ b/postcodepy/postcodepy.py @@ -222,7 +222,7 @@ class PostcodeError(Exception): # ---------------------------------------------------------------------- -if __name__ == "__main__": +if __name__ == "__main__": # pragma: no cover import sys import os # First and third are OK, the 2nd is not OK and raises an Exception
coverage pragma added to skip __main__ from coverage
hootnot_postcode-api-wrapper
train
py
bdcf2f0df80ecff5339616ed502bb8b58b599a5e
diff --git a/gruntfile.js b/gruntfile.js index <HASH>..<HASH> 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -90,6 +90,12 @@ module.exports = function(grunt) { src: 'package.json', dest: moduleOutDir }, + npmReadme: { + expand: true, + src: 'README.md', + cwd: 'doc', + dest: moduleOutDir + }, handCodedDefinitions: { src: '**/*.d.ts', cwd: 'src/nativescript-angular', @@ -166,6 +172,7 @@ module.exports = function(grunt) { grunt.registerTask("package", [ "clean:packageDefinitions", "copy:handCodedDefinitions", + "copy:npmReadme", "shell:package", ]);
Ship the doc/README.md as the NPM README
NativeScript_nativescript-angular
train
js
acd9f3c9a3331564ee7dad34389962ad2cc1417d
diff --git a/builder/vmware/step_create_vmx.go b/builder/vmware/step_create_vmx.go index <HASH>..<HASH> 100644 --- a/builder/vmware/step_create_vmx.go +++ b/builder/vmware/step_create_vmx.go @@ -88,6 +88,9 @@ func (stepCreateVMX) Run(state multistep.StateBag) multistep.StepAction { vmxData["floppy0.fileName"] = floppyPathRaw.(string) } + // Set this so that no dialogs ever appear from Packer. + vmxData["msg.autoAnswer"] = "true" + vmxPath := filepath.Join(config.OutputDir, config.VMName+".vmx") if err := WriteVMX(vmxPath, vmxData); err != nil { err := fmt.Errorf("Error creating VMX file: %s", err) @@ -137,7 +140,6 @@ ide1:0.fileName = "{{ .ISOPath }}" ide1:0.deviceType = "cdrom-image" isolation.tools.hgfs.disable = "FALSE" memsize = "512" -msg.autoAnswer = "true" nvram = "{{ .Name }}.nvram" pciBridge0.pciSlotNumber = "17" pciBridge0.present = "TRUE"
builder/vmware: always set msg.AutoAnswer
hashicorp_packer
train
go
d4bb7ea9c94f37c8a40d333cccc3c8b6a4733098
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -6,6 +6,7 @@ var express = require('express'); var mime = require('mime'); var pushover = require('pushover'); var async = require('async'); +var marked = require('marked'); var Repo = require('./lib/repo'); var extensions = require('./lib/extensions'); @@ -99,6 +100,10 @@ function blob(req, res) { repo.blob(ref, path, function(err, data) { if(err) { return fof(); } + if(path.match(/.md$/i)) { + data = marked(data.toString()); + } + res.render('blob.jade', { view: 'blob' , repo: name
Display markdown files in blob view
shinuza_pushhub
train
js
73e6a5f39ad3d6708f4d5403b6425db858400b6d
diff --git a/twx/botapi/botapi.py b/twx/botapi/botapi.py index <HASH>..<HASH> 100644 --- a/twx/botapi/botapi.py +++ b/twx/botapi/botapi.py @@ -330,6 +330,18 @@ class TelegramBotRPCRequest(metaclass=ABCMeta): def join(self, timeout=None): self.thread.join(timeout) + return self + + def wait(self): + """ + Wait for the request to finish and return the result or error when finished + + :returns: result or error + :type: result tyoe or Error + """ + self.thread.join() + if self.error is not None: + return self.error return self.result def _clean_params(**params):
adding wait() method in RPC object
datamachine_twx
train
py
bb7561086e72badec3dbc894379ae194a4b79da0
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ setup( long_description_content_type='text/markdown', url='https://github.com/Lvl4Sword/Killer', project_urls={ - 'Gitter': 'https://gitter.im/KillerPython', - 'Discord Server': 'https://discord.gg/python', + 'Discord Server': 'https://discord.gg/bTRxxMJ', + 'IRC': 'https://webchat.freenode.net/?channels=%23killer', }, license=__license__, packages=find_packages(),
Switch Discord, Remove Gitter, Add IRC
Lvl4Sword_Killer
train
py
da950aed85c2d1b62fd8db50a1d09693c0d6dd6a
diff --git a/doc/conf.py b/doc/conf.py index <HASH>..<HASH> 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -62,7 +62,7 @@ List of Pre-Configured Resources "resource_xsede.json"] for res in resource_list: - response = urllib2.urlopen('https://raw.githubusercontent.com/radical-cybertools/radical.pilot/feature/docs_am/src/radical/pilot/configs/%s'%res) + response = urllib2.urlopen('https://raw.githubusercontent.com/radical-cybertools/radical.pilot/devel/src/radical/pilot/configs/%s'%res) html = response.read() with open('resource_list/'+res,'w') as f: f.write(html)
docs_am to devel
radical-cybertools_radical.entk
train
py
125cbaeac5fd8d7ff4ff32d4279b2fed48115a7b
diff --git a/bugwarrior/services/githubutils.py b/bugwarrior/services/githubutils.py index <HASH>..<HASH> 100644 --- a/bugwarrior/services/githubutils.py +++ b/bugwarrior/services/githubutils.py @@ -72,7 +72,8 @@ def _getter(url, auth): # And.. if we didn't get good results, just bail. if response.status_code != 200: raise IOError( - "Non-200 status code %r; %r" % (response.status_code, url)) + "Non-200 status code %r; %r; %r" % ( + response.status_code, url, response.json)) if callable(response.json): # Newer python-requests
More verbose debugging.
ralphbean_bugwarrior
train
py
de2ebe96f0c5cee68485a52576503fbd92916a4b
diff --git a/util/html-element-props.js b/util/html-element-props.js index <HASH>..<HASH> 100644 --- a/util/html-element-props.js +++ b/util/html-element-props.js @@ -41,5 +41,9 @@ HTMLElement.prototype.setProps = function (props = {}) { let propsObject = Object.assign({}, props) delete propsObject.tagName delete propsObject.constructorName + // Special cases for some properties that need to be set early so they are set when Setters get called later. + if (propsObject.hasOwnProperty('locked')) { + this.locked = propsObject.locked + } Object.assign(this, propsObject) } \ No newline at end of file
Because Object.assign sets properties in an order and not all at once, make a special case for assigning the locked property so that it is set when the open property is applied thus the logic in the Setter for open property will properly account for locked
Tangerine-Community_tangy-form
train
js
132b4ffc456bfd0a37c03de646710fd424286f71
diff --git a/provider/lxd/instance.go b/provider/lxd/instance.go index <HASH>..<HASH> 100644 --- a/provider/lxd/instance.go +++ b/provider/lxd/instance.go @@ -38,7 +38,8 @@ func (inst *environInstance) Status() string { // Addresses implements instance.Instance. func (inst *environInstance) Addresses() ([]network.Address, error) { - return nil, errors.NotImplementedf("") + // TODO(ericsnow) This may need to be more dynamic. + return inst.raw.Addresses, nil } func findInst(id instance.Id, instances []instance.Instance) instance.Instance {
Use the known IP addresses for the instance.
juju_juju
train
go
97b989c3564dee150eec721de065f32bc8d2096e
diff --git a/tests/compute/helper.rb b/tests/compute/helper.rb index <HASH>..<HASH> 100644 --- a/tests/compute/helper.rb +++ b/tests/compute/helper.rb @@ -15,7 +15,7 @@ def compute_providers }, :brightbox => { :server_attributes => { - :image_id => 'img-wwgbb' # Ubuntu Lucid 10.04 server (i686) + :image_id => (Brightbox::Compute::TestSupport.image_id rescue 'img-wwgbb') # Ubuntu Lucid 10.04 server (i686) }, :mocked => false },
[brightbox] Use first available image for server tests. This uses the Brightbox::Compute::TestSupport.image_id to specify the image to use as part of :server_attributes when running servers_tests.
fog_fog
train
rb
9828ad1746f7236dbc5c5e4d709f84545ea03640
diff --git a/tests/TyrServiceTest.php b/tests/TyrServiceTest.php index <HASH>..<HASH> 100644 --- a/tests/TyrServiceTest.php +++ b/tests/TyrServiceTest.php @@ -16,7 +16,7 @@ class TyrServiceTest extends \PHPUnit_Framework_TestCase */ public function __construct() { - $this->tyrService = new TyrService('http://tyr.dev.canaltp.fr/v0/', 2, 'sncf'); + $this->tyrService = new TyrService('http://tyr.dev.canaltp.fr/v0/', 2); } public function testCreateUserReturnsValidStatusCode()
fix tests, TyrService instanciation
CanalTP_TyrComponent
train
php
3f1f7eed6463f19f29d206ab58470a13b31d1a6d
diff --git a/bin/pm.js b/bin/pm.js index <HASH>..<HASH> 100755 --- a/bin/pm.js +++ b/bin/pm.js @@ -74,7 +74,8 @@ function lint() { browser: ["view", "menu", "example-setup"].indexOf(repo) > -1, ecmaVersion: 6, semicolons: false, - namedFunctions: true + namedFunctions: true, + trailingCommas: true } blint.checkDir(repo + "/src/", options) if (fs.existsSync(repo + "/test")) {
Allow trailing commas when linting
ProseMirror_prosemirror
train
js
c60be309a94f9d9287bbce5e317b1fbee41ed91a
diff --git a/tasks/validate.js b/tasks/validate.js index <HASH>..<HASH> 100644 --- a/tasks/validate.js +++ b/tasks/validate.js @@ -16,7 +16,8 @@ module.exports = function(grunt) { '<%= config.srcPaths.drupal %>/**/*.inc', '<%= config.srcPaths.drupal %>/**/*.install', '<%= config.srcPaths.drupal %>/**/*.profile', - '!<%= config.srcPaths.drupal %>/**/*.features.*inc' + '!<%= config.srcPaths.drupal %>/**/*.features.*inc', + '!<%= config.srcPaths.drupal %>/sites/**' ], });
Exclude src/sites from phplint check. This is a temporary measure to avoid empty symlinks breaking the build process.
phase2_grunt-drupal-tasks
train
js
bce044ea9bb45d91319ddef19294a59e9953961f
diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java index <HASH>..<HASH> 100755 --- a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java +++ b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java @@ -925,8 +925,14 @@ public class GrailsDataBinder extends ServletRequestDataBinder { } } else if (GrailsDomainConfigurationUtil.isBasicType(associatedType)) { - if (isArray) { - Object[] values = (Object[])v; + Object[] values = null; + if(isArray) { + values = (Object[])v; + } else if(v instanceof String) { + values = new String[]{(String)v}; + } + + if (values != null) { List list = collection instanceof List ? (List)collection : null; for (int i = 0; i < values.length; i++) { Object value = values[i]; @@ -948,6 +954,7 @@ public class GrailsDataBinder extends ServletRequestDataBinder { // ignore } } + mpvs.removePropertyValue(pv); } } }
GRAILS-<I> - improve binding String to collection When binding a String to a collection of some non String type, the conversion was not happening. Relevant functional tests: <URL>
grails_grails-core
train
java
9302a05df6873904084ac20583683e628620e8e1
diff --git a/src/keycloak/authz.py b/src/keycloak/authz.py index <HASH>..<HASH> 100644 --- a/src/keycloak/authz.py +++ b/src/keycloak/authz.py @@ -64,7 +64,7 @@ class KeycloakAuthz(WellKnownMixin, object): result = json.loads(base64.b64decode(token)) return result - def get_permissions(self, token, resource_scopes_tuples=None, submit_request=False): + def get_permissions(self, token, resource_scopes_tuples=None, submit_request=False, ticket=None): """ Request permissions for user from keycloak server. @@ -90,6 +90,8 @@ class KeycloakAuthz(WellKnownMixin, object): for atuple in resource_scopes_tuples: data.append(('permission', '#'.join(atuple))) data.append(('submit_request', submit_request)) + elif ticket: + data.append(('ticket', ticket)) authz_info = {}
make possible to provide ticket for get_permisison
Peter-Slump_python-keycloak-client
train
py
f22845cc0998a38cf15e7d5209a387f59b2d7f5a
diff --git a/wire/AMQPWriter.php b/wire/AMQPWriter.php index <HASH>..<HASH> 100644 --- a/wire/AMQPWriter.php +++ b/wire/AMQPWriter.php @@ -27,6 +27,16 @@ class AMQPWriter } $res = array(); + + while($bytes > 0) + { + $b = bcmod($x,'256'); + $res[] = (int)$b; + $x = bcdiv($x,'256'); + $bytes--; + } + $res = array_reverse($res); + for($i=0;$i<$bytes;$i++) { $b = bcmod($x,'256');
performance improvement based on <URL>
php-amqplib_php-amqplib
train
php
ddefaae682ecedefd1ba493d4168c657b65a7568
diff --git a/xarray/test/test_dataarray.py b/xarray/test/test_dataarray.py index <HASH>..<HASH> 100644 --- a/xarray/test/test_dataarray.py +++ b/xarray/test/test_dataarray.py @@ -1231,7 +1231,7 @@ class TestDataArray(TestCase): self.assertDataArrayIdentical(array, actual) actual = array.resample('24H', dim='time') - expected = DataArray(array.to_series().resample('24H')) + expected = DataArray(array.to_series().resample('24H', how='mean')) self.assertDataArrayIdentical(expected, actual) actual = array.resample('24H', dim='time', how=np.mean)
Test suite fix for compatibility with pandas <I> We need to supply how='mean' to resample because the resample API is changing.
pydata_xarray
train
py
2e5da90e23ff16db56895c1438a18fd2b4af0ed9
diff --git a/test.js b/test.js index <HASH>..<HASH> 100644 --- a/test.js +++ b/test.js @@ -15,16 +15,16 @@ test('selector is added to all rules', t => { return run( t, '.foo, bar .baz, .buzz .bam { }', - '.parent-class .foo, .parent-class bar .baz, .parent-class .buzz .bam { }', - { selector: '.parent-class' }); + '.parent .foo, .parent bar .baz, .parent .buzz .bam { }', + { selector: '.parent' }); }); test('selector not added when rule starts with defined selector', t => { return run( t, - '.parent-class, .foo { }', - '.parent-class, .parent-class .foo { }', - { selector: '.parent-class' }); + '.parent, .foo { }', + '.parent, .parent .foo { }', + { selector: '.parent' }); }); test('does not add parent class to keyframes names', t => { @@ -32,6 +32,6 @@ test('does not add parent class to keyframes names', t => { t, '@keyframes foo { }', '@keyframes foo { }', - { selector: '.parent-class' }); + { selector: '.parent' }); });
updated the 'selector is added to all rules' to check rules with nested selectors.
domwashburn_postcss-parent-selector
train
js
f47167bf97465a64d0242b190bb4671b9733b6cb
diff --git a/openquake/calculators/disaggregation.py b/openquake/calculators/disaggregation.py index <HASH>..<HASH> 100644 --- a/openquake/calculators/disaggregation.py +++ b/openquake/calculators/disaggregation.py @@ -55,15 +55,13 @@ F32 = numpy.float32 def _check_curves(sid, rlzs, curves, imtls, poes_disagg): # there may be sites where the sources are too small to produce # an effect at the given poes_disagg - bad = 0 for rlz, curve in zip(rlzs, curves): for imt in imtls: max_poe = curve[imt].max() for poe in poes_disagg: if poe > max_poe: logging.warning(POE_TOO_BIG, sid, poe, max_poe, rlz, imt) - bad += 1 - return bool(bad) + return True def _matrix(matrices, num_trts, num_mag_bins):
Better logging [skip CI]
gem_oq-engine
train
py
489c602ad20571c61cd18247d8dfbb0e7896a25c
diff --git a/demo/js/dropzones.js b/demo/js/dropzones.js index <HASH>..<HASH> 100644 --- a/demo/js/dropzones.js +++ b/demo/js/dropzones.js @@ -57,13 +57,27 @@ } }) .on('dropactivate', function (event) { - addClass(event.target, '-drop-possible'); - event.target.textContent = 'Drop me here!'; + var active = event.target.getAttribute('active')|0; + // change style if it was previously not active + if (active === 0) { + addClass(event.target, '-drop-possible'); + event.target.textContent = 'Drop me here!'; + } + + event.target.setAttribute('active', active + 1); }) .on('dropdeactivate', function (event) { - removeClass(event.target, '-drop-possible'); - event.target.textContent = 'Dropzone'; + var active = event.target.getAttribute('active')|0; + + // change style if it was previously active + // but will no longer be active + if (active === 1) { + removeClass(event.target, '-drop-possible'); + event.target.textContent = 'Dropzone'; + } + + event.target.setAttribute('active', active - 1); }) .on('dragenter', function (event) { addClass(event.target, '-drop-over');
Count active drops in dropzones demo
taye_interact.js
train
js
a3ce10f5ae718250cc6cb7b1d1ff8e4d241fdb5d
diff --git a/lib/run/responder.js b/lib/run/responder.js index <HASH>..<HASH> 100644 --- a/lib/run/responder.js +++ b/lib/run/responder.js @@ -24,6 +24,7 @@ module.exports = function *(apiDefinition, result) { return { status: parseInt(response.statusCode), + type: accept, body: body }; }; diff --git a/lib/run/route.js b/lib/run/route.js index <HASH>..<HASH> 100644 --- a/lib/run/route.js +++ b/lib/run/route.js @@ -70,6 +70,7 @@ module.exports = function(apiDefinition, program) { console.log('\t--'.gray, 'Creating response'); const response = yield Responder.bind(this, apiDefinition, result); this.status = response.status; + this.type = response.type; this.body = response.body; }; };
Make sure to send along content-type to responses in Lambda run
Testlio_lambda-tools
train
js,js
508de85b52017c8885ee9363b881189052e51103
diff --git a/src/java/voldemort/store/routed/RoutedStore.java b/src/java/voldemort/store/routed/RoutedStore.java index <HASH>..<HASH> 100644 --- a/src/java/voldemort/store/routed/RoutedStore.java +++ b/src/java/voldemort/store/routed/RoutedStore.java @@ -98,7 +98,7 @@ public class RoutedStore implements Store<ByteArray, byte[]> { private final StoreDefinition storeDef; private final FailureDetector failureDetector; - private RoutingStrategy routingStrategy; + private volatile RoutingStrategy routingStrategy; /** * Create a RoutedStoreClient
Add volatile to routingStrategy. It can be modified after initialisation and it's accessed from multiple threads.
voldemort_voldemort
train
java
1081a8cd699dce73d2383636f3764f6a89d0f98f
diff --git a/vault/counters.go b/vault/counters.go index <HASH>..<HASH> 100644 --- a/vault/counters.go +++ b/vault/counters.go @@ -12,8 +12,11 @@ import ( const ( requestCounterDatePathFormat = "2006/01" - countersPath = systemBarrierPrefix + "counters" - requestCountersPath = "sys/counters/requests/" + + // This storage path stores both the request counters in this file, and the activity log. + countersSubPath = "counters/" + + requestCountersPath = "sys/counters/requests/" ) type counters struct { diff --git a/vault/logical_system.go b/vault/logical_system.go index <HASH>..<HASH> 100644 --- a/vault/logical_system.go +++ b/vault/logical_system.go @@ -141,6 +141,7 @@ func NewSystemBackend(core *Core, logger log.Logger) *SystemBackend { LocalStorage: []string{ expirationSubPath, + countersSubPath, }, }, }
Move "counters" path to the logical system's local path list. (#<I>)
hashicorp_vault
train
go,go
a1a7518e1e0d9e1e87aa049ec826005a4fd511e1
diff --git a/nose/test_actionAngle.py b/nose/test_actionAngle.py index <HASH>..<HASH> 100644 --- a/nose/test_actionAngle.py +++ b/nose/test_actionAngle.py @@ -20,7 +20,7 @@ def test_actionAngleIsochrone_basic_actions(): assert numpy.fabs(js[2]) < 10.**-4., 'Close-to-circular orbit in the isochrone potential does not have small Jz' #Close-to-circular orbit, called with time R,vR,vT,z,vz= 1.01,0.01,1.,0.01,0.01 - js= aAI(Orbit([R,vR,vT,z,vz])(0.)) + js= aAI(Orbit([R,vR,vT,z,vz]),0.) assert numpy.fabs(js[0]) < 10.**-4., 'Close-to-circular orbit in the isochrone potential does not have small Jr' assert numpy.fabs(js[2]) < 10.**-4., 'Close-to-circular orbit in the isochrone potential does not have small Jz' return None
fix actionAngle w/ time call
jobovy_galpy
train
py
a7c2c8e31317a7b1db712c50c6a595daf07173a3
diff --git a/spec/lib/danger/danger_core/environment_manager_spec.rb b/spec/lib/danger/danger_core/environment_manager_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lib/danger/danger_core/environment_manager_spec.rb +++ b/spec/lib/danger/danger_core/environment_manager_spec.rb @@ -378,5 +378,19 @@ RSpec.describe Danger::EnvironmentManager, use: :ci_helper do expect(ui.string).to include("Travis note: If you have an open source project, you should ensure 'Display value in build log' enabled for these flags, so that PRs from forks work.") end + + context "cannot find request source" do + it "raises error" do + env = { "DANGER_USE_LOCAL_GIT" => "true" } + fake_ui = double("Cork::Board") + allow(Cork::Board).to receive(:new) { fake_ui } + allow(Danger::RequestSources::RequestSource).to receive(:available_request_sources) { [] } + + expect(fake_ui).to receive(:title) + expect(fake_ui).to receive(:puts).exactly(5).times + + expect { Danger::EnvironmentManager.new(env, nil) }.to raise_error(SystemExit) + end + end end end
Adds EnvironmentManager test to catch missing UI argument will still output to default UI
danger_danger
train
rb
12bc155e4a44f287de4303617cce6cb9a847d5d8
diff --git a/class.form.php b/class.form.php index <HASH>..<HASH> 100644 --- a/class.form.php +++ b/class.form.php @@ -2515,6 +2515,7 @@ STR; return $str; } + /*This function renders the form's javascript. This function is invoked within includes/js.php. The contents returned by this function are then placed in the document's head tag for xhtml strict compliance.*/ public function renderJS($returnString=false) { $str = ""; @@ -3115,6 +3116,7 @@ STR; return $str; } + /*This function renders the form's css. This function is invoked within includes/css.php. The contents returned by this function are then placed in the document's head tag for xhtml strict compliance.*/ public function renderCSS($returnString=false) { $str = ""; diff --git a/includes/js.php b/includes/js.php index <HASH>..<HASH> 100644 --- a/includes/js.php +++ b/includes/js.php @@ -2,6 +2,12 @@ session_start(); header("Content-Type: text/javascript"); +if(empty($_SESSION["pfbc-instances"][$_GET["id"]])) +{ + echo 'alert("php-form-builder-class Configuration Error: Session Not Started\n\nA session is required to generate this form\'s necessary javascript and stylesheet information. To correct, simply add session_start(); before any output in your script.");'; + exit(); +} + $path = "../class.form.php"; if(is_file($path))
Added javascript alerts within includes/js.php to provide helpful feedback on configuration issues. Added a few comments to class.form.php. git-svn-id: <URL>
lkorth_php-form-builder-class
train
php,php
acb0f2c406fc69d0412ef2a9f5bc95de444a7109
diff --git a/Classes/Lib/Db.php b/Classes/Lib/Db.php index <HASH>..<HASH> 100644 --- a/Classes/Lib/Db.php +++ b/Classes/Lib/Db.php @@ -2,6 +2,7 @@ namespace TeaminmediasPluswerk\KeSearch\Lib; use TeaminmediasPluswerk\KeSearch\Plugins\SearchboxPlugin; +use TYPO3\CMS\Core\Context\Context; use TYPO3\CMS\Core\Database\ConnectionPool; use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; @@ -181,8 +182,10 @@ class Db implements \TYPO3\CMS\Core\SingletonInterface // add fe_groups to query $queryForSphinx .= ' @fe_group _group_NULL | _group_0'; - if (!empty($GLOBALS['TSFE']->gr_list)) { - $feGroups = GeneralUtility::trimExplode(',', $GLOBALS['TSFE']->gr_list, 1); + + $context = GeneralUtility::makeInstance(Context::class); + $feGroups = $context->getPropertyFromAspect('frontend.user', 'groupIds'); + if (count($feGroups)) { foreach ($feGroups as $key => $group) { $intval_positive_group = MathUtility::convertToPositiveInteger($group); if ($intval_positive_group) {
[TASK] use context api for fe user grouplist $GLOBALS['TSFE']->gr_list is deprecated; the group list ist fetched by the context api now
teaminmedias-pluswerk_ke_search
train
php
39db52779b733d59c6a73fd5ce3d79cdb9841353
diff --git a/starter-app/src/main/java/ch/ralscha/starter/service/UserService.java b/starter-app/src/main/java/ch/ralscha/starter/service/UserService.java index <HASH>..<HASH> 100644 --- a/starter-app/src/main/java/ch/ralscha/starter/service/UserService.java +++ b/starter-app/src/main/java/ch/ralscha/starter/service/UserService.java @@ -17,8 +17,8 @@ import org.springframework.context.MessageSource; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.authentication.encoding.PasswordEncoder; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -134,7 +134,7 @@ public class UserService { if (!result.hasErrors()) { if (StringUtils.hasText(modifiedUser.getPasswordHash())) { - modifiedUser.setPasswordHash(passwordEncoder.encode(modifiedUser.getPasswordHash())); + modifiedUser.setPasswordHash(passwordEncoder.encodePassword(modifiedUser.getPasswordHash(), null)); } if (!options) {
use jasypt for password hashing
ralscha_extdirectspring
train
java
c7c1a8a9f3b87a347aea02ad2ad93e6c0d0af0c3
diff --git a/elasticsearch_dsl/__init__.py b/elasticsearch_dsl/__init__.py index <HASH>..<HASH> 100644 --- a/elasticsearch_dsl/__init__.py +++ b/elasticsearch_dsl/__init__.py @@ -1,5 +1,7 @@ from .query import Q from .filter import F +from .aggs import A +from .function import SF from .search import Search VERSION = (0, 0, 1)
Added more shortcuts to be importable from top-level
elastic_elasticsearch-dsl-py
train
py
66ff740b90643a2f15a4069b7a496d8768364774
diff --git a/app/routes/application.js b/app/routes/application.js index <HASH>..<HASH> 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -81,6 +81,11 @@ let ApplicationRoute = Route.extend(ApplicationRouteMixin, ModalHelper, SetupUse } }, + beforeModel() { + let intl = this.get('intl'); + intl.setLocale('en'); + }, + model(params, transition) { let session = get(this, 'session'); let isAuthenticated = session && get(session, 'isAuthenticated');
Set default locale to 'en' on application
HospitalRun_hospitalrun-frontend
train
js
aa4d842acf35138ffa496e838fcfd4965167cbe6
diff --git a/symphony/assets/admin.js b/symphony/assets/admin.js index <HASH>..<HASH> 100644 --- a/symphony/assets/admin.js +++ b/symphony/assets/admin.js @@ -38,23 +38,23 @@ var Symphony; if (y < movable.min) { t = movable.target.prev(); do { + movable.delta--; n = t.prev(); if (n.length === 0 || y >= (movable.min -= n.height())) { movable.target.insertBefore(t); break; } - movable.delta--; t = n; } while (true); } else if (y > movable.max) { t = movable.target.next(); do { + movable.delta++; n = t.next(); if (n.length === 0 || y <= (movable.max += n.height())) { movable.target.insertAfter(t); break; } - movable.delta++; t = n; } while (true); } else { @@ -116,7 +116,7 @@ var Symphony; }); }); - $('td, .subsection h4').live('click', function(e) { + $('.selectable td, .subsection h4').live('click', function(e) { if (movable.delta || !/^(?:td|h4)$/i.test(e.target.nodeName)) { return true; }
Fixed incorrect reordering delta reporting
symphonycms_symphony-2
train
js
c8ec211e2e893f02fb3b559294c3cd267dc8cd14
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -67,11 +67,13 @@ setup_args = { 'long_description': long_description, 'author': "Brian Warner", 'author_email': "warner-buildbot@lothar.com", + 'maintainer': "Dustin J. Mitchell", + 'maintainer_email': "dustin@v.igoro.us", 'url': "http://buildbot.net/", 'license': "GNU GPL", # does this classifiers= mean that this can't be installed on 2.2/2.3? 'classifiers': [ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Environment :: No Input/Output (Daemon)', 'Environment :: Web Environment', 'Intended Audience :: Developers',
mark as 5 - Production/Stable, and add me as a maintainer
buildbot_buildbot
train
py
9e2f3b8f556a084a2591ea32723936093ffde4d2
diff --git a/proto/extensions.go b/proto/extensions.go index <HASH>..<HASH> 100644 --- a/proto/extensions.go +++ b/proto/extensions.go @@ -488,7 +488,7 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error } typ := reflect.TypeOf(extension.ExtensionType) if typ != reflect.TypeOf(value) { - return errors.New("proto: bad extension value type") + return fmt.Errorf("proto: bad extension value type. got: %T, want: %T", value, extension.ExtensionType) } // nil extension values need to be caught early, because the // encoder can't distinguish an ErrNil due to a nil extension
proto: return more useful error message in SetExtension (#<I>) Including the types that are mismatched, rather than just stating that there was a type mismatch makes the error easier to debug and fix.
golang_protobuf
train
go
15251e310db03d511c2ca9dca70ecc291138644e
diff --git a/state/backups/create.go b/state/backups/create.go index <HASH>..<HASH> 100644 --- a/state/backups/create.go +++ b/state/backups/create.go @@ -67,6 +67,8 @@ func create(args *createArgs) (*createResult, error) { // deleted at the end of this function. This includes the backup // archive file we built. However, the handle to that file in the // result will still be open and readable. + // If we ever support state machines on Windows, this will need to + // change (you can't delete open files on Windows). return result, nil }
Make a note about deleting open files on Windows.
juju_juju
train
go
53ba1938ae8240066a2120c30dedae1f15b9ef33
diff --git a/lib/orchestrate.rb b/lib/orchestrate.rb index <HASH>..<HASH> 100644 --- a/lib/orchestrate.rb +++ b/lib/orchestrate.rb @@ -10,7 +10,9 @@ module Orchestrate persistence_adapter: Dynflow::PersistenceAdapters::Sequel.new(db_config), transaction_adapter: Dynflow::TransactionAdapters::ActiveRecord.new } - @world = Dynflow::World.new(world_options) + @world = Orchestrate::World.new(world_options).tap do + at_exit { @world.terminate!.wait } + end end def self.trigger(action, *args)
add graceful shutdown of Dynflow World
Katello_katello
train
rb
ca878dc33b86f349d131b7f667369ff410eda42c
diff --git a/src/jsep.js b/src/jsep.js index <HASH>..<HASH> 100644 --- a/src/jsep.js +++ b/src/jsep.js @@ -352,7 +352,7 @@ case 'b': str += '\b'; break; case 'f': str += '\f'; break; case 'v': str += '\x0B'; break; - case '\\': str += '\\'; break; + default : str += ch; } } else { str += ch;
Update jsep.js (#<I>) gobbleStringLiteral small improvement
soney_jsep
train
js
8b04e1c7d2e8db6ac58a92f5099cf11537306e5e
diff --git a/annotations/cypher.go b/annotations/cypher.go index <HASH>..<HASH> 100644 --- a/annotations/cypher.go +++ b/annotations/cypher.go @@ -89,7 +89,7 @@ func (s service) Read(contentUUID string) (thing interface{}, found bool, err er mapToResponseFormat(&results[idx]) } - return results, true, nil + return annotations(results), true, nil } //Delete removes all the annotations for this content. Ignore the nodes on either end - diff --git a/annotations/cypher_test.go b/annotations/cypher_test.go index <HASH>..<HASH> 100644 --- a/annotations/cypher_test.go +++ b/annotations/cypher_test.go @@ -619,7 +619,7 @@ func getAnnotationsService(t *testing.T, platformVersion string) service { func readAnnotationsForContentUUIDAndCheckKeyFieldsMatch(t *testing.T, contentUUID string, expectedAnnotations []annotation) { assert := assert.New(t) storedThings, found, err := annotationsDriver.Read(contentUUID) - storedAnnotations := storedThings.([]annotation) + storedAnnotations := storedThings.(annotations) assert.NoError(err, "Error finding annotations for contentUUID %s", contentUUID) assert.True(found, "Didn't find annotations for contentUUID %s", contentUUID)
Type consistency Always return the same type from Read()
Financial-Times_annotations-rw-neo4j
train
go,go
e6f665f691b7bb04ffd9cf75bee10e8ce66c1775
diff --git a/dispatch/modules/content/models.py b/dispatch/modules/content/models.py index <HASH>..<HASH> 100644 --- a/dispatch/modules/content/models.py +++ b/dispatch/modules/content/models.py @@ -515,6 +515,7 @@ class Poll(Model): for answer in answers: try: answer_obj = PollAnswer.objects.get(poll=self, id=answer['id']) + answer_obj.name = answer['name'] except PollAnswer.DoesNotExist: answer_obj = PollAnswer(poll=self, name=answer['name']) answer_obj.save()
fixed save_answers to actually update the answer name
ubyssey_dispatch
train
py
b55485d4cf15add0e91942ebadb8af6938d51e36
diff --git a/credhub/get.go b/credhub/get.go index <HASH>..<HASH> 100644 --- a/credhub/get.go +++ b/credhub/get.go @@ -30,7 +30,7 @@ func (ch *CredHub) GetAllVersions(name string) ([]credentials.Credential, error) return ch.makeMultiCredentialGetRequest(query) } -// Get returns the current credential version for a given credential name. The returned credential may be of any type. +// GetLatestVersion returns the current credential version for a given credential name. The returned credential may be of any type. func (ch *CredHub) GetLatestVersion(name string) (credentials.Credential, error) { var cred credentials.Credential err := ch.getCurrentCredential(name, &cred)
Fix method name in description [ci skip] [#<I>]
cloudfoundry-incubator_credhub-cli
train
go
dad870ec92dd7c8b069d396aa2da79274d26bca7
diff --git a/src/Resources/Refund.php b/src/Resources/Refund.php index <HASH>..<HASH> 100644 --- a/src/Resources/Refund.php +++ b/src/Resources/Refund.php @@ -49,6 +49,22 @@ class Refund extends BaseResource public $paymentId; /** + * The order id that was refunded. + * + * @var string|null + */ + public $orderId; + + /** + * The order lines contain the actual things the customer ordered. + * The lines will show the quantity, discountAmount, vatAmount and totalAmount + * refunded. + * + * @var array|object[]|null + */ + public $lines; + + /** * The settlement amount * * @var object
Added orderId and lines attributes
mollie_mollie-api-php
train
php
43d084ce6ea4babbeb41455a0192a9177a25807b
diff --git a/lib/moob/idrac6.rb b/lib/moob/idrac6.rb index <HASH>..<HASH> 100644 --- a/lib/moob/idrac6.rb +++ b/lib/moob/idrac6.rb @@ -17,7 +17,7 @@ class Idrac6 < BaseLom v6DHCPEnabled v6DHCPServers v6DNS1 v6DNS2 v6SiteLocal v6SiteLocal3 v6SiteLocal4 v6SiteLocal5 v6SiteLocal6 v6SiteLocal7 v6SiteLocal8 v6SiteLocal9 v6SiteLocal10 v6SiteLocal11 v6SiteLocal12 v6SiteLocal13 v6SiteLocal14 v6SiteLocal15 - ipmiLAN ipmiMinPriv ipmiKey + ipmiLAN ipmiMinPriv ] def initialize hostname, options = {}
don't fetch ipmiKey info don't fetch ipmiKey info, causes the HTTP request to hang on some configurations
spotify_moob
train
rb
5e7ff3740cb73ba87fa3d64a6daa4403349f39f4
diff --git a/tasks/zaproxy.js b/tasks/zaproxy.js index <HASH>..<HASH> 100644 --- a/tasks/zaproxy.js +++ b/tasks/zaproxy.js @@ -100,7 +100,8 @@ module.exports = function (grunt) { // Set up options. var options = this.options({ host: 'localhost', - port: '8080' + port: '8080', + apiKey: '7c3sdphhcg24l7hnjj0dgeg3as' }); var asyncDone = this.async(); @@ -114,11 +115,17 @@ module.exports = function (grunt) { } }; - var zaproxy = new ZapClient({ proxy: 'http://' + options.host + ':' + options.port }); + console.log('SERVER_HOST : ' + options.host); + console.log('SERVER_PORT : ' + options.port); + console.log('APIKEY : ' + options.apiKey); + + var options = { proxy: 'http://' + options.host + ':' + options.port, apikey: options.apiKey }; + + var zaproxy = new ZapClient(options); grunt.log.write('Stopping ZAProxy: '); zaproxy.core.shutdown(function (err) { if (err) { - grunt.log.writeln('ZAProxy does not appear to be running.'); + grunt.fail.warn('ZAProxy does not appear to be running: ' + JSON.stringify(err, null, 2)); done(); return; }
Add apikey in ZapClient
sagely_grunt-zaproxy
train
js
17bc533e80ec486e679064707a0dd61ededf70bc
diff --git a/src/Authentication.php b/src/Authentication.php index <HASH>..<HASH> 100644 --- a/src/Authentication.php +++ b/src/Authentication.php @@ -120,6 +120,34 @@ class Authentication implements AuthenticationInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { + $auth_result = $this->authenticatedUsingAdapters($request); + + if ($auth_result instanceof TransportInterface + && !$auth_result->isEmpty() + ) { + if ($auth_result instanceof AuthenticationTransportInterface) { + $this->setAuthenticatedUser($auth_result->getAuthenticatedUser()); + $this->setAuthenticatedWith($auth_result->getAuthenticatedWith()); + + $this->triggerEvent( + 'user_authenticated', + $auth_result->getAuthenticatedUser(), + $auth_result->getAuthenticatedWith() + ); + } + + $request = $auth_result->applyToRequest($request); + } + + $response = $handler->handle($request); + + if ($auth_result instanceof TransportInterface + && !$auth_result->isEmpty() + ) { + $response = $auth_result->applyToResponse($response); + } + + return $response; } /**
Make authentication utility a fully featured PSR-<I> middleware
activecollab_authentication
train
php
869019982e97a7e114126d484b5389c23b05b161
diff --git a/test/StoragelessTest/Http/SessionMiddlewareTest.php b/test/StoragelessTest/Http/SessionMiddlewareTest.php index <HASH>..<HASH> 100644 --- a/test/StoragelessTest/Http/SessionMiddlewareTest.php +++ b/test/StoragelessTest/Http/SessionMiddlewareTest.php @@ -558,7 +558,7 @@ final class SessionMiddlewareTest extends TestCase public function validMiddlewaresProvider(): array { return $this->defaultMiddlewaresProvider() + [ - [ + 'from-constructor' => [ static function (): SessionMiddleware { return new SessionMiddleware( new Sha256(), @@ -580,12 +580,12 @@ final class SessionMiddlewareTest extends TestCase public function defaultMiddlewaresProvider(): array { return [ - [ + 'from-symmetric' => [ static function (): SessionMiddleware { return SessionMiddleware::fromSymmetricKeyDefaults('not relevant', 100); }, ], - [ + 'from-asymmetric' => [ static function (): SessionMiddleware { return SessionMiddleware::fromAsymmetricKeyDefaults( self::privateKey(),
Fix bug on plus operator over numeric-key arrays
psr7-sessions_storageless
train
php
f69e8c490eace4ee473859d1dd6b7b2538bcae91
diff --git a/gtk/gtk.go b/gtk/gtk.go index <HASH>..<HASH> 100644 --- a/gtk/gtk.go +++ b/gtk/gtk.go @@ -2478,7 +2478,7 @@ func (v *Container) ChildSetProperty(child IWidget, name string, value interface cstr := C.CString(name) defer C.free(unsafe.Pointer(cstr)) - C.gtk_container_child_set_property(v.native(), child.toWidget(), (*C.gchar)(cstr), (*C.GValue)(unsafe.Pointer(gv))) + C.gtk_container_child_set_property(v.native(), child.toWidget(), (*C.gchar)(cstr), (*C.GValue)(unsafe.Pointer(gv.Native()))) return nil }
Fix crash when using Container.ChildSetProperty. An example has been added to gotk3-examples (stack) to test this.
gotk3_gotk3
train
go
36a8d17da1ef2fabfe86f6baef33d9a4651d921c
diff --git a/nosedjango/nosedjango.py b/nosedjango/nosedjango.py index <HASH>..<HASH> 100644 --- a/nosedjango/nosedjango.py +++ b/nosedjango/nosedjango.py @@ -139,11 +139,12 @@ class NoseDjango(Plugin): from django.conf import settings # If the user passed in --django-sqlite, use an in-memory sqlite db - settings.DATABASE_ENGINE = 'sqlite3' - settings.DATABASE_NAME = '' # in-memory database - settings.DATABASE_OPTIONS = {} - settings.DATABASE_USER = '' - settings.DATABASE_PASSWORD = '' + if self._use_sqlite: + settings.DATABASE_ENGINE = 'sqlite3' + settings.DATABASE_NAME = '' # in-memory database + settings.DATABASE_OPTIONS = {} + settings.DATABASE_USER = '' + settings.DATABASE_PASSWORD = '' settings.SOUTH_TESTS_MIGRATE = False # Do our custom testrunner stuff
Made the --django-sqlite option actually doing something instead of always using sqlite, regardless. Oops.
nosedjango_nosedjango
train
py
0e353b378c41de5a67e94286f78fb3c69e1cbe5e
diff --git a/src/SignatureRequestRecipient.php b/src/SignatureRequestRecipient.php index <HASH>..<HASH> 100644 --- a/src/SignatureRequestRecipient.php +++ b/src/SignatureRequestRecipient.php @@ -58,6 +58,7 @@ class SignatureRequestRecipient extends Model implements IAdditionalDocuments 'ip', 'date_signed', 'date_created', + 'access', ]; /**
KSV | API-<I> | return access field to s2s recipient
pdffiller_pdffiller-php-api-client
train
php