diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/salt/returners/local_cache.py b/salt/returners/local_cache.py
index <HASH>..<HASH> 100644
--- a/salt/returners/local_cache.py
+++ b/salt/returners/local_cache.py
@@ -239,6 +239,7 @@ def save_minions(jid, minions, syndic_id=None):
'''
Save/update the serialized list of minions for a given job
'''
+ minions = list(minions)
log.debug(
'Adding minions for job %s%s: %s',
jid,
|
Py3 compat: Force minions to be a list for local serialized caches
|
diff --git a/lfs/credentials.go b/lfs/credentials.go
index <HASH>..<HASH> 100644
--- a/lfs/credentials.go
+++ b/lfs/credentials.go
@@ -17,7 +17,8 @@ type credentialFunc func(Creds, string) (credentialFetcher, error)
var execCreds credentialFunc
func credentials(u *url.URL) (Creds, error) {
- creds := Creds{"protocol": u.Scheme, "host": u.Host, "path": u.Path}
+ path := strings.TrimPrefix(u.Path, "/")
+ creds := Creds{"protocol": u.Scheme, "host": u.Host, "path": path}
cmd, err := execCreds(creds, "fill")
if err != nil {
return nil, err
|
Trim leading slash from the path passed to credential fill
|
diff --git a/classes/Boom/Controller/Cms/Page/Version/Save.php b/classes/Boom/Controller/Cms/Page/Version/Save.php
index <HASH>..<HASH> 100644
--- a/classes/Boom/Controller/Cms/Page/Version/Save.php
+++ b/classes/Boom/Controller/Cms/Page/Version/Save.php
@@ -59,7 +59,9 @@ class Boom_Controller_Cms_Page_Version_Save extends Controller_Cms_Page_Version
// Are we saving and publishing the new version?
if (isset($post->publish))
{
- $this->new_version->set('embargoed_until', $_SERVER['REQUEST_TIME']);
+ $this->new_version
+ ->set('embargoed_until', $_SERVER['REQUEST_TIME'])
+ ->set('published', TRUE);
}
// Has the page title been changed?
|
Bugfix: save and publish not publishing a page which hasn't been published before
|
diff --git a/src/cr/cube/crunch_cube.py b/src/cr/cube/crunch_cube.py
index <HASH>..<HASH> 100644
--- a/src/cr/cube/crunch_cube.py
+++ b/src/cr/cube/crunch_cube.py
@@ -201,6 +201,9 @@ class CrunchCube(object):
return res
def _mr_prune(self, res):
+ if len(res.shape) > 2:
+ # Only perform pruning for 1-D MR cubes.
+ return res
margin = self.margin(axis=0)
ind_prune = margin == 0
return res[~ind_prune]
|
Only prune 1-D MR cubes.
|
diff --git a/conversejs/utils.py b/conversejs/utils.py
index <HASH>..<HASH> 100644
--- a/conversejs/utils.py
+++ b/conversejs/utils.py
@@ -8,8 +8,11 @@ from .register import register_account
def get_conversejs_context(context, xmpp_login=False):
+
+ context['CONVERSEJS_ENABLED'] = conf.CONVERSEJS_ENABLED
+
if not conf.CONVERSEJS_ENABLED:
- return {'CONVERSEJS_ENABLED': conf.CONVERSEJS_ENABLED}
+ return context
context.update(conf.get_conversejs_settings())
|
Fixing bug on CONVERSEJS_ENABLED
|
diff --git a/Kwc/Articles/Detail/Component.php b/Kwc/Articles/Detail/Component.php
index <HASH>..<HASH> 100644
--- a/Kwc/Articles/Detail/Component.php
+++ b/Kwc/Articles/Detail/Component.php
@@ -16,7 +16,14 @@ class Kwc_Articles_Detail_Component extends Kwc_Directories_Item_Detail_Componen
'name' => trlKwf('Feedback')
);
+ $ret['flags']['processInput'] = true;
+
$ret['editComponents'] = array('content', 'questionsAnswers', 'feedback');
return $ret;
}
+
+ public function processInput($input)
+ {
+ $this->getData()->row->markRead();
+ }
}
|
added processInput for ArticlesDetailComponent to track views from user
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -56,8 +56,15 @@ setup(name='polyaxon-deploy',
install_requires=[
"polyaxon-schemas==0.5.4",
],
+ python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
classifiers=[
'Programming Language :: Python',
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
'Operating System :: OS Independent',
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
|
Add python_requires and Trove classifiers
`python_requires` helps pip ensure the correct version of this package is installed for the user's running Python version.
`classifiers` help make it clear on <URL>
|
diff --git a/test/test_mockdata.rb b/test/test_mockdata.rb
index <HASH>..<HASH> 100644
--- a/test/test_mockdata.rb
+++ b/test/test_mockdata.rb
@@ -22,6 +22,12 @@ VCR.configure do |config|
# Allow other test suites to send real HTTP requests
config.allow_http_connections_when_no_cassette = true
+
+ #
+ config.before_record { |cassette| cassette.response.body.force_encoding('UTF-8') }
+ config.filter_sensitive_data('<API_KEY>') { ENV['API_KEY'] }
+ config.filter_sensitive_data('<API_PWD>') { ENV['API_PWD'] }
+ config.filter_sensitive_data('<SHOP_NAME>') { ENV['SHOP_NAME'] }
end
@@ -105,8 +111,6 @@ class TestShopifyDashboardPlus < MiniTest::Test
# Will reuse cassette for tests run the same day (in which the URL paramater created_at_min=YYYY-MM-DD will be identical)
# Will append a new entry on a new day
VCR.use_cassette(:orders_no_paramaters, :record => :new_episodes, :match_requests_on => [:path]) do
-
- #byebug
r = get url
assert_equal last_request.fullpath, '/'
|
Hide API Key and Password from saved test data. Force casettes to store response in plain text, not binary
|
diff --git a/src/client/client.js b/src/client/client.js
index <HASH>..<HASH> 100644
--- a/src/client/client.js
+++ b/src/client/client.js
@@ -410,7 +410,8 @@ define([
var i;
for (i in state.users) {
if (state.users.hasOwnProperty(i)) {
- if (typeof state.users[i].UI.reLaunch === 'function') {
+ if (state.users[i].UI && typeof state.users[i].UI === 'object' &&
+ typeof state.users[i].UI.reLaunch === 'function') {
state.users[i].UI.reLaunch();
}
}
@@ -576,8 +577,7 @@ define([
for (i = 0; i < userIds.length; i++) {
if (state.users[userIds[i]]) {
events = [{eid: null, etype: 'complete'}];
- for (j in state.users[userIds[i]].PATHS
- ) {
+ for (j in state.users[userIds[i]].PATHS) {
events.push({etype: 'unload', eid: j});
}
state.users[userIds[i]].PATTERNS = {};
|
Fixes #<I> make sure UI is not null before accessing relaunch
|
diff --git a/Vps/Component/Generator/Table.php b/Vps/Component/Generator/Table.php
index <HASH>..<HASH> 100644
--- a/Vps/Component/Generator/Table.php
+++ b/Vps/Component/Generator/Table.php
@@ -111,9 +111,6 @@ class Vps_Component_Generator_Table extends Vps_Component_Generator_Abstract
$currentPds = $currentPd;
}
foreach ($currentPds as $currentPd) {
- if ($currentPd->componentClass != $this->_class) {
- throw new Vps_Exception("_getParentDataByRow returned a component with a wrong componentClass '{$currentPd->componentClass}' instead of '$this->_class'");
- }
$data = $this->_createData($currentPd, $row, $s);
if ($data) {
$ret[] = $data;
|
remove this safety check, it is valid to get a different componentClass when using alternativeComponentClass
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
data_files=[(
(BASE_DIR, ['data/nssm_original.exe'])
)],
- install_requires=['indy-plenum-dev==1.6.568',
+ install_requires=['indy-plenum-dev==1.6.569',
'indy-anoncreds-dev==1.0.32',
'python-dateutil',
'timeout-decorator==0.4.0'],
|
INDY-<I>: Updated indy-plenum dependency
|
diff --git a/fedmsg/meta/base.py b/fedmsg/meta/base.py
index <HASH>..<HASH> 100644
--- a/fedmsg/meta/base.py
+++ b/fedmsg/meta/base.py
@@ -25,6 +25,16 @@ class BaseProcessor(object):
""" Base Processor. Without being extended, this doesn't actually handle
any messages.
+ Processors require that an ``internationalization_callable`` be passed to
+ them at instantiation. Internationalization is often done at import time,
+ but we handle it at runtime so that a single process may translate fedmsg
+ messages into multiple languages. Think: an IRC bot that runs
+ #fedora-fedmsg, #fedora-fedmsg-es, #fedora-fedmsg-it. Or: a twitter bot
+ that posts to multiple language-specific accounts.
+
+ That feature is currently unused, but fedmsg.meta supports future
+ internationalization (there may be bugs to work out).
+
"""
# These six properties must be overridden by child-classes.
|
Add note to fedmsg.meta.base about the internationalization callable.
|
diff --git a/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java b/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
index <HASH>..<HASH> 100644
--- a/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
@@ -189,7 +189,10 @@ public class FileCache {
File tempDir = createTempDir();
ZipUtils.unzip(cachedFile, tempDir, new LibFilter());
try {
- FileUtils.moveDirectory(tempDir, destDir);
+ // Recheck in case of concurrent processes
+ if (!destDir.exists()) {
+ FileUtils.moveDirectory(tempDir, destDir);
+ }
} catch (FileExistsException e) {
// Ignore as is certainly means a concurrent process has unziped the same file
}
|
SONAR-<I> Improve stability of tests
|
diff --git a/lib/share_notify/version.rb b/lib/share_notify/version.rb
index <HASH>..<HASH> 100644
--- a/lib/share_notify/version.rb
+++ b/lib/share_notify/version.rb
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module ShareNotify
- VERSION = '0.1.0'.freeze
+ VERSION = '0.1.1'.freeze
end
|
Preparing for <I> release
|
diff --git a/lib/review/latexutils.rb b/lib/review/latexutils.rb
index <HASH>..<HASH> 100644
--- a/lib/review/latexutils.rb
+++ b/lib/review/latexutils.rb
@@ -14,19 +14,19 @@ module ReVIEW
module LaTeXUtils
MATACHARS = {
- '#' => '\symbol{"23}',
- "$" => '\symbol{"24}',
+ '#' => '\#',
+ "$" => '\textdollar{}',
'%' => '\%',
'&' => '\&',
'{' => '\{',
'}' => '\}',
- '_' => '\symbol{"5F}',
+ '_' => '\textunderscore{}',
'^' => '\textasciicircum{}',
'~' => '\textasciitilde{}',
'|' => '\textbar{}',
- '<' => '\symbol{"3C}',
- '>' => '\symbol{"3E}',
- "\\" => '\symbol{"5C}'
+ '<' => '\textless{}',
+ '>' => '\textgreater{}',
+ "\\" => '\textbackslash{}'
}
METACHARS_RE = /[#{Regexp.escape(MATACHARS.keys.join(''))}]/
|
change to make escape notatino more readable
|
diff --git a/modules/cmsadmin/src/models/Block.php b/modules/cmsadmin/src/models/Block.php
index <HASH>..<HASH> 100644
--- a/modules/cmsadmin/src/models/Block.php
+++ b/modules/cmsadmin/src/models/Block.php
@@ -61,6 +61,11 @@ class Block extends \admin\ngrest\base\Model
'restupdate' => ['class', 'group_id'],
];
}
+
+ public function ngRestGroupByField()
+ {
+ return 'group_id';
+ }
/**
* Save id before deleting for clean up in afterDelete()
|
use group field in blocks model ngrest config.
|
diff --git a/lib/tetra/kit.rb b/lib/tetra/kit.rb
index <HASH>..<HASH> 100644
--- a/lib/tetra/kit.rb
+++ b/lib/tetra/kit.rb
@@ -14,7 +14,7 @@ module Tetra
def find_executable(name)
@project.from_directory do
Find.find("kit") do |path|
- next unless path =~ %r{(.*bin)/#{name}$}
+ next unless path =~ %r{(.*bin)/#{name}$} && File.executable?(path)
result = Regexp.last_match[1]
log.debug("found #{name} executable in #{result}")
|
Bugfix: ensure executables have correct permissions
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -66,7 +66,7 @@ TextLayout.prototype.update = function(opt) {
//the metrics for this text layout
this._width = maxLineWidth
this._height = height
- this._descender = font.common.lineHeight - baseline
+ this._descender = lineHeight - baseline
this._baseline = baseline
this._xHeight = getXHeight(font)
this._capHeight = getCapHeight(font)
|
fix for custom lineHeight overrides
|
diff --git a/docs/service.go b/docs/service.go
index <HASH>..<HASH> 100644
--- a/docs/service.go
+++ b/docs/service.go
@@ -197,22 +197,6 @@ func (s *Service) LookupEndpoints(repoName string) (endpoints []APIEndpoint, err
TrimHostname: true,
TLSConfig: tlsConfig,
})
- // v1 mirrors
- // TODO(tiborvass): shouldn't we remove v1 mirrors from here, since v1 mirrors are kinda special?
- for _, mirror := range s.Config.Mirrors {
- mirrorTlsConfig, err := s.tlsConfigForMirror(mirror)
- if err != nil {
- return nil, err
- }
- endpoints = append(endpoints, APIEndpoint{
- URL: mirror,
- // guess mirrors are v1
- Version: APIVersion1,
- Mirror: true,
- TrimHostname: true,
- TLSConfig: mirrorTlsConfig,
- })
- }
// v1 registry
endpoints = append(endpoints, APIEndpoint{
URL: DEFAULT_V1_REGISTRY,
|
Remove v1 registry mirror configuration from LookupEndpoints.
V1 mirrors do not mirror the index and those endpoints should
only be indexes.
|
diff --git a/test/helpers/setup.js b/test/helpers/setup.js
index <HASH>..<HASH> 100644
--- a/test/helpers/setup.js
+++ b/test/helpers/setup.js
@@ -46,7 +46,7 @@ function createWebpackConfig(testAppDir, outputDirName = '', command, argv = {})
argv.context = testAppDir;
const runtimeConfig = parseRuntime(
argv,
- __dirname
+ testAppDir
);
const config = new WebpackConfig(runtimeConfig);
|
Fixing very old bug in tests, where the "cwd" passed to parseRuntime()
was wrong
This was discovered because the .babelrc file was not being seen,
because the cwd was incorrect
|
diff --git a/lib/bootstrap_forms/form_builder.rb b/lib/bootstrap_forms/form_builder.rb
index <HASH>..<HASH> 100644
--- a/lib/bootstrap_forms/form_builder.rb
+++ b/lib/bootstrap_forms/form_builder.rb
@@ -142,7 +142,7 @@ module BootstrapForms
def label_field(&block)
required = object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
- label(@name, block_given? ? block : @options[:label], :class => 'control-label' + (' required' if required))
+ label(@name, block_given? ? block : @options[:label], :class => 'control-label' + (required ? ' required' : ''))
end
%w(help_inline error success warning help_block append prepend).each do |method_name|
@@ -163,4 +163,4 @@ module BootstrapForms
super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append)
end
end
-end
\ No newline at end of file
+end
|
Don't explode for not-required fields. Fixes #8
|
diff --git a/sfmf4j-tests/src/main/java/com/github/sworisbreathing/sfmf4j/test/AbstractSFMF4JTest.java b/sfmf4j-tests/src/main/java/com/github/sworisbreathing/sfmf4j/test/AbstractSFMF4JTest.java
index <HASH>..<HASH> 100644
--- a/sfmf4j-tests/src/main/java/com/github/sworisbreathing/sfmf4j/test/AbstractSFMF4JTest.java
+++ b/sfmf4j-tests/src/main/java/com/github/sworisbreathing/sfmf4j/test/AbstractSFMF4JTest.java
@@ -137,6 +137,18 @@ public abstract class AbstractSFMF4JTest {
*/
fileMonitor.unregisterDirectoryListener(folder, listener);
assertFalse(fileMonitor.isMonitoringDirectory(folder));
+
+ /*
+ * Some implementations may have fired multiple events for the same
+ * operation (i.e. a file change and a file delete), so our lists
+ * are not guaranteed to be empty at this point.
+ *
+ * Now that the listener has been unregistered, we empty the lists
+ * and then verify that we are no longer receiving events.
+ */
+ createdFiles.clear();
+ modifiedFiles.clear();
+ deletedFiles.clear();
File createdAfterUnregister = tempFolder.newFile();
assertNull(createdFiles.poll(eventTimeoutDuration(), eventTimeoutTimeUnit()));
appendBytesToFile(createdAfterUnregister);
|
Flushing out the file lists between unregistering the listeners and verifying that we are not receiving events
Fixes #1
|
diff --git a/ErrorHandler.php b/ErrorHandler.php
index <HASH>..<HASH> 100644
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -230,6 +230,11 @@ class ErrorHandler
*/
public function handleError($errNo, $errStr, $errFile, $errLine, $errContext = array(), Metadata $metadata = null)
{
+ if (0 === error_reporting())
+ {
+ return $this;
+ }
+
$error = new ErrorException($errStr, $errNo, $errFile, $errLine, $errContext);
$metadata = $this->getMetadata($metadata, $error);
$categories = $metadata->getCategories();
|
don't do anything when error_reporting === 0
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -300,6 +300,13 @@ module.exports = {
popSearchPlace: popSearchPlace,
popSearchTitle: popSearchTitle,
+ popSearch: {
+ person : popSearchPerson,
+ organization : popSearchOrganization,
+ place : popSearchPlace,
+ title : popSearchTitle
+ }
+
}
/*
|
feat(api): add popSearch method required by CWRC-WriterBase
popSearch is simply a property on the module referring to an object that in turn references the four
entity search functions of the API. The CWRC-WriterBase uses this object to lookup the methods by
entity type.
|
diff --git a/closure/goog/a11y/aria/roles.js b/closure/goog/a11y/aria/roles.js
index <HASH>..<HASH> 100644
--- a/closure/goog/a11y/aria/roles.js
+++ b/closure/goog/a11y/aria/roles.js
@@ -196,6 +196,9 @@ goog.a11y.aria.Role = {
// ARIA role for a textbox element.
TEXTBOX: 'textbox',
+ // ARIA role for a textinfo element.
+ TEXTINFO: 'textinfo',
+
// ARIA role for an element displaying elapsed time or time remaining.
TIMER: 'timer',
|
Fixes various errors in the JsDoc type declarations caught by the compiler
-------------
Created by MOE: <URL>
|
diff --git a/src/Action/RegisterAction.php b/src/Action/RegisterAction.php
index <HASH>..<HASH> 100644
--- a/src/Action/RegisterAction.php
+++ b/src/Action/RegisterAction.php
@@ -27,6 +27,7 @@ class RegisterAction extends BaseAction
'view' => null,
'viewVar' => null,
'entityKey' => 'entity',
+ 'redirectUrl' => null,
'api' => [
'methods' => ['put', 'post'],
'success' => [
@@ -103,7 +104,12 @@ class RegisterAction extends BaseAction
$this->_trigger('afterRegister', $subject);
$this->setFlash('success', $subject);
- return $this->_redirect($subject, '/');
+ $redirectUrl = $this->config('redirectUrl');
+ if ($redirectUrl === null && $this->_controller()->components()->has('Auth')) {
+ $redirectUrl = $this->_controller()->Auth->config('loginAction');
+ }
+
+ return $this->_redirect($subject, $redirectUrl);
}
/**
|
Redirect to login action by default and allow config.
|
diff --git a/library/CM/Action/Abstract.php b/library/CM/Action/Abstract.php
index <HASH>..<HASH> 100644
--- a/library/CM/Action/Abstract.php
+++ b/library/CM/Action/Abstract.php
@@ -356,6 +356,21 @@ abstract class CM_Action_Abstract extends CM_Class_Abstract implements CM_ArrayC
return $this->getName() . ' ' . $this->getVerbName();
}
+ protected function _track() {
+ CM_KissTracking::getInstance()->trackUser($this->getLabel(), $this->getActor(), null, $this->_trackingProperties);
+ }
+
+ /**
+ * @param array $properties
+ */
+ protected function _setTrackingProperties(array $properties) {
+ $this->_trackingProperties = $properties;
+ }
+
+ protected function _disableTracking() {
+ $this->_trackingEnabled = false;
+ }
+
/**
* @param int $type
* @param string|null $className
|
Add tracking feature to CM_Action_Abstract
|
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index <HASH>..<HASH> 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -78,10 +78,15 @@ func init() {
}
}
- // Check for a clean release build.
- exp := regexp.MustCompile(`^v\d+\.\d+\.\d+(-beta[\d\.]+)?$`)
+ // Check for a clean release build. A release is something like "v0.1.2",
+ // with an optional suffix of letters and dot separated numbers like
+ // "-beta3.47". If there's more stuff, like a plus sign and a commit hash
+ // and so on, then it's not a release. If there's a dash anywhere in
+ // there, it's some kind of beta or prerelease version.
+
+ exp := regexp.MustCompile(`^v\d+\.\d+\.\d+(-[a-z]+[\d\.]+)?$`)
IsRelease = exp.MatchString(Version)
- IsBeta = strings.Contains(Version, "beta")
+ IsBeta = strings.Contains(Version, "-")
stamp, _ := strconv.Atoi(BuildStamp)
BuildDate = time.Unix(int64(stamp), 0)
|
Loosen the requirements on what can be upgraded to what
|
diff --git a/lib/adhearsion/initializer.rb b/lib/adhearsion/initializer.rb
index <HASH>..<HASH> 100644
--- a/lib/adhearsion/initializer.rb
+++ b/lib/adhearsion/initializer.rb
@@ -67,20 +67,20 @@ module Adhearsion
def update_rails_env_var
env = ENV['AHN_ENV']
if env && Adhearsion.config.valid_environment?(env.to_sym)
- if ENV['RAILS_ENV'] != env
+ if ENV['RAILS_ENV'] == env
+ logger.info "Using the configured value for RAILS_ENV : <#{env}>"
+ else
logger.warn "Updating AHN_RAILS variable to <#{env}>"
ENV['RAILS_ENV'] = env
- else
- logger.info "Using the configured value for RAILS_ENV : <#{env}>"
end
else
env = ENV['RAILS_ENV']
- unless env
+ if env
+ logger.info "Using the configured value for RAILS_ENV : <#{env}>"
+ else
env = Adhearsion.config.platform.environment.to_s
logger.info "Defining AHN_RAILS variable to <#{env}>"
ENV['RAILS_ENV'] = env
- else
- logger.info "Using the configured value for RAILS_ENV : <#{env}>"
end
end
env
|
[CS] Double-negatives are evil
|
diff --git a/src/Panel.js b/src/Panel.js
index <HASH>..<HASH> 100644
--- a/src/Panel.js
+++ b/src/Panel.js
@@ -149,7 +149,7 @@ class Panel extends React.Component {
// Convert to array so we can re-use keys.
React.Children.toArray(rawChildren).forEach(child => {
- if (React.isValidElement(child) && child.props.fill) {
+ if (this.shouldRenderFill(child)) {
maybeAddBody();
// Remove the child's unknown `fill` prop.
|
Refact Panel to use shouldRenderFill in renderBody function
|
diff --git a/tests/test_test.py b/tests/test_test.py
index <HASH>..<HASH> 100644
--- a/tests/test_test.py
+++ b/tests/test_test.py
@@ -403,4 +403,4 @@ def test_multiple_cookies():
resp = client.get('/')
assert resp.data == '[]'
resp = client.get('/')
- assert resp.data == "[('test1', u'foo,'), ('test2', u'bar')]"
+ assert resp.data == "[('test1', u'foo'), ('test2', u'bar')]"
diff --git a/werkzeug/test.py b/werkzeug/test.py
index <HASH>..<HASH> 100644
--- a/werkzeug/test.py
+++ b/werkzeug/test.py
@@ -152,7 +152,7 @@ class _TestCookieJar(CookieJar):
for cookie in self:
cvals.append('%s=%s' % (cookie.name, cookie.value))
if cvals:
- environ['HTTP_COOKIE'] = ', '.join(cvals)
+ environ['HTTP_COOKIE'] = '; '.join(cvals)
def extract_wsgi(self, environ, headers):
"""Extract the server's set-cookie headers as cookies into the
|
Fixed a typo that broke a test and multiple cookies in test client
|
diff --git a/kana2/attridict.py b/kana2/attridict.py
index <HASH>..<HASH> 100644
--- a/kana2/attridict.py
+++ b/kana2/attridict.py
@@ -8,6 +8,8 @@ import functools
from multiprocessing.pool import ThreadPool
from typing import Tuple
+from zenlog import log
+
from . import MAX_TOTAL_THREADS_SEMAPHORE
@@ -46,7 +48,16 @@ class AttrIndexedDict(collections.UserDict, abc.ABC):
if _threaded:
pool = ThreadPool(processes=8)
- pool.map(work, self.data.values())
+
+ try:
+ pool.map(work, self.data.values())
+ except KeyboardInterrupt:
+ log.warn("CTRL-C caught, finishing current tasks...")
+ pool.terminate()
+ else:
+ pool.close()
+
+ pool.join()
return self
for item in self.data.values():
|
Correctly handle CTRL-C in attridict threaded map
|
diff --git a/src/java/com/threerings/parlor/game/GameManager.java b/src/java/com/threerings/parlor/game/GameManager.java
index <HASH>..<HASH> 100644
--- a/src/java/com/threerings/parlor/game/GameManager.java
+++ b/src/java/com/threerings/parlor/game/GameManager.java
@@ -1,5 +1,5 @@
//
-// $Id: GameManager.java,v 1.52 2002/10/27 23:54:32 shaper Exp $
+// $Id: GameManager.java,v 1.53 2002/11/02 01:20:59 shaper Exp $
package com.threerings.parlor.game;
@@ -704,13 +704,21 @@ public class GameManager extends PlaceManager
{
BodyObject plobj = (BodyObject)caller;
- // make a note of this player's oid
+ // get the user's player index
int pidx = _gameobj.getPlayerIndex(plobj.username);
if (pidx == -1) {
- Log.warning("Received playerReady() from non-player? " +
- "[caller=" + caller + "].");
+ // only complain if this is not a party game, since it's
+ // perfectly normal to receive a player ready notification
+ // from a user entering a party game in which they're not yet
+ // a participant
+ if (!_gameconfig.isPartyGame()) {
+ Log.warning("Received playerReady() from non-player? " +
+ "[caller=" + caller + "].");
+ }
return;
}
+
+ // make a note of this player's oid
_playerOids[pidx] = plobj.getOid();
// if everyone is now ready to go, get things underway
|
Don't complain about receiving playerReady() for non-players if the game
is a party game.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@<I> <I>f4-<I>e9-<I>-aa3c-eee0fc<I>fb1
|
diff --git a/python/pyspark/rdd.py b/python/pyspark/rdd.py
index <HASH>..<HASH> 100644
--- a/python/pyspark/rdd.py
+++ b/python/pyspark/rdd.py
@@ -29,6 +29,7 @@ from subprocess import Popen, PIPE
from tempfile import NamedTemporaryFile
from threading import Thread
import warnings
+from heapq import heappush, heappop, heappushpop
from pyspark.serializers import NoOpSerializer, CartesianDeserializer, \
BatchedSerializer, CloudPickleSerializer, PairDeserializer, pack_long
@@ -660,6 +661,30 @@ class RDD(object):
m1[k] += v
return m1
return self.mapPartitions(countPartition).reduce(mergeMaps)
+
+ def top(self, num):
+ """
+ Get the top N elements from a RDD.
+
+ Note: It returns the list sorted in ascending order.
+ >>> sc.parallelize([10, 4, 2, 12, 3]).top(1)
+ [12]
+ >>> sc.parallelize([2, 3, 4, 5, 6]).cache().top(2)
+ [5, 6]
+ """
+ def topIterator(iterator):
+ q = []
+ for k in iterator:
+ if len(q) < num:
+ heappush(q, k)
+ else:
+ heappushpop(q, k)
+ yield q
+
+ def merge(a, b):
+ return next(topIterator(a + b))
+
+ return sorted(self.mapPartitions(topIterator).reduce(merge))
def take(self, num):
"""
|
SPARK-<I> Added top in python.
|
diff --git a/scripts/test-contracts.js b/scripts/test-contracts.js
index <HASH>..<HASH> 100644
--- a/scripts/test-contracts.js
+++ b/scripts/test-contracts.js
@@ -27,7 +27,7 @@ const start = async () => {
runTests()
// watch contracts
- watch('./contracts/contracts', { recursive: true }, async (evt, name) => {
+ watch(['./contracts/contracts', './contracts/test'], { recursive: true }, async (evt, name) => {
console.log('%s changed.', name)
runTests()
})
|
Watch contract test files and auto rerun contract tests on change.
|
diff --git a/src/actions.js b/src/actions.js
index <HASH>..<HASH> 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -290,7 +290,7 @@ const initialize: Initialize = (
form: string,
values: Object,
keepDirty?: boolean | Object,
- otherMeta?: Object = {}
+ otherMeta: Object = {}
): InitializeAction => {
if (keepDirty instanceof Object) {
otherMeta = keepDirty
diff --git a/src/createField.js b/src/createField.js
index <HASH>..<HASH> 100644
--- a/src/createField.js
+++ b/src/createField.js
@@ -71,8 +71,6 @@ const createField = (structure: Structure<*, *>) => {
this.props._reduxForm.unregister(this.name)
}
- ref = React.createRef()
-
getRenderedComponent(): ?Component<*, *> {
invariant(
this.props.forwardRef,
|
refactor(createField): remove duplicated ref
|
diff --git a/jenkins/test-history/gen_json.py b/jenkins/test-history/gen_json.py
index <HASH>..<HASH> 100755
--- a/jenkins/test-history/gen_json.py
+++ b/jenkins/test-history/gen_json.py
@@ -193,7 +193,7 @@ def main(server, match):
"""Collect test info in matching jobs."""
print('Finding tests in jobs matching {} at server {}'.format(
match, server))
- matcher = re.compile(match)
+ matcher = re.compile(match).match
tests = get_tests(server, matcher)
with open('tests.json', 'w') as buf:
json.dump(tests, buf, sort_keys=True)
|
Fix test-history. RE objects aren't callable.
|
diff --git a/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java b/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java
+++ b/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java
@@ -4,6 +4,7 @@ import org.infinispan.config.Configuration;
import org.infinispan.remoting.transport.Address;
import org.infinispan.util.Util;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
@@ -17,7 +18,7 @@ import java.util.List;
*/
public class ConsistentHashHelper {
- /**
+ /**
* Returns a new consistent hash of the same type with the given address removed.
*
* @param ch consistent hash to start with
@@ -30,7 +31,7 @@ public class ConsistentHashHelper {
return removeAddressFromUnionConsistentHash((UnionConsistentHash) ch, toRemove, c);
else {
ConsistentHash newCH = (ConsistentHash) Util.getInstance(c.getConsistentHashClass());
- List<Address> caches = ch.getCaches();
+ List<Address> caches = new ArrayList<Address>(ch.getCaches());
caches.remove(toRemove);
newCH.setCaches(caches);
return newCH;
|
migrated <I> to trunk
|
diff --git a/searx/search.py b/searx/search.py
index <HASH>..<HASH> 100644
--- a/searx/search.py
+++ b/searx/search.py
@@ -118,7 +118,11 @@ def search_one_request(engine_name, query, request_params, result_container, tim
if response:
# parse the response
response.search_params = request_params
- search_results = engine.response(response)
+ try:
+ search_results = engine.response(response)
+ except:
+ logger.exception('engine crash: {0}'.format(engine.name))
+ search_results = []
# add results
for result in search_results:
@@ -135,7 +139,6 @@ def search_one_request(engine_name, query, request_params, result_container, tim
engine.stats['engine_time'] += time() - request_params['started']
engine.stats['engine_time_count'] += 1
- #
return success
|
[enh] handle engine response crashes
|
diff --git a/lib/cieloz/requisicao_transacao.rb b/lib/cieloz/requisicao_transacao.rb
index <HASH>..<HASH> 100644
--- a/lib/cieloz/requisicao_transacao.rb
+++ b/lib/cieloz/requisicao_transacao.rb
@@ -127,6 +127,7 @@ class Cieloz::RequisicaoTransacao < Cieloz::Base
}
validates :bandeira, inclusion: { in: BANDEIRAS_DEBITO }, if: "@produto == DEBITO"
+ validates :bandeira, inclusion: { in: Cieloz::Bandeiras::ALL }, if: "@produto == CREDITO"
def attributes
{
diff --git a/test/unit/validations_test.rb b/test/unit/validations_test.rb
index <HASH>..<HASH> 100644
--- a/test/unit/validations_test.rb
+++ b/test/unit/validations_test.rb
@@ -116,7 +116,14 @@ describe Cieloz::RequisicaoTransacao::FormaPagamento do
end
end
- it "validates credito" do
+ it "validates bandeiras for credito" do
+ all_flags.each { |flag|
+ subject.credito flag
+ must ensure_inclusion_of(:bandeira).in_array(all_flags)
+ }
+ end
+
+ it "accepts payment for credito" do
all_flags.each { |flag|
subject.credito flag
assert_equal subject.class::CREDITO, subject.produto
|
Validates bandeiras for credito operations
|
diff --git a/app/controllers/api/MetricsController.java b/app/controllers/api/MetricsController.java
index <HASH>..<HASH> 100644
--- a/app/controllers/api/MetricsController.java
+++ b/app/controllers/api/MetricsController.java
@@ -101,7 +101,7 @@ public class MetricsController extends AuthenticatedController {
clearSessionId.set(userAndSessionId[1]);
} else if (command instanceof SubscribeMetricsUpdates) {
final SubscribeMetricsUpdates metricsUpdates = (SubscribeMetricsUpdates) command;
- Logger.info("Subscribed to metrics {} on node {}",
+ Logger.debug("Subscribed to metrics {} on node {}",
metricsUpdates.metrics,
MoreObjects.firstNonNull(metricsUpdates.nodeId, "ALL"));
|
Lowering severity of log message to prevent log spamming.
|
diff --git a/app/models/content_item.rb b/app/models/content_item.rb
index <HASH>..<HASH> 100644
--- a/app/models/content_item.rb
+++ b/app/models/content_item.rb
@@ -33,7 +33,7 @@ class ContentItem < ApplicationRecord
def publish_state
sorted_field_items = field_items.select { |fi| fi.field.field_type_instance.is_a?(DateTimeFieldType) && !fi.field.metadata["state"].nil? }.sort_by{ |a| a.data["timestamp"] }.reverse
- PublishStateService.new.perform(sorted_field_items, self)
+ PublishStateService.new.content_item_state(sorted_field_items, self)
end
def rss_url(base_url, slug_field_id)
diff --git a/app/services/publish_state_service.rb b/app/services/publish_state_service.rb
index <HASH>..<HASH> 100644
--- a/app/services/publish_state_service.rb
+++ b/app/services/publish_state_service.rb
@@ -1,5 +1,5 @@
-class PublishStateService < ApplicationController
- def perform(sorted_field_items, content_item)
+class PublishStateService < ApplicationService
+ def content_item_state(sorted_field_items, content_item)
@sorted_field_items = sorted_field_items
@content_item = content_item
|
refactor: necessary pub system renamings and refactors
|
diff --git a/src/main/java/org/minimalj/backend/db/DbSyntax.java b/src/main/java/org/minimalj/backend/db/DbSyntax.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/minimalj/backend/db/DbSyntax.java
+++ b/src/main/java/org/minimalj/backend/db/DbSyntax.java
@@ -43,15 +43,7 @@ public abstract class DbSyntax {
throw new IllegalArgumentException();
}
s.append(" NOT NULL");
-// if (idClass == Integer.class || idClass == Long.class) {
-// addAutoIncrement(s);
-// }
}
-
-// to be supported again later
-// protected void addAutoIncrement(StringBuilder s) {
-// s.append(" AUTO_INCREMENT");
-// }
/*
* Only public for tests. If this method doesnt throw an IllegalArgumentException
@@ -193,11 +185,6 @@ public abstract class DbSyntax {
public static class DerbyDbSyntax extends DbSyntax {
-// @Override
-// protected void addAutoIncrement(StringBuilder s) {
-// s.append(" GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1)");
-// }
-
@Override
public void addColumnDefinition(StringBuilder s, PropertyInterface property) {
Class<?> clazz = property.getClazz();
|
DbSyntax: removed comments about incrementing ids
will never be used again
|
diff --git a/lib/smartcoin/version.rb b/lib/smartcoin/version.rb
index <HASH>..<HASH> 100644
--- a/lib/smartcoin/version.rb
+++ b/lib/smartcoin/version.rb
@@ -1,3 +1,3 @@
module Smartcoin
- VERSION = "0.1.3"
+ VERSION = "0.1.5"
end
|
SmartCoin library version <I>
|
diff --git a/src/incremental-indexeddb-adapter.js b/src/incremental-indexeddb-adapter.js
index <HASH>..<HASH> 100644
--- a/src/incremental-indexeddb-adapter.js
+++ b/src/incremental-indexeddb-adapter.js
@@ -820,7 +820,7 @@
// sort chunks in place to load data in the right order (ascending loki ids)
// on both Safari and Chrome, we'll get chunks in order like this: 0, 1, 10, 100...
chunks.sort(function(a, b) {
- return a.index - b.index;
+ return (a.index || 0) - (b.index || 0);
});
}
|
[IncrementalIDB] Fix critical regression with chunk ordering at load time
|
diff --git a/tasks/focus.js b/tasks/focus.js
index <HASH>..<HASH> 100644
--- a/tasks/focus.js
+++ b/tasks/focus.js
@@ -15,6 +15,11 @@ module.exports = function(grunt) {
var watchers = grunt.config.get('watch'),
filter = new ObjectFilter(this.data);
+ if (typeof watchers !== 'object') {
+ grunt.fail.warn('watch config must be defined and be an object');
+ return;
+ }
+
grunt.config.set('watch', filter.process(watchers));
grunt.task.run(['watch']);
});
|
Fail grunt and warn if the watch config isn't present or not an object
|
diff --git a/src/api/on.js b/src/api/on.js
index <HASH>..<HASH> 100644
--- a/src/api/on.js
+++ b/src/api/on.js
@@ -76,5 +76,37 @@ module.exports = db => (path, fn) => {
let id = listenerId
return function unsubscribe() {
delete db.updates.fns[path][id]
+
+ // Remove everything related to this path as no
+ // more listeners exist
+ if (Object.keys(db.updates.fns[path]).length === 0) {
+ db.updates.fns[path] = null
+ delete db.updates.fns[path]
+ db.updates.cache[path] = null
+ delete db.updates.cache[path]
+
+ let triggers = db.updates.triggers
+ let key
+ let keys = Object.keys(triggers)
+ let l = keys.length
+ let i
+ let arr
+
+ while (l--) {
+ key = keys[l]
+ arr = triggers[key]
+ i = arr.indexOf(path)
+
+ if (i !== -1) {
+ arr.splice(i, 1)
+ }
+
+ if (arr.length === 0) {
+ triggers[key] = null
+ delete triggers[key]
+ }
+ }
+ }
+
}
}
|
Remove everything related to a listener instance if no more listener fns are present
|
diff --git a/opts/secret.go b/opts/secret.go
index <HASH>..<HASH> 100644
--- a/opts/secret.go
+++ b/opts/secret.go
@@ -4,7 +4,6 @@ import (
"encoding/csv"
"fmt"
"os"
- "path/filepath"
"strconv"
"strings"
@@ -53,10 +52,6 @@ func (o *SecretOpt) Set(value string) error {
case "source", "src":
options.SecretName = value
case "target":
- tDir, _ := filepath.Split(value)
- if tDir != "" {
- return fmt.Errorf("target must not be a path")
- }
options.File.Name = value
case "uid":
options.File.UID = value
|
support custom paths for secrets
This adds support to specify custom container paths for secrets.
|
diff --git a/src/Keyteq/Keymedia/API.php b/src/Keyteq/Keymedia/API.php
index <HASH>..<HASH> 100644
--- a/src/Keyteq/Keymedia/API.php
+++ b/src/Keyteq/Keymedia/API.php
@@ -72,6 +72,18 @@ class API
return $result;
}
+ public function updateMedia($id, array $tags = array(), array $attributes = array())
+ {
+ $tags = join(',', $tags);
+ $args = compact('tags', 'attributes');
+ $payload = array_filter($args);
+ $resource = "media/{$id}";
+ $response = $this->connector->postResource($resource, $payload);
+ $result = $this->mediaMapper->mapItem($response);
+
+ return $result;
+ }
+
public function postMedia($file, $name, array $tags = array(), array $attributes = array())
{
$args = compact('file', 'name', 'tags', 'attributes');
|
Add the method to repost tags/attributes on a media
|
diff --git a/qtpy/tests/test_qtsql.py b/qtpy/tests/test_qtsql.py
index <HASH>..<HASH> 100644
--- a/qtpy/tests/test_qtsql.py
+++ b/qtpy/tests/test_qtsql.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import
import pytest
from qtpy import QtSql
-def test_qtsvg():
+def test_qtsql():
"""Test the qtpy.QtSql namespace"""
assert QtSql.QSqlDatabase is not None
# assert QtSql.QSqlDriverCreator is not None
|
Rename test_qtsvg() to test_qtsql() in test_qtsql.py
|
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
@@ -8,8 +8,10 @@ export default {
device: {
preDiscoveryServices: {
wdmServiceUrl: process.env.WDM_SERVICE_URL || 'https://wdm-a.wbx2.com/wdm/api/v1',
+ u2cServiceUrl: process.env.U2C_SERVICE_URL || 'https://u2c.wbx2.com/u2c/api/v1',
hydraServiceUrl: process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1',
wdm: process.env.WDM_SERVICE_URL || 'https://wdm-a.wbx2.com/wdm/api/v1',
+ u2c: process.env.U2C_SERVICE_URL || 'https://u2c.wbx2.com/u2c/api/v1',
hydra: process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1'
},
defaults: {
|
refactor(internal-plugin-wdm): add u2c service url to config
Add the u2c service url to the prediscovery services list
in internal-plugin-wdm's config.js.
|
diff --git a/glue/ligolw/lsctables.py b/glue/ligolw/lsctables.py
index <HASH>..<HASH> 100644
--- a/glue/ligolw/lsctables.py
+++ b/glue/ligolw/lsctables.py
@@ -620,6 +620,8 @@ class SnglInspiralTable(table.Table):
@param slide_num: the slide number to recover (contained in the event_id)
"""
slideTrigs = table.new_from_template(self)
+ if slide_num < 0:
+ slide_num = 5000 - slide_num
for row in self:
if ( (row.event_id % 1000000000) / 100000 ) == slide_num:
slideTrigs.append(row)
|
handle the strange numbering convention for sngl_inspiral time slides
|
diff --git a/spec/mandrill/sender_spec.rb b/spec/mandrill/sender_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/mandrill/sender_spec.rb
+++ b/spec/mandrill/sender_spec.rb
@@ -104,7 +104,7 @@ describe MultiMail::Sender::Mandrill do
end
it 'rejects an invalid email' do
- p service.deliver!(message_with_invalid_to)
+ expect { service.deliver!(message_with_invalid_to) }.to raise_error
expect { service.deliver!(message_with_no_body) }.to raise_error
end
end
diff --git a/spec/simple/sender_spec.rb b/spec/simple/sender_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/simple/sender_spec.rb
+++ b/spec/simple/sender_spec.rb
@@ -27,8 +27,8 @@ describe MultiMail::Sender::Simple do
it 'should send email' do
message.delivery_method :smtp, {
:address => 'smtp.gmail.com',
- :port => 25,
- # :domain => 'smtp.gmail.com',
+ :port => 587,
+ :domain => 'smtp.gmail.com',
:user_name => ENV['GMAIL_USERNAME'],
:password => ENV['GMAIL_PASSWORD'],
:authentication => 'plain',
|
trying again to resolve travis error
|
diff --git a/dataviews/plots.py b/dataviews/plots.py
index <HASH>..<HASH> 100644
--- a/dataviews/plots.py
+++ b/dataviews/plots.py
@@ -1072,7 +1072,7 @@ class CoordinateGridPlot(OverlayPlot):
w, h = self._get_dims(view)
if view.type == SheetOverlay:
data = view.last[-1].data if self.situate else view.last[-1].roi.data
- opts = View.options.style(view).opts
+ opts = View.options.style(view.last[-1]).opts
else:
data = view.last.data if self.situate else view.last.roi.data
opts = View.options.style(view).opts
|
Fixed style access in CoordinateGridPlot
|
diff --git a/client/jetpack-connect/user-type/index.js b/client/jetpack-connect/user-type/index.js
index <HASH>..<HASH> 100644
--- a/client/jetpack-connect/user-type/index.js
+++ b/client/jetpack-connect/user-type/index.js
@@ -33,7 +33,7 @@ class JetpackUserType extends Component {
return (
<MainWrapper isWide>
- <div className="user-type__connect-step">
+ <div className="user-type__connect-step jetpack-connect__step">
<FormattedHeader
headerText={ translate( 'Are you setting up this site for yourself or someone else?' ) }
/>
|
Jetpack Connect: Fix colophon alignment on user type step (#<I>)
|
diff --git a/registration/auth_urls.py b/registration/auth_urls.py
index <HASH>..<HASH> 100644
--- a/registration/auth_urls.py
+++ b/registration/auth_urls.py
@@ -37,16 +37,19 @@ urlpatterns = [
name='auth_logout'),
url(r'^password/change/$',
auth_views.password_change,
+ {'post_change_redirect': 'auth_password_change_done'},
name='auth_password_change'),
url(r'^password/change/done/$',
auth_views.password_change_done,
name='auth_password_change_done'),
url(r'^password/reset/$',
auth_views.password_reset,
+ {'post_reset_redirect': 'auth_password_reset_done'},
name='auth_password_reset'),
url(r'^password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/'
r'(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
auth_views.password_reset_confirm,
+ {'post_reset_redirect': 'auth_password_reset_complete'},
name='auth_password_reset_confirm'),
url(r'^password/reset/complete/$',
auth_views.password_reset_complete,
|
Due to overriding the auth url names with auth_ prefix the
post_redirects must also be overridden
|
diff --git a/go/systests/team_invite_test.go b/go/systests/team_invite_test.go
index <HASH>..<HASH> 100644
--- a/go/systests/team_invite_test.go
+++ b/go/systests/team_invite_test.go
@@ -385,7 +385,6 @@ func TestImpTeamWithMultipleRooters(t *testing.T) {
}
func TestClearSocialInvitesOnAdd(t *testing.T) {
- t.Skip()
tt := newTeamTester(t)
defer tt.cleanup()
|
Unskip test to see what happens
|
diff --git a/test/integration/minibundle_production_mode_test.rb b/test/integration/minibundle_production_mode_test.rb
index <HASH>..<HASH> 100644
--- a/test/integration/minibundle_production_mode_test.rb
+++ b/test/integration/minibundle_production_mode_test.rb
@@ -624,6 +624,7 @@ module Jekyll::Minibundle::Test
assert_equal(org_mtime, file_mtime_of(expected_js_path))
assert_equal(1, get_minifier_cmd_count)
+ assert_equal("/js-root/#{JS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_js_path_from_index)
end
end
|
Add assertion to ensure substition was correct
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,31 @@
#!/usr/bin/env python
+import re
try:
from setuptools import setup
except ImportError:
from distutils.core import setup
-version = '0.1'
+
+__version__ = ''
+with open('helium/__about__.py', 'r') as fd:
+ reg = re.compile(r'__version__ = [\'"]([^\'"]*)[\'"]')
+ for line in fd:
+ m = reg.match(line)
+ if m:
+ __version__ = m.group(1)
+ break
+
+if not __version__:
+ raise RuntimeError('Cannot find version information')
+
+version = __version__
authors = 'Marc Nijdam'
emails = ''
packages = ['helium']
requires = [
"future>=0.15",
- "requests==2.10.0",
+ "requests<2.11",
"uritemplate>=0.6",
"inflection>=0.3",
]
@@ -26,5 +40,5 @@ setup(
url='https://github.com/helium/helium-python',
packages=packages,
install_requires=requires,
- license='MIT',
+ license='BSD',
)
|
Feature/version (#<I>)
* Update license
* Extract version information from the library
|
diff --git a/lib/queue.js b/lib/queue.js
index <HASH>..<HASH> 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -58,6 +58,6 @@ Queue.prototype.ensureIndex = function(){
//Ensures there's a reasonable index for the poling dequeue
//Status is first b/c querying by status = queued should be very selective
this.collection.ensureIndex({ status: 1, queue: 1, enqueued: 1 }, function(err){
- console.error(err);
+ if(err) console.error(err);
});
};
\ No newline at end of file
|
Only log the error if there was one
|
diff --git a/kie-api/src/main/java/org/kie/api/command/KieCommands.java b/kie-api/src/main/java/org/kie/api/command/KieCommands.java
index <HASH>..<HASH> 100644
--- a/kie-api/src/main/java/org/kie/api/command/KieCommands.java
+++ b/kie-api/src/main/java/org/kie/api/command/KieCommands.java
@@ -116,5 +116,7 @@ public interface KieCommands {
Command<FactHandle> fromExternalFactHandleCommand(String factHandleExternalForm);
Command<FactHandle> fromExternalFactHandleCommand(String factHandleExternalForm, boolean disconnected);
+
+ Command newAgendaGroupSetFocus(String name);
}
|
allow to create an AgendaGroupSetFocusCommand from public api
|
diff --git a/salt/utils/validate/user.py b/salt/utils/validate/user.py
index <HASH>..<HASH> 100644
--- a/salt/utils/validate/user.py
+++ b/salt/utils/validate/user.py
@@ -9,6 +9,8 @@ import logging
log = logging.getLogger(__name__)
+VALID_USERNAME= re.compile(r'[a-z_][a-z0-9_-]*[$]?', re.IGNORECASE)
+
def valid_username(user):
'''
@@ -20,5 +22,4 @@ def valid_username(user):
if len(user) > 32:
return False
- valid = re.compile(r'[a-z_][a-z0-9_-]*[$]?', re.IGNORECASE)
- return valid.match(user) is not None
+ return VALID_USERNAME.match(user) is not None
|
Move re compilation to the module load
|
diff --git a/tests/acceptance/course/competencies-test.js b/tests/acceptance/course/competencies-test.js
index <HASH>..<HASH> 100644
--- a/tests/acceptance/course/competencies-test.js
+++ b/tests/acceptance/course/competencies-test.js
@@ -65,9 +65,10 @@ module('Acceptance | Course - Competencies', function(hooks) {
this.user.update({ administeredSchools: [this.school] });
await page.visit({ courseId: 1, details: true, courseObjectiveDetails: true });
await page.objectives.current[1].manageParents();
- await page.objectiveParentManager.competencies[1].objectives[0].add();
- assert.ok(page.objectiveParentManager.competencies[0].objectives[0].notSelected);
- assert.ok(page.objectiveParentManager.competencies[1].objectives[0].selected);
+ const m = page.objectives.manageObjectiveParents;
+ await m.competencies[1].objectives[0].add();
+ assert.ok(m.competencies[0].objectives[0].notSelected);
+ assert.ok(m.competencies[1].objectives[0].selected);
await page.objectives.save();
assert.equal(page.collapsedCompetencies.title, 'Competencies (2)');
|
Fix test to use new page object structure
|
diff --git a/lib/fog/bluebox/models/compute/server.rb b/lib/fog/bluebox/models/compute/server.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/bluebox/models/compute/server.rb
+++ b/lib/fog/bluebox/models/compute/server.rb
@@ -57,7 +57,9 @@ module Fog
end
def public_ip_address
- ips.first
+ if ip = ips.first
+ ip['address']
+ end
end
def ready?
|
Fix bluebox's Server#public_ip_address
This should be returning a String not a Hash.
|
diff --git a/lib/dnsync/recurring_zone_updater.rb b/lib/dnsync/recurring_zone_updater.rb
index <HASH>..<HASH> 100644
--- a/lib/dnsync/recurring_zone_updater.rb
+++ b/lib/dnsync/recurring_zone_updater.rb
@@ -19,7 +19,8 @@ module Dnsync
return self
end
- @running.value = true
+ @running.value = true
+ @last_updated_at.value = Time.now
@thread.value = Thread.new do
Thread.current.abort_on_exception = true
|
Give the system a chance to do the first update
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -220,7 +220,8 @@ setup(
python_requires='>=3.5',
setup_requires=[
'setuptools_scm', # so that version will work
- 'cffi>=1.9.1' # to build the leptonica module
+ 'cffi>=1.9.1', # to build the leptonica module
+ 'pytest-runner' # to enable python setup.py test
],
use_scm_version={'version_scheme': 'post-release'},
cffi_modules=[
|
pytest-runner should be a setup requirement
|
diff --git a/Kwf_js/User/Login/Dialog.js b/Kwf_js/User/Login/Dialog.js
index <HASH>..<HASH> 100644
--- a/Kwf_js/User/Login/Dialog.js
+++ b/Kwf_js/User/Login/Dialog.js
@@ -3,7 +3,7 @@ Kwf.User.Login.Dialog = Ext.extend(Ext.Window,
{
initComponent: function()
{
- this.height = 255;
+ this.height = 275;
this.width = 310;
this.modal = true;
this.title = trlKwf('Login');
|
increase login dialog height so given message is visible
this message usually contains text like not enough permissions
|
diff --git a/lib/hyalite/version.rb b/lib/hyalite/version.rb
index <HASH>..<HASH> 100644
--- a/lib/hyalite/version.rb
+++ b/lib/hyalite/version.rb
@@ -1,3 +1,3 @@
module Hyalite
- VERSION = "0.2.8"
+ VERSION = "0.3.0"
end
|
Bump hyalite to <I>
|
diff --git a/entry.go b/entry.go
index <HASH>..<HASH> 100644
--- a/entry.go
+++ b/entry.go
@@ -63,11 +63,7 @@ func (e *Entry) WithError(err error) *Entry {
file = parts[1]
}
- ctx = ctx.WithFields(Fields{
- "function": name,
- "filename": file,
- "line": line,
- })
+ ctx = ctx.WithField("source", fmt.Sprintf("%s: %s:%s", name, file, line))
}
return ctx
|
change distinct frame fields to "source"
anyone have a better name? something that would have fewer collisions
would be nice
|
diff --git a/lib/aduki/version.rb b/lib/aduki/version.rb
index <HASH>..<HASH> 100644
--- a/lib/aduki/version.rb
+++ b/lib/aduki/version.rb
@@ -1,3 +1,3 @@
module Aduki
- VERSION = "0.0.1"
+ VERSION = "0.0.2"
end
|
version: bump to <I>
|
diff --git a/sc2/sc2process.py b/sc2/sc2process.py
index <HASH>..<HASH> 100644
--- a/sc2/sc2process.py
+++ b/sc2/sc2process.py
@@ -26,9 +26,16 @@ class kill_switch(object):
p._clean()
class SC2Process(object):
- def __init__(self, fullscreen=False):
+ def __init__(self, host="127.0.0.1", port=None, fullscreen=False):
+ assert isinstance(host, str)
+ assert isinstance(port, int) or port is None
+
self._fullscreen = fullscreen
- self._port = portpicker.pick_unused_port()
+ self._host = host
+ if port is None:
+ self._port = portpicker.pick_unused_port()
+ else:
+ self._port = port
self._tmp_dir = tempfile.mkdtemp(prefix="SC2_")
self._process = None
self._ws = None
@@ -56,12 +63,12 @@ class SC2Process(object):
@property
def ws_url(self):
- return f"ws://127.0.0.1:{self._port}/sc2api"
+ return f"ws://{self._host}:{self._port}/sc2api"
def _launch(self):
return subprocess.Popen([
Paths.EXECUTABLE,
- "-listen", "127.0.0.1",
+ "-listen", self._host,
"-port", str(self._port),
"-displayMode", "1" if self._fullscreen else "0",
"-dataDir", Paths.BASE,
|
Allow custom hostname and port for sc2process websocket
|
diff --git a/lib/active_scaffold/data_structures/action_links.rb b/lib/active_scaffold/data_structures/action_links.rb
index <HASH>..<HASH> 100644
--- a/lib/active_scaffold/data_structures/action_links.rb
+++ b/lib/active_scaffold/data_structures/action_links.rb
@@ -71,11 +71,9 @@ module ActiveScaffold::DataStructures
end
def delete(val)
- @set.delete_if do |item|
- if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
- item.delete(val)
- else
- item.action == val.to_s
+ self.each do |link, set|
+ if link.action == val.to_s
+ set.delete_if {|item|item.action == val.to_s}
end
end
end
@@ -86,7 +84,7 @@ module ActiveScaffold::DataStructures
if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
item.each(type, &block)
else
- yield item
+ yield item, @set
end
}
end
|
Bugfix: delete action_link did not work as expected
|
diff --git a/lib/que/worker.rb b/lib/que/worker.rb
index <HASH>..<HASH> 100644
--- a/lib/que/worker.rb
+++ b/lib/que/worker.rb
@@ -110,12 +110,6 @@ module Que
# a worker, and make sure to wake up the wrangler when @wake_interval is
# changed in Que.wake_interval= below.
@wake_interval = 5
- @wrangler = Thread.new do
- loop do
- sleep *@wake_interval
- wake! if @wake_interval
- end
- end
class << self
attr_reader :mode, :wake_interval
@@ -136,6 +130,7 @@ module Que
def worker_count=(count)
set_mode(count > 0 ? :async : :off)
set_worker_count(count)
+ wrangler # Make sure the wrangler thread has been instantiated.
end
def worker_count
@@ -144,7 +139,7 @@ module Que
def wake_interval=(interval)
@wake_interval = interval
- @wrangler.wakeup
+ wrangler.wakeup
end
def wake!
@@ -157,6 +152,15 @@ module Que
private
+ def wrangler
+ @wrangler ||= Thread.new do
+ loop do
+ sleep *@wake_interval
+ wake! if @wake_interval
+ end
+ end
+ end
+
def set_mode(mode)
if mode != @mode
Que.log :event => 'mode_change', :value => mode.to_s
|
Don't instantiate the wrangler thread until a worker_count is set, to work better with forking. Fixes #<I>.
|
diff --git a/Canvas.js b/Canvas.js
index <HASH>..<HASH> 100644
--- a/Canvas.js
+++ b/Canvas.js
@@ -83,7 +83,7 @@ Canvas.prototype = {
// For IE
var w = this.canvas.width;
this.canvas.width = 1;
- canvas.width = w;
+ this.canvas.width = w;
}
};
\ No newline at end of file
|
Preliminary SliderControls working
|
diff --git a/lib/heroku/command/ps.rb b/lib/heroku/command/ps.rb
index <HASH>..<HASH> 100644
--- a/lib/heroku/command/ps.rb
+++ b/lib/heroku/command/ps.rb
@@ -247,16 +247,16 @@ class Heroku::Command::Ps < Heroku::Command::Base
alias_command "stop", "ps:stop"
- # ps:resize DYNO1=1X|2X [DYNO2=1X|2X ...]
+ # ps:resize DYNO1=1X|2X|PX [DYNO2=1X|2X|PX ...]
#
# resize dynos to the given size
#
# Example:
#
- # $ heroku ps:resize web=2X worker=1X
+ # $ heroku ps:resize web=PX worker=2X
# Resizing and restarting the specified dynos... done
- # web dynos now 2X ($0.10/dyno-hour)
- # worker dynos now 1X ($0.05/dyno-hour)
+ # web dynos now PX ($0.80/dyno-hour)
+ # worker dynos now 2X ($0.10/dyno-hour)
#
def resize
app
|
update usage docs to mention PX dynos
|
diff --git a/src/ui-scroll.js b/src/ui-scroll.js
index <HASH>..<HASH> 100644
--- a/src/ui-scroll.js
+++ b/src/ui-scroll.js
@@ -8,7 +8,7 @@ angular.module('ui.scroll', [])
.constant('JQLiteExtras', JQLiteExtras)
.run(['JQLiteExtras', (JQLiteExtras) => {
- !window.jQuery ? (new JQLiteExtras()).registerFor(angular.element) : null;
+ !(angular.element.fn && angular.element.fn.jquery) ? new JQLiteExtras().registerFor(angular.element) : null;
ElementRoutines.addCSSRules();
}])
|
Looks like the source was not properly commited - changed ui-scroll
|
diff --git a/lib/websession_webinterface.py b/lib/websession_webinterface.py
index <HASH>..<HASH> 100644
--- a/lib/websession_webinterface.py
+++ b/lib/websession_webinterface.py
@@ -684,7 +684,7 @@ class WebInterfaceYourAccountPages(WebInterfaceDirectory):
else:
# Fake parameters for p_un & p_pw because SSO takes them from the environment
(iden, args['p_un'], args['p_pw'], msgcode) = webuser.loginUser(req, '', '', CFG_EXTERNAL_AUTH_USING_SSO)
- args['remember_me'] = True
+ args['remember_me'] = False
if len(iden)>0:
uid = webuser.update_Uid(req, args['p_un'], args['remember_me'])
uid2 = webuser.getUid(req)
|
When using SSO the local session should be stored in a session cookie that expires when the browser is closed.
|
diff --git a/vendor/k8s.io/kubernetes/test/e2e/common/host_path.go b/vendor/k8s.io/kubernetes/test/e2e/common/host_path.go
index <HASH>..<HASH> 100644
--- a/vendor/k8s.io/kubernetes/test/e2e/common/host_path.go
+++ b/vendor/k8s.io/kubernetes/test/e2e/common/host_path.go
@@ -132,7 +132,6 @@ func mount(source *api.HostPathVolumeSource) []api.Volume {
//TODO: To merge this with the emptyDir tests, we can make source a lambda.
func testPodWithHostVol(path string, source *api.HostPathVolumeSource) *api.Pod {
podName := "pod-host-path-test"
- privileged := true
return &api.Pod{
TypeMeta: unversioned.TypeMeta{
@@ -153,9 +152,6 @@ func testPodWithHostVol(path string, source *api.HostPathVolumeSource) *api.Pod
MountPath: path,
},
},
- SecurityContext: &api.SecurityContext{
- Privileged: &privileged,
- },
},
{
Name: containerName2,
@@ -166,9 +162,6 @@ func testPodWithHostVol(path string, source *api.HostPathVolumeSource) *api.Pod
MountPath: path,
},
},
- SecurityContext: &api.SecurityContext{
- Privileged: &privileged,
- },
},
},
RestartPolicy: api.RestartPolicyNever,
|
UPSTREAM: revert: eb<I>dffd1db<I>f8ea<I>defb<I>d0d9ebe: <I>: Use privileged containers for host path e2e tests
|
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/HDFSCopyUtilitiesTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/HDFSCopyUtilitiesTest.java
index <HASH>..<HASH> 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/HDFSCopyUtilitiesTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/HDFSCopyUtilitiesTest.java
@@ -62,7 +62,7 @@ public class HDFSCopyUtilitiesTest {
HDFSCopyFromLocal.copyFromLocal(
originalFile,
- new Path(copyFile.getAbsolutePath()).toUri());
+ new Path("file://" + copyFile.getAbsolutePath()).toUri());
try (DataInputStream in = new DataInputStream(new FileInputStream(copyFile))) {
assertTrue(in.readUTF().equals("Hello there, 42!"));
@@ -87,7 +87,7 @@ public class HDFSCopyUtilitiesTest {
}
HDFSCopyToLocal.copyToLocal(
- new Path(originalFile.getAbsolutePath()).toUri(),
+ new Path("file://" + originalFile.getAbsolutePath()).toUri(),
copyFile);
try (DataInputStream in = new DataInputStream(new FileInputStream(copyFile))) {
|
[FLINK-<I>] [tests] Force HDFSCopyUtilitiesTest to use local file system
This closes #<I>.
|
diff --git a/lib/yt/collections/reports.rb b/lib/yt/collections/reports.rb
index <HASH>..<HASH> 100644
--- a/lib/yt/collections/reports.rb
+++ b/lib/yt/collections/reports.rb
@@ -188,6 +188,7 @@ module Yt
params['end-date'] = @days_range.end
params['metrics'] = @metrics.keys.join(',').to_s.camelize(:lower)
params['dimensions'] = DIMENSIONS[@dimension][:name] unless @dimension == :range
+ params['include-historical-channel-data'] = 'true'
params['max-results'] = 50 if @dimension.in? [:playlist, :video]
params['max-results'] = 25 if @dimension.in? [:embedded_player_location, :related_video, :search_term, :referrer]
if @dimension.in? [:video, :playlist, :embedded_player_location, :related_video, :search_term, :referrer]
|
Add 'include-historical-channel-data' parameter
YouTube only gives back the data happened since the channel joined
by default, if you manage a channel through a CMS.
But with this parameter as true, it returns historical data (the data
happened before the channel joined) also.
|
diff --git a/pyang/plugins/flatten.py b/pyang/plugins/flatten.py
index <HASH>..<HASH> 100644
--- a/pyang/plugins/flatten.py
+++ b/pyang/plugins/flatten.py
@@ -50,12 +50,14 @@ class FlattenPlugin(plugin.PyangPlugin):
"--flatten-filter-permission",
dest="flatten_filter_permission",
help="Output filter to ro or rw.",
+ choices=["ro", "rw"],
),
optparse.make_option(
"--flatten-csv-dialect",
dest="flatten_csv_dialect",
default="excel",
help="CSV dialect for output.",
+ choices=["excel", "excel-tab", "unix"],
),
]
g = optparser.add_option_group("Flatten output specific options")
|
Restrict optparse filter choices
|
diff --git a/ford/graphmanager.py b/ford/graphmanager.py
index <HASH>..<HASH> 100644
--- a/ford/graphmanager.py
+++ b/ford/graphmanager.py
@@ -75,7 +75,7 @@ class GraphManager(object):
ford.graphs.set_graphs_parentdir(parentdir)
def register(self,obj):
- if obj.meta['graph'] == 'true':
+ if obj.meta['graph'].lower() == 'true':
ford.graphs.FortranGraph.data.register(obj,type(obj))
self.graph_objs.append(obj)
|
Remove capitalization from graph option when checking whether a graph should be generated.
|
diff --git a/packages/react-dev-utils/launchEditor.js b/packages/react-dev-utils/launchEditor.js
index <HASH>..<HASH> 100644
--- a/packages/react-dev-utils/launchEditor.js
+++ b/packages/react-dev-utils/launchEditor.js
@@ -91,6 +91,8 @@ function getArgumentsForLineNumber(editor, fileName, lineNumber, workspace) {
case 'webstorm64':
case 'phpstorm':
case 'phpstorm64':
+ case 'pycharm':
+ case 'pycharm64':
return addWorkspaceToArgumentsIfExists(
['--line', lineNumber, fileName],
workspace
|
Support PyCharm in launchEditor (#<I>)
PyCharm has the same signature as WebStorm and PhpStorm `<editor> <projectPath> --line <number> <filePath>` so it can reuse the logic from those.
<URL>
|
diff --git a/vcs/backends/hg.py b/vcs/backends/hg.py
index <HASH>..<HASH> 100644
--- a/vcs/backends/hg.py
+++ b/vcs/backends/hg.py
@@ -45,7 +45,7 @@ class MercurialRepository(BaseRepository):
self.baseui = baseui or ui.ui()
# We've set path and ui, now we can set repo itself
self._set_repo(create)
- self.last_change = self.get_last_change()
+
self.revisions = list(self.repo)
self.changesets = {}
@@ -96,7 +96,8 @@ class MercurialRepository(BaseRepository):
undefined_contact = 'Unknown'
return get_contact(self.repo.ui.config) or undefined_contact
- def get_last_change(self):
+ @LazyProperty
+ def last_change(self):
from mercurial.util import makedate
return (self._get_mtime(self.repo.spath), makedate()[1])
|
cleared out MercurialRepository properties
|
diff --git a/parse_this.py b/parse_this.py
index <HASH>..<HASH> 100644
--- a/parse_this.py
+++ b/parse_this.py
@@ -155,7 +155,7 @@ def parse_this(func, types, args=None):
convert the command line arguments
args: a list of arguments to be parsed if None sys.argv is used
"""
- (func_args, _, keywords, defaults) = getargspec(func)
+ (func_args, _, __, defaults) = getargspec(func)
types, func_args = _check_types(types, func_args, defaults)
args_and_defaults = _get_args_and_defaults(func_args, defaults)
parser = _get_arg_parser(func, types, args_and_defaults)
|
One more unused variable
This time we use '__' to signify we're not using this var.
FYI Landscape didn't find this one until I updated an unused var on the same
line.
Tests:
python setup.py nosetests OK
|
diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go
index <HASH>..<HASH> 100644
--- a/test/e2e/storage/volume_provisioning.go
+++ b/test/e2e/storage/volume_provisioning.go
@@ -1159,7 +1159,7 @@ func startGlusterDpServerPod(c clientset.Interface, ns string) *v1.Pod {
Containers: []v1.Container{
{
Name: "glusterdynamic-provisioner",
- Image: "docker.io/humblec/glusterdynamic-provisioner:v1.0",
+ Image: "docker.io/gluster/glusterdynamic-provisioner:v1.0",
Args: []string{
"-config=" + "/etc/heketi/heketi.json",
},
|
Migrate the e2e provisioner container image to a different location.
|
diff --git a/discord/emoji.py b/discord/emoji.py
index <HASH>..<HASH> 100644
--- a/discord/emoji.py
+++ b/discord/emoji.py
@@ -169,7 +169,8 @@ class Emoji:
guild_id: :class:`int`
The guild ID the emoji belongs to.
user: Optional[:class:`User`]
- The user that created the emoji. This can only be retrieved using :meth:`Guild.fetch_emoji`.
+ The user that created the emoji. This can only be retrieved using :meth:`Guild.fetch_emoji` and
+ having the :attr:`~Permissions.manage_emojis` permission.
"""
__slots__ = ('require_colons', 'animated', 'managed', 'id', 'name', '_roles', 'guild_id',
'_state', 'user')
|
Added note to Emoji.user
|
diff --git a/NTLM_SoapClient.php b/NTLM_SoapClient.php
index <HASH>..<HASH> 100644
--- a/NTLM_SoapClient.php
+++ b/NTLM_SoapClient.php
@@ -93,16 +93,16 @@ class NTLM_SoapClient extends SoapClient {
curl_setopt($handle, CURLOPT_POST , true);
curl_setopt($handle, CURLOPT_POSTFIELDS , $data);
- // Proxy auth
- if (!empty($this->proxy_login)) {
- curl_setopt($handle, CURLOPT_PROXYUSERPWD, $this->proxy_login . ':' . $this->proxy_password);
- curl_setopt($handle, CURLOPT_PROXYAUTH , CURLAUTH_NTLM);
- }
-
if ((!empty($this->proxy_host)) && (!empty($this->proxy_port))) {
// Set proxy hostname:port
curl_setopt($handle, CURLOPT_PROXY, $this->proxy_host . ':' . $this->proxy_port);
curl_setopt($handle, CURLOPT_PROXYAUTH , CURLAUTH_NTLM);
+
+ // Proxy auth enabled?
+ if (!empty($this->proxy_login)) {
+ curl_setopt($handle, CURLOPT_PROXYUSERPWD, $this->proxy_login . ':' . $this->proxy_password);
+ curl_setopt($handle, CURLOPT_PROXYAUTH , CURLAUTH_NTLM);
+ }
}
// Execute the request
|
First hostname/port than login/password
|
diff --git a/src/modules/copy-paste/index.js b/src/modules/copy-paste/index.js
index <HASH>..<HASH> 100644
--- a/src/modules/copy-paste/index.js
+++ b/src/modules/copy-paste/index.js
@@ -101,7 +101,7 @@ module.exports = function(_grid) {
setTimeout(function() {
var tempDiv = document.createElement('div');
if (pasteHtml.match(/<meta name=ProgId content=Excel.Sheet>/)) {
- pasteHtml = pasteHtml.replace(/[\n\r]/g, '');
+ pasteHtml = pasteHtml.replace(/[\n\r]+ /g, ' ').replace(/[\n\r]+/g, '');
}
tempDiv.innerHTML = pasteHtml;
var table = tempDiv.querySelector('table');
|
include a case for two spaces after the line break that excel uses and remove one of the spaces
|
diff --git a/src/Engine.js b/src/Engine.js
index <HASH>..<HASH> 100644
--- a/src/Engine.js
+++ b/src/Engine.js
@@ -828,6 +828,15 @@ meta.Engine.prototype =
},
+ set cursor(value) {
+ meta.element.style.cursor = value;
+ },
+
+ get cursor() {
+ return meta.element.style.cursor;
+ },
+
+
//
elementStyle: "padding:0; margin:0;",
canvasStyle: "position:absolute; overflow:hidden; translateZ(0); " +
|
Added functionality to change cursor.
|
diff --git a/packages/icon/src/react/index.js b/packages/icon/src/react/index.js
index <HASH>..<HASH> 100644
--- a/packages/icon/src/react/index.js
+++ b/packages/icon/src/react/index.js
@@ -17,8 +17,8 @@ export const sizes = {
const styleSize = ({ size }) =>
({
tiny: {
- height: '12px',
- width: '12px'
+ height: '16px',
+ width: '16px'
},
small: {
height: '24px',
|
fix(icon): adjust tiny/small sizes
|
diff --git a/packages/cozy-client/src/Schema.js b/packages/cozy-client/src/Schema.js
index <HASH>..<HASH> 100644
--- a/packages/cozy-client/src/Schema.js
+++ b/packages/cozy-client/src/Schema.js
@@ -63,7 +63,6 @@ class Schema {
...normalizeDoctypeSchema(obj)
}))
- this.byName = merge(this.byName || {}, keyBy(values, x => x.name))
this.byDoctype = merge(this.byDoctype || {}, keyBy(values, x => x.doctype))
}
|
style(client): Remove Schema.byName property, actually never used 🔥
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ install_requires = [
"docutils>=0.14",
"pymongo>=3.2.2",
"PyYAML>=3.11",
- "web.py>=0.40",
+ "web.py==0.40",
"Jinja2 >= 2.10",
"lti>=0.9.0",
"oauth2>=1.9.0.post1",
|
Ensure web.py==<I> is always used for now
|
diff --git a/dallinger/command_line.py b/dallinger/command_line.py
index <HASH>..<HASH> 100755
--- a/dallinger/command_line.py
+++ b/dallinger/command_line.py
@@ -779,7 +779,7 @@ def export(app, local):
dump_path = dump_database(id)
subprocess.call(
- "pg_restore --verbose --clean -d dallinger " +
+ "pg_restore --verbose --no-owner --clean -d dallinger " +
os.path.join("data", id, "data.dump"),
shell=True)
|
Add -no-owner flag to dallinger/command_line.py (#<I>)
|
diff --git a/symphony/lib/toolkit/cryptography/class.pbkdf2.php b/symphony/lib/toolkit/cryptography/class.pbkdf2.php
index <HASH>..<HASH> 100644
--- a/symphony/lib/toolkit/cryptography/class.pbkdf2.php
+++ b/symphony/lib/toolkit/cryptography/class.pbkdf2.php
@@ -114,6 +114,9 @@ class PBKDF2 extends Cryptography
*/
public static function compare($input, $hash, $isHash = false)
{
+ if ($isHash) {
+ return hash_equals($hash, $input);
+ }
$salt = self::extractSalt($hash);
$iterations = self::extractIterations($hash);
$keylength = strlen(base64_decode(self::extractHash($hash)));
|
Add failsafe against direct calls
Picked from a<I>f8db8e9
Picked from <I>c<I>cebf
|
diff --git a/src/resources/js/controllers.js b/src/resources/js/controllers.js
index <HASH>..<HASH> 100644
--- a/src/resources/js/controllers.js
+++ b/src/resources/js/controllers.js
@@ -12,7 +12,9 @@
$scope.crud = $scope.$parent;
$scope.init = function() {
- $scope.crud.toggleUpdate($stateParams.id);
+ if (!$scope.crud.config.inline) {
+ $scope.crud.toggleUpdate($stateParams.id);
+ }
}
$scope.init();
@@ -48,7 +50,9 @@
$scope.switchTo = function(type) {
if (type == 0 || type == 1) {
- $state.go('default.route');
+ if (!$scope.inline) {
+ $state.go('default.route');
+ }
}
$scope.crudSwitchType = type;
};
|
fixed issue where inline crud jumps on edit item #<I>
|
diff --git a/src/serial/raw/from.js b/src/serial/raw/from.js
index <HASH>..<HASH> 100644
--- a/src/serial/raw/from.js
+++ b/src/serial/raw/from.js
@@ -33,7 +33,7 @@ function _gpfSerialRawFrom (instance, raw, converter) {
* @since 0.2.8
*/
gpf.serial.fromRaw = function (instance, raw, converter) {
- if ("function" === typeof instance) {
+ if (typeof instance === "function") {
gpf.Error.invalidParameter();
}
_gpfSerialRawFrom(instance, raw, converter);
|
!yoda style (#<I>)
|
diff --git a/nodeup/pkg/model/cloudconfig.go b/nodeup/pkg/model/cloudconfig.go
index <HASH>..<HASH> 100644
--- a/nodeup/pkg/model/cloudconfig.go
+++ b/nodeup/pkg/model/cloudconfig.go
@@ -31,7 +31,9 @@ const CloudConfigFilePath = "/etc/kubernetes/cloud.config"
// Required for vSphere CloudProvider
const MinimumVersionForVMUUID = "1.5.3"
-const VM_UUID_FILE_PATH = "/root/vm_uuid"
+
+// VM UUID is set by cloud-init
+const VM_UUID_FILE_PATH = "/etc/vmware/vm_uuid"
// CloudConfigBuilder creates the cloud configuration file
type CloudConfigBuilder struct {
diff --git a/upup/pkg/fi/cloudup/vspheretasks/cloud_init.go b/upup/pkg/fi/cloudup/vspheretasks/cloud_init.go
index <HASH>..<HASH> 100644
--- a/upup/pkg/fi/cloudup/vspheretasks/cloud_init.go
+++ b/upup/pkg/fi/cloudup/vspheretasks/cloud_init.go
@@ -32,7 +32,7 @@ $DNS_SCRIPT
- content: |
$VM_UUID
owner: root:root
- path: /root/vm_uuid
+ path: /etc/vmware/vm_uuid
permissions: "0644"
- content: |
$VOLUME_SCRIPT
|
Change vm_uuid location
|
diff --git a/sprd/manager/RaygunErrorTrackingManager.js b/sprd/manager/RaygunErrorTrackingManager.js
index <HASH>..<HASH> 100644
--- a/sprd/manager/RaygunErrorTrackingManager.js
+++ b/sprd/manager/RaygunErrorTrackingManager.js
@@ -31,7 +31,8 @@ define(["sprd/manager/IErrorTrackingManager", "require"], function (IErrorTracki
}
Raygun.init(apiKey, {
- allowInsecureSubmissions: true // IE8
+ allowInsecureSubmissions: true, // IE8,
+ ignore3rdPartyErrors: true // This option removes nonsense 'Script Error's from your Raygun dashboard
}).attach();
var version = self.$stage.$parameter.version;
|
ignoring script errors in raygun
|
diff --git a/lib/tri/query/__init__.py b/lib/tri/query/__init__.py
index <HASH>..<HASH> 100644
--- a/lib/tri/query/__init__.py
+++ b/lib/tri/query/__init__.py
@@ -423,7 +423,7 @@ class Query(object):
stack.pop()
result_q.append(t2)
else: # pragma: no cover
- break
+ break # pragma: no mutate
stack.append((token, PRECEDENCE[token]))
while stack:
result_q.append(stack.pop()[0])
|
Avoid mutating a line that will cause an infinite loop if mutated
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.