diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/dipper/sources/ZFIN.py b/dipper/sources/ZFIN.py
index <HASH>..<HASH> 100644
--- a/dipper/sources/ZFIN.py
+++ b/dipper/sources/ZFIN.py
@@ -63,8 +63,8 @@ class ZFIN(Source):
# 'enviro': {'file': 'pheno_environment.txt', 'url': 'http://zfin.org/Downloads/pheno_environment.txt'},
'enviro': {'file': 'pheno_environment_fish.txt', 'url': 'http://zfin.org/Downloads/pheno_environment_fish.txt'},
'stage': {'file': 'stage_ontology.txt', 'url': 'http://zfin.org/Downloads/stage_ontology.txt'},
- 'wild_expression': {'file': 'wildtype-expression.txt',
- 'url': 'http://zfin.org/Downloads/wildtype-expression.txt'},
+ # 'wild_expression': {'file': 'wildtype-expression.txt',
+ # 'url': 'http://zfin.org/Downloads/wildtype-expression.txt'},
'mappings': {'file': 'mappings.txt', 'url': 'http://zfin.org/downloads/mappings.txt'},
'backgrounds': {'file': 'genotype_backgrounds.txt',
'url': 'http://zfin.org/downloads/genotype_backgrounds.txt'},
|
zfin: removing wildtype expression as we don't use it yet
|
diff --git a/outline/manager.js b/outline/manager.js
index <HASH>..<HASH> 100644
--- a/outline/manager.js
+++ b/outline/manager.js
@@ -316,7 +316,8 @@ module.exports = function (doc) {
const div = dom.createElement('div')
return [
{ paneName: 'home', label: 'Your stuff', icon: UI.icons.iconBase + 'noun_547570.svg' },
- { paneName: 'basicPreferences', label: 'Preferences', icon: UI.icons.iconBase + 'noun_Sliders_341315_00000.svg' },
+ // TODO: Fix basicPreferences properly then reintroduce when ready
+ // { paneName: 'basicPreferences', label: 'Preferences', icon: UI.icons.iconBase + 'noun_Sliders_341315_00000.svg' },
{ paneName: 'trustedApplications', label: 'Trusted Apps', icon: UI.icons.iconBase + 'noun_15177.svg.svg' },
{ paneName: 'editProfile', label: 'Edit your profile', icon: UI.icons.iconBase + 'noun_492246.svg' }
]
|
Removing basicPreferences until we have it ready
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,24 @@
from setuptools import setup
setup(name='insultgenerator',
- version='0.1',
+ version='0.2',
packages=['insultgenerator'],
+ license='MIT',
author='James Cheese',
author_email='trust@tr00st.co.uk',
install_requires=['six'],
test_suite='insultgenerator.tests',
+ description='Random insult generator',
+ url="https://github.com/tr00st/insult_generator",
package_data = {
'insultgenerator.wordlists': '*.txt',
},
+ classifiers = [
+ 'Development Status :: 3 - Alpha',
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.2',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'License :: OSI Approved :: MIT License',
+ ]
)
|
Bumping version to <I> for initial unstable release
|
diff --git a/conn.go b/conn.go
index <HASH>..<HASH> 100644
--- a/conn.go
+++ b/conn.go
@@ -42,7 +42,7 @@ func (c *Conn) RemoteAddr() net.Addr {
}
func (c *Conn) RemoteMultiaddr() ma.Multiaddr {
- a, err := ma.NewMultiaddr(fmt.Sprintf("/ipfs/%s/p2p-circuit/ipfs/%s", c.remote.ID.Pretty(), c.Conn().RemotePeer().Pretty()))
+ a, err := ma.NewMultiaddr(fmt.Sprintf("/ipfs/%s/p2p-circuit/ipfs/%s", c.Conn().RemotePeer().Pretty(), c.remote.ID.Pretty()))
if err != nil {
panic(err)
}
|
conn: fix RemoteMultiaddr consistency
so that it works for both active and passive connections.
|
diff --git a/flask_appbuilder/baseviews.py b/flask_appbuilder/baseviews.py
index <HASH>..<HASH> 100644
--- a/flask_appbuilder/baseviews.py
+++ b/flask_appbuilder/baseviews.py
@@ -924,7 +924,7 @@ class BaseCRUDView(BaseModelView):
get_filter_args(self._filters)
exclude_cols = self._filters.get_relation_cols()
- item = self.datamodel.get(pk)
+ item = self.datamodel.get(pk, self._base_filters)
# convert pk to correct type, if pk is non string type.
pk = self.datamodel.get_pk_value(item)
|
#<I> limit direct url access for edit
|
diff --git a/src/Remote.js b/src/Remote.js
index <HASH>..<HASH> 100644
--- a/src/Remote.js
+++ b/src/Remote.js
@@ -203,7 +203,7 @@ module.exports = class {
const synchronizeCommand = [
'rsync',
remoteShell,
- this.options.rsyncOptions,
+ ...this.options.rsyncOptions,
compression,
...excludes,
'--delete-excluded',
|
🐛 Fix a bug preventing the use of several rsyncOptions
|
diff --git a/railties/lib/generators/rails/mailer/templates/mailer.rb b/railties/lib/generators/rails/mailer/templates/mailer.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/generators/rails/mailer/templates/mailer.rb
+++ b/railties/lib/generators/rails/mailer/templates/mailer.rb
@@ -1,5 +1,5 @@
class <%= class_name %> < ActionMailer::Base
- self.defaults = { :from => "from@example.com" }
+ self.defaults :from => "from@example.com"
<% for action in actions -%>
# Subject can be set in your I18n file at config/locales/en.yml
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index <HASH>..<HASH> 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -9,7 +9,7 @@ class MailerGeneratorTest < Rails::Generators::TestCase
run_generator
assert_file "app/mailers/notifier.rb" do |mailer|
assert_match /class Notifier < ActionMailer::Base/, mailer
- assert_match /self\.defaults\ =\ \{\ :from\ =>\ "from@example\.com"\ \}/, mailer
+ assert_match /self\.defaults :from => "from@example.com"/, mailer
end
end
|
Update generators to use new defaults.
|
diff --git a/tests/test_params.py b/tests/test_params.py
index <HASH>..<HASH> 100644
--- a/tests/test_params.py
+++ b/tests/test_params.py
@@ -81,7 +81,7 @@ def test_params_required_when_using_fixture(testdir, option, fixture_name):
src = """
import pytest
def test_func({0}):
- assert True
+ {0}
""".format(fixture_name)
testdir.makepyfile(src)
result = testdir.runpytest(*option.args)
|
Not only create, but use the fixture
|
diff --git a/src/client/putfile_test.go b/src/client/putfile_test.go
index <HASH>..<HASH> 100644
--- a/src/client/putfile_test.go
+++ b/src/client/putfile_test.go
@@ -58,4 +58,10 @@ func Example() {
return //handle error
}
// buffer now contains "foo\n"
+
+ // We can also see the Diff between the most recent commit and the first one:
+ buffer.Reset()
+ if err := pfs.GetFile(client, "repo", "master", "file", 0, 0, commit1.ID, nil, &buffer); err != nil {
+ return //handle error
+ }
}
|
Adds an example of seeing diffs.
|
diff --git a/basc_py4chan/thread.py b/basc_py4chan/thread.py
index <HASH>..<HASH> 100644
--- a/basc_py4chan/thread.py
+++ b/basc_py4chan/thread.py
@@ -63,7 +63,7 @@ class Thread(object):
@property
def custom_spoiler(self):
- return self.topic._data.get('custom_spoiler')
+ return self.topic._data.get('custom_spoiler', 0)
@classmethod
def _from_request(cls, board, res, id):
|
Added default value for custom_spoiler
|
diff --git a/docs/pages/_document.js b/docs/pages/_document.js
index <HASH>..<HASH> 100644
--- a/docs/pages/_document.js
+++ b/docs/pages/_document.js
@@ -31,6 +31,7 @@ gtag('config', 'UA-12967896-44');
`,
}}
/>
+ <link rel="shortcut icon" href="/pinterest_favicon.png" />
</Head>
<body>
<Main />
|
Docs: fix favicon (#<I>)
|
diff --git a/src/main/java/gov/adlnet/xapi/client/AgentClient.java b/src/main/java/gov/adlnet/xapi/client/AgentClient.java
index <HASH>..<HASH> 100644
--- a/src/main/java/gov/adlnet/xapi/client/AgentClient.java
+++ b/src/main/java/gov/adlnet/xapi/client/AgentClient.java
@@ -145,6 +145,16 @@ public class AgentClient extends BaseClient {
throws MalformedURLException {
super(uri, username, password);
}
+
+ public AgentClient(String uri, String encodedUsernamePassword)
+ throws MalformedURLException {
+ super(uri, encodedUsernamePassword);
+ }
+
+ public AgentClient(URL uri, String encodedUsernamePassword)
+ throws MalformedURLException {
+ super(uri, encodedUsernamePassword);
+ }
public Person getPerson(Agent a)
throws IOException {
|
Added <I>bit creds param ability.
|
diff --git a/src/Provide/Transfer/CliResponder.php b/src/Provide/Transfer/CliResponder.php
index <HASH>..<HASH> 100644
--- a/src/Provide/Transfer/CliResponder.php
+++ b/src/Provide/Transfer/CliResponder.php
@@ -18,7 +18,7 @@ class CliResponder implements TransferInterface
public function __invoke(ResourceObject $resourceObject, array $server)
{
unset($server);
- $body = (string) $resourceObject;
+ $body = $resourceObject->toString();
// code
$statusText = (new Code)->statusText[$resourceObject->code];
$ob = $resourceObject->code . ' ' . $statusText . PHP_EOL;
@@ -28,7 +28,6 @@ class CliResponder implements TransferInterface
}
// empty line
$ob .= PHP_EOL;
-
// body
$ob .= $body;
|
replace __string() to toString() for expection thrown
|
diff --git a/client.py b/client.py
index <HASH>..<HASH> 100644
--- a/client.py
+++ b/client.py
@@ -1,8 +1,8 @@
-from slackclient import SlackClient
from rtmbot import RtmBot
slack_client = None
+
def init(config):
global slack_client
bot = RtmBot(config)
|
Update client.py for flake8
flake8 wasn't checking this file. ran flake8 against it to make sure it was compliant with coding guidelines
|
diff --git a/gns3converter/__init__.py b/gns3converter/__init__.py
index <HASH>..<HASH> 100644
--- a/gns3converter/__init__.py
+++ b/gns3converter/__init__.py
@@ -12,6 +12,5 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from pkg_resources import get_distribution
from .converter import Converter
-__version__ = get_distribution('gns3-converter').version
+__version__ = '0.1.0'
|
Define version statically, to ease freezing for Windows
|
diff --git a/unpacker.go b/unpacker.go
index <HASH>..<HASH> 100644
--- a/unpacker.go
+++ b/unpacker.go
@@ -178,13 +178,13 @@ EachLayer:
fetchC[i] = make(chan struct{})
}
- go func() {
+ go func(i int) {
err := u.fetch(ctx, h, layers[i:], fetchC)
if err != nil {
fetchErr <- err
}
close(fetchErr)
- }()
+ }(i)
}
select {
|
unpacker: Fix data race and possible data corruption
|
diff --git a/framework/Yii.php b/framework/Yii.php
index <HASH>..<HASH> 100644
--- a/framework/Yii.php
+++ b/framework/Yii.php
@@ -23,5 +23,5 @@ class Yii extends \yii\BaseYii
}
spl_autoload_register(['Yii', 'autoload'], true, true);
-Yii::$classMap = include(__DIR__ . '/classes.php');
+Yii::$classMap = require(__DIR__ . '/classes.php');
Yii::$container = new yii\di\Container;
|
Yii class `include` cass replaced to `require`
|
diff --git a/lib/copy-sync/copy-file-sync.js b/lib/copy-sync/copy-file-sync.js
index <HASH>..<HASH> 100644
--- a/lib/copy-sync/copy-file-sync.js
+++ b/lib/copy-sync/copy-file-sync.js
@@ -9,6 +9,7 @@ function copyFileSync (srcFile, destFile, options) {
if (fs.existsSync(destFile)) {
if (clobber) {
+ fs.chmodSync(destFile, parseInt('777', 8))
fs.unlinkSync(destFile)
} else {
throw Error('EEXIST')
|
Fix so copySync unlinking read only file will now work on
nodejs <I>. This commit fixes #<I>.
|
diff --git a/lib/lolcommits.rb b/lib/lolcommits.rb
index <HASH>..<HASH> 100644
--- a/lib/lolcommits.rb
+++ b/lib/lolcommits.rb
@@ -42,7 +42,7 @@ module Lolcommits
def parse_git(dir='.')
g = Git.open('.')
commit = g.log.first
- commit_msg = commit.message.split("\n").first.tranzlate
+ commit_msg = commit.message.split("\n").first
commit_sha = commit.sha[0..10]
basename = File.basename(g.dir.to_s)
basename.sub!(/^\./, 'dot') #no invisible directories in output, thanks!
@@ -63,6 +63,11 @@ module Lolcommits
end
#
+ # lolspeak translate the message
+ #
+ commit_msg = commit_msg.tranzlate
+
+ #
# Create a directory to hold the lolimages
#
if not File.directory? loldir
|
move tranzlate call so it applies to test commits as well
|
diff --git a/jwt-express.js b/jwt-express.js
index <HASH>..<HASH> 100644
--- a/jwt-express.js
+++ b/jwt-express.js
@@ -230,7 +230,7 @@ module.exports = {
/**
* require - requires that data in the JWT's payload meets certain requirements
- * If only the key is passed, it simply checks that payload[key] !== undefined
+ * If only the key is passed, it simply checks that payload[key] == true
* @param string key The key used to load the data from the payload
* @param string operator (Optional) The operator to compare the information
* @param mixed value (Optional) The value to compare the data to
@@ -250,8 +250,8 @@ module.exports = {
ok;
if (!operator) {
- operator = '!==';
- value = undefined;
+ operator = '==';
+ value = true;
}
if (operator == '==') {
|
Default require to check for truthy value
|
diff --git a/Evtx/Nodes.py b/Evtx/Nodes.py
index <HASH>..<HASH> 100644
--- a/Evtx/Nodes.py
+++ b/Evtx/Nodes.py
@@ -1413,7 +1413,7 @@ class BinaryTypeNode(VariantTypeNode):
return self._length
def string(self):
- return base64.b64encode(self.binary())
+ return base64.b64encode(self.binary()).decode('ascii')
class GuidTypeNode(VariantTypeNode):
@@ -1606,7 +1606,7 @@ class WstringArrayTypeNode(VariantTypeNode):
bin = self.binary()
acc = []
while len(bin) > 0:
- match = re.search("((?:[^\x00].)+)", bin)
+ match = re.search(b"((?:[^\x00].)+)", bin)
if match:
frag = match.group()
acc.append("<string>")
@@ -1615,7 +1615,7 @@ class WstringArrayTypeNode(VariantTypeNode):
bin = bin[len(frag) + 2:]
if len(bin) == 0:
break
- frag = re.search("(\x00*)", bin).group()
+ frag = re.search(b"(\x00*)", bin).group()
if len(frag) % 2 == 0:
for _ in range(len(frag) // 2):
acc.append("<string></string>\n")
|
nodes: better handle str/bytes handling for binary node
|
diff --git a/test/test_helper.rb b/test/test_helper.rb
index <HASH>..<HASH> 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -37,6 +37,7 @@ module RouteTranslator
app = @@app = Class.new(Rails::Application)
app.config.active_support.deprecation = :stderr
app.paths["log"] = "#{tmp_path}/log/test.log"
+ app.paths["config/routes"] = File.join(app_path, routes_config)
app.initialize!
Rails.application = app
end
|
Add tmp route file path to mock app
|
diff --git a/lib/rubocop/cop/surrounding_space.rb b/lib/rubocop/cop/surrounding_space.rb
index <HASH>..<HASH> 100644
--- a/lib/rubocop/cop/surrounding_space.rb
+++ b/lib/rubocop/cop/surrounding_space.rb
@@ -27,6 +27,7 @@ module Rubocop
:args_add_block, :const_path_ref, :dot2,
:dot3].include?(child)
return true if grandparent == :unary && parent == :vcall
+ return true if parent == :command_call && child == :"::"
false
end
diff --git a/spec/rubocop/cops/surrounding_space_spec.rb b/spec/rubocop/cops/surrounding_space_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/rubocop/cops/surrounding_space_spec.rb
+++ b/spec/rubocop/cops/surrounding_space_spec.rb
@@ -49,6 +49,12 @@ module Rubocop
space.offences.map(&:message).should == []
end
+ it 'accepts ::Kernel::raise' do
+ source = ['::Kernel::raise IllegalBlockError.new']
+ space.inspect_source('file.rb', source)
+ space.offences.map(&:message).should == []
+ end
+
it "accepts exclamation point negation" do
space.inspect_source("file.rb", ['x = !a&&!b'])
space.offences.map(&:message).should ==
|
Another special case with the :: operator.
|
diff --git a/test/performance/SignerBench.php b/test/performance/SignerBench.php
index <HASH>..<HASH> 100644
--- a/test/performance/SignerBench.php
+++ b/test/performance/SignerBench.php
@@ -35,7 +35,7 @@ abstract class SignerBench
*/
private $signature;
- public final function init(): void
+ final public function init(): void
{
$this->signer = $this->signer();
$this->signingKey = $this->signingKey();
@@ -43,12 +43,12 @@ abstract class SignerBench
$this->signature = $this->signer->sign(self::PAYLOAD, $this->signingKey);
}
- public final function benchSignature(): void
+ final public function benchSignature(): void
{
$this->signer->sign(self::PAYLOAD, $this->signingKey);
}
- public final function benchVerification(): void
+ final public function benchVerification(): void
{
$this->signer->verify($this->signature, self::PAYLOAD, $this->verificationKey);
}
|
Switched public and final to match PSR2
|
diff --git a/lib/instana/version.rb b/lib/instana/version.rb
index <HASH>..<HASH> 100644
--- a/lib/instana/version.rb
+++ b/lib/instana/version.rb
@@ -1,4 +1,4 @@
module Instana
- VERSION = "1.5.2"
+ VERSION = "1.6.0"
VERSION_FULL = "instana-#{VERSION}"
end
|
Bump gem version to <I>
|
diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php
index <HASH>..<HASH> 100644
--- a/plugins/Login/Auth.php
+++ b/plugins/Login/Auth.php
@@ -43,7 +43,7 @@ class Piwik_Login_Auth implements Piwik_Auth
WHERE token_auth = ?',
array($this->token_auth)
);
- if(!$login !== false)
+ if($login !== false)
{
return new Piwik_Auth_Result(Piwik_Auth_Result::SUCCESS, $login, $this->token_auth );
}
|
refs #<I> - fixes typo; it's too early in the morning for me to think about unit tests...
git-svn-id: <URL>
|
diff --git a/examples/uibench/app.js b/examples/uibench/app.js
index <HASH>..<HASH> 100644
--- a/examples/uibench/app.js
+++ b/examples/uibench/app.js
@@ -101,7 +101,7 @@
}
var tableTpl = t(function (children) {
- return e('table').props({ className: 'Table' }).children(children).childrenType(ChildrenTypes.NON_KEYED_LIST);
+ return e('table').props({ className: 'Table' }).children(children).childrenType(ChildrenTypes.KEYED_LIST);
}, InfernoDOM);
function table(data) {
|
ignore the last commit - added keys properly and perf went way down on uibench
|
diff --git a/lib/sauce/capybara.rb b/lib/sauce/capybara.rb
index <HASH>..<HASH> 100644
--- a/lib/sauce/capybara.rb
+++ b/lib/sauce/capybara.rb
@@ -129,13 +129,15 @@ module Sauce
require "rspec/core"
::RSpec.configure do |config|
config.before :suite do
- ::Capybara.configure do |config|
+ ::Capybara.configure do |capy_config|
sauce_config = Sauce::Config.new
- if sauce_config[:start_local_application]
- host = sauce_config[:application_host] || "127.0.0.1"
- port = sauce_config[:application_port]
- config.app_host = "http://#{host}:#{port}"
- config.run_server = false
+ if capy_config.app_host.nil?
+ if sauce_config[:start_local_application]
+ host = sauce_config[:application_host] || "127.0.0.1"
+ port = sauce_config[:application_port]
+ capy_config.app_host = "http://#{host}:#{port}"
+ capy_config.run_server = false
+ end
end
end
end
@@ -167,4 +169,4 @@ module Sauce
Sauce::Capybara.configure_capybara_for_rspec
end
end
-end
\ No newline at end of file
+end
|
Merged #<I> from vgrigoruk - Do not set Capybara.app_host if it is not
nil
|
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index <HASH>..<HASH> 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -281,6 +281,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
scope(':version', :version => /.+/) do
resources :users, :id => /.+?/, :format => /json|xml/
end
+
+ get "products/list"
end
get 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
@@ -1300,6 +1302,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
assert_equal 'account#shorthand', @response.body
end
+ def test_match_shorthand_inside_namespace_with_controller
+ assert_equal '/api/products/list', api_products_list_path
+ get '/api/products/list'
+ assert_equal 'api/products#list', @response.body
+ end
+
def test_dynamically_generated_helpers_on_collection_do_not_clobber_resources_url_helper
assert_equal '/replies', replies_path
end
|
Add test to avoid regression of 1bfc5b4
|
diff --git a/dipper/sources/HPOAnnotations.py b/dipper/sources/HPOAnnotations.py
index <HASH>..<HASH> 100644
--- a/dipper/sources/HPOAnnotations.py
+++ b/dipper/sources/HPOAnnotations.py
@@ -486,7 +486,7 @@ class HPOAnnotations(Source):
pub = re.sub(r' *', '', pub) # fixed now but just in case
# there have been several malformed PMIDs curies
- if pub[:4] != 'http' or \
+ if pub[:4] != 'http' and \
graph.curie_regexp.fullmatch(pub) is None:
LOG.warning(
'Record %s has a malformed Pub %s', did, pub)
|
forgot to update the logic in the currently unused ingest
|
diff --git a/lib/infusionsoft/request.rb b/lib/infusionsoft/request.rb
index <HASH>..<HASH> 100644
--- a/lib/infusionsoft/request.rb
+++ b/lib/infusionsoft/request.rb
@@ -1,4 +1,5 @@
module Infusionsoft
+ # Incase Infusionsoft ever creates a restful API :)
module Request
# Perform an GET request
def get(service_call, *args)
|
adding comments to explain why other rest methods are here
|
diff --git a/lib/config/definitions.js b/lib/config/definitions.js
index <HASH>..<HASH> 100644
--- a/lib/config/definitions.js
+++ b/lib/config/definitions.js
@@ -555,15 +555,13 @@ const options = [
stage: 'package',
type: 'json',
default: {
- force: {
- unpublishSafe: false,
- recreateClosed: true,
- rebaseStalePrs: true,
- groupName: 'Pin Dependencies',
- commitMessageAction: 'Pin',
- group: {
- commitMessageTopic: 'dependencies',
- },
+ unpublishSafe: false,
+ recreateClosed: true,
+ rebaseStalePrs: true,
+ groupName: 'Pin Dependencies',
+ commitMessageAction: 'Pin',
+ group: {
+ commitMessageTopic: 'dependencies',
},
},
cli: false,
|
fix: Revert "fix: force pin dependencies config"
This reverts commit <I>bdf6bb3dcdb<I>dd<I>a0a<I>f2d<I>a<I>a2.
|
diff --git a/merb-core/spec/public/directory_structure/directory/config/router.rb b/merb-core/spec/public/directory_structure/directory/config/router.rb
index <HASH>..<HASH> 100644
--- a/merb-core/spec/public/directory_structure/directory/config/router.rb
+++ b/merb-core/spec/public/directory_structure/directory/config/router.rb
@@ -1,3 +1,3 @@
-Merb::Router.prepare do |r|
- r.default_routes
-end
\ No newline at end of file
+Merb::Router.prepare do
+ default_routes
+end
|
Updated config/router.rb for new API.
|
diff --git a/http.go b/http.go
index <HASH>..<HASH> 100644
--- a/http.go
+++ b/http.go
@@ -645,20 +645,18 @@ func (resp *Response) resetSkipHeader() {
}
func reuseBody(body []byte) []byte {
- if cap(body) > maxReuseBodyCap {
+ // Reuse body buffer only if its' capacity has been used for
+ // at least 1/7 of the full capacity during the last usage.
+ // This should reduce memory fragmentation in the long run.
+
+ bodyCap := cap(body)
+ bodyLen := len(body)
+ if bodyLen > 0 && ((bodyCap-bodyLen)>>3) > bodyLen {
return nil
}
return body[:0]
}
-// maxReuseBodyLen is the maximum request and response body buffer capacity,
-// which may be reused.
-//
-// Body is thrown to GC if its' capacity exceeds this limit.
-//
-// This limits memory waste and memory fragmentation when re-using body buffers.
-const maxReuseBodyCap = 8 * 1024
-
// Read reads request (including body) from the given r.
//
// RemoveMultipartFormFiles or Reset must be called after
|
Issue #<I>: increased client and server throughput when working with big bodies
|
diff --git a/src/core/component-1-util-B-select.js b/src/core/component-1-util-B-select.js
index <HASH>..<HASH> 100644
--- a/src/core/component-1-util-B-select.js
+++ b/src/core/component-1-util-B-select.js
@@ -33,7 +33,7 @@ _cs.select_parse = function (spec) {
var txt = spec;
var m;
while (txt !== "") {
- if ((m = txt.match(/^\s*(?:\.)?\s*([a-zA-Z$_][a-zA-Z$0-9_:-]*|\*{1,2})/)) !== null)
+ if ((m = txt.match(/^\s*(?:\.)?\s*([a-zA-Z$_][a-zA-Z$0-9_:-]*)/)) !== null)
path.push(m[1]);
else if ((m = txt.match(/^\s*\[\s*(\d+|\*{1,2})\s*\]/)) !== null)
path.push(m[1]);
|
we cannot match against wildcard path segments as it makes no sense in practical scenarios
|
diff --git a/metal/mmtl/glue/glue_preprocess.py b/metal/mmtl/glue/glue_preprocess.py
index <HASH>..<HASH> 100644
--- a/metal/mmtl/glue/glue_preprocess.py
+++ b/metal/mmtl/glue/glue_preprocess.py
@@ -91,7 +91,7 @@ def get_task_tsv_config(task_name, split):
"sent1_idx": 3 if split in ["train", "dev"] else 1,
"sent2_idx": -1,
"label_idx": 1 if split in ["train", "dev"] else -1,
- "skip_rows": 1,
+ "skip_rows": 0 if split in ["train", "dev"] else 1,
"label_fn": label_fn,
"inv_label_fn": inv_label_fn,
"label_type": int,
|
Fix header off-by-one in COLA.
|
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index <HASH>..<HASH> 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -42,7 +42,7 @@ module Dummy
config.ga_tracking_id = ''
- config.app_title = 'Peoplefinder Dummy'
+ config.app_title = 'People Finder Dummy'
config.elastic_search_url = ''
end
|
Change the name of the dummy app
- 'Peoplefinder' sounds awful in the screen reader
- 'People Finder' reads much better
|
diff --git a/templates/admin/custom-styles.php b/templates/admin/custom-styles.php
index <HASH>..<HASH> 100644
--- a/templates/admin/custom-styles.php
+++ b/templates/admin/custom-styles.php
@@ -23,6 +23,10 @@ $your_styles = $style_post->post_content;
// Template
// -------------------------------------------------------------------------------------------------------------------
+if ( ! empty( $_GET['debug'] ) ) { // Debug
+ $theme_styles = \Pressbooks\Sanitize\normalize_css_urls( $theme_styles, 'http://DEBUG' );
+}
+
if ( ! empty( $_GET['custom_styles_error'] ) ) {
// Conversion failed
printf( '<div class="error">%s</div>', __( 'Error: Something went wrong. See logs for more details.', 'pressbooks' ) );
|
Add a debug switch for Custom Styles. (#<I>)
|
diff --git a/ssbio/pipeline/gempro.py b/ssbio/pipeline/gempro.py
index <HASH>..<HASH> 100644
--- a/ssbio/pipeline/gempro.py
+++ b/ssbio/pipeline/gempro.py
@@ -177,7 +177,7 @@ class GEMPRO(Object):
self._root_dir = path
- for d in [self.base_dir, self.model_dir, self.data_dir, self.genes_dir, self.structures_dir]:
+ for d in [self.base_dir, self.model_dir, self.data_dir, self.genes_dir]:#, self.structures_dir]:
ssbio.utils.make_dir(d)
log.info('{}: GEM-PRO project location'.format(self.base_dir))
@@ -219,14 +219,14 @@ class GEMPRO(Object):
else:
return None
- @property
- def structures_dir(self):
- """str: Directory where all structures are stored."""
- # XTODO: replace storage of structures in individual protein directories with this to reduce redundancy
- if self.base_dir:
- return op.join(self.base_dir, 'structures')
- else:
- return None
+ # @property
+ # def structures_dir(self):
+ # """str: Directory where all structures are stored."""
+ # # XTODO: replace storage of structures in individual protein directories with this to reduce redundancy
+ # if self.base_dir:
+ # return op.join(self.base_dir, 'structures')
+ # else:
+ # return None
def load_cobra_model(self, model):
"""Load a COBRApy Model object into the GEM-PRO project.
|
Remove structures_dir for now, to be developed later
|
diff --git a/dht.go b/dht.go
index <HASH>..<HASH> 100644
--- a/dht.go
+++ b/dht.go
@@ -23,7 +23,7 @@ import (
var log = u.Logger("dht")
-const doPinging = true
+const doPinging = false
// TODO. SEE https://github.com/jbenet/node-ipfs/blob/master/submodules/ipfs-dht/index.js
|
logging, logging, and some minor logging
|
diff --git a/test/test_crud.py b/test/test_crud.py
index <HASH>..<HASH> 100644
--- a/test/test_crud.py
+++ b/test/test_crud.py
@@ -102,7 +102,7 @@ def create_test(scenario_def, test, ignore_result):
if expected_c is not None:
expected_name = expected_c.get('name')
if expected_name is not None:
- db_coll = db_coll = self.db[expected_name]
+ db_coll = self.db[expected_name]
else:
db_coll = self.db.test
self.assertEqual(list(db_coll.find()), expected_c['data'])
|
Redundant assignment in test_crud.py.
|
diff --git a/lib/zest.js b/lib/zest.js
index <HASH>..<HASH> 100644
--- a/lib/zest.js
+++ b/lib/zest.js
@@ -523,9 +523,10 @@ var rules = {
combinator: /^(?: +([^ \w*]) +|( )+|([^ \w*]))(?! *$)/,
attr: /^\[([\w\-]+)(?:([^\w]?=)(inside))?\]/,
pseudo: /^(:[\w\-]+)(?:\((inside)\))?/,
- inside: /(?:"(?:\\"|[^"])*"|'(?:\\'|[^'])*'|<[^"'>]*>|\\["'>]|[^"'>])+/
+ inside: /(?:"(?:\\"|[^"])*"|'(?:\\'|[^'])*'|<[^"'>]*>|\\["'>]|[^"'>])*/
};
+rules.inside = replace(rules.inside, '[^"\'>]*', rules.inside);
rules.attr = replace(rules.attr, 'inside', makeInside('\\[', '\\]'));
rules.pseudo = replace(rules.pseudo, 'inside', makeInside('\\(', '\\)'));
rules.simple = replace(rules.simple, 'pseudo', rules.pseudo);
|
allow 3 levels of nesting in selectors
|
diff --git a/tests/config.php b/tests/config.php
index <HASH>..<HASH> 100644
--- a/tests/config.php
+++ b/tests/config.php
@@ -1,4 +1,5 @@
<?php
+define('PHPUNIT_UPLOADCARE_TESTSUITE', true);
define('UC_PUBLIC_KEY', 'demopublickey');
define('UC_SECRET_KEY', 'demoprivatekey');
date_default_timezone_set('UTC');
|
unit test were failing because PHPUNIT_UPLOADCARE_TESTSUITE constant wasn't defined
|
diff --git a/Collection.php b/Collection.php
index <HASH>..<HASH> 100755
--- a/Collection.php
+++ b/Collection.php
@@ -618,14 +618,14 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
/**
* Sort through each item with a callback.
*
- * @param callable $callback
+ * @param callable|null $callback
* @return static
*/
- public function sort(callable $callback)
+ public function sort(callable $callback = null)
{
$items = $this->items;
- uasort($items, $callback);
+ $callback ? uasort($items, $callback) : natcasesort($items);
return new static($items);
}
|
Allow a collection of scalars to be easily sorted
|
diff --git a/lib/fake_rest_services.rb b/lib/fake_rest_services.rb
index <HASH>..<HASH> 100644
--- a/lib/fake_rest_services.rb
+++ b/lib/fake_rest_services.rb
@@ -6,11 +6,11 @@ require 'fake_rest_services/models/redirect'
module FakeRestServices
class Application < Sinatra::Base
post '/fixtures' do
- Fixture.create(url: params['url'], content: params['content']) and status 200
+ Fixture.create(url: params['url'], content: params['content'])
end
delete '/fixtures/all' do
- Fixture.destroy_all and status 200
+ Fixture.delete_all
end
post '/redirects' do
@@ -18,11 +18,11 @@ module FakeRestServices
end
get /.*/ do
- Fixture.where(url: request.fullpath).last.try(:content) or perform_redirect(request) or status 404
+ Fixture.where(url: request.fullpath).last.try(:content) or try_redirect(request) or status 404
end
private
- def perform_redirect(request)
+ def try_redirect(request)
r = Redirect.all.find do |r|
request.fullpath =~ /#{r.pattern}/
end
|
better method name for redirecting; removing unnecessary 'status XXX'
|
diff --git a/src/Traits/ManipulationTrait.php b/src/Traits/ManipulationTrait.php
index <HASH>..<HASH> 100644
--- a/src/Traits/ManipulationTrait.php
+++ b/src/Traits/ManipulationTrait.php
@@ -57,9 +57,9 @@ trait ManipulationTrait
/**
* @param string|NodeList|\DOMNode $input
*
- * @return NodeList
+ * @return array|NodeList|\Traversable
*/
- protected function inputAsNodeList($input) {
+ protected function inputPrepareAsTraversable($input) {
if ($input instanceof \DOMNode) {
$nodes = [$input];
} else if (is_string($input)) {
@@ -70,6 +70,17 @@ trait ManipulationTrait
throw new \InvalidArgumentException();
}
+ return $nodes;
+ }
+
+ /**
+ * @param string|NodeList|\DOMNode $input
+ *
+ * @return NodeList
+ */
+ protected function inputAsNodeList($input) {
+ $nodes = $this->inputPrepareAsTraversable($input);
+
$newNodes = $this->newNodeList();
foreach ($nodes as $node) {
|
Break-up inputAsNodeList() into two methods.
|
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/fs/OMMapManager.java b/core/src/main/java/com/orientechnologies/orient/core/storage/fs/OMMapManager.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/fs/OMMapManager.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/fs/OMMapManager.java
@@ -210,6 +210,8 @@ public class OMMapManager {
// LOAD THE PAGE
try {
entry = mapBuffer(iFile, iBeginOffset, bufferSize);
+ } catch (IllegalArgumentException e) {
+ throw e;
} catch (Exception e) {
// REDUCE MAX MEMORY TO FORCE EMPTY BUFFERS
maxMemory = maxMemory * 90 / 100;
|
Re thrown a non-io exception
|
diff --git a/openquake/utils/tasks.py b/openquake/utils/tasks.py
index <HASH>..<HASH> 100644
--- a/openquake/utils/tasks.py
+++ b/openquake/utils/tasks.py
@@ -48,7 +48,7 @@ def distribute(task_func, (name, data), tf_args=None, ath=None, ath_args=None):
:param dict tf_args: The remaining (keyword) parameters for `task_func`
:param ath: an asynchronous task handler function, may only be specified
for a task whose results are ignored.
- :param dict ath_args: The remaining (keyword) parameters for `ath`
+ :param dict ath_args: The keyword parameters for `ath`
:returns: A list where each element is a result returned by a subtask.
If an `ath` function is passed we return whatever it returns.
"""
|
more enhanced documentation
Former-commit-id: <I>a0a4cf3c<I>e<I>bc<I>a<I>ac<I>a<I>f6
|
diff --git a/src/Providers/PaytmWalletProvider.php b/src/Providers/PaytmWalletProvider.php
index <HASH>..<HASH> 100644
--- a/src/Providers/PaytmWalletProvider.php
+++ b/src/Providers/PaytmWalletProvider.php
@@ -49,9 +49,9 @@ class PaytmWalletProvider{
throw new \Exception('Invalid checksum');
}
- public function getResponseMessage() {
- return $this->response()->RESPMSG;
- }
+ public function getResponseMessage() {
+ return @$this->response()->RESPMSG;
+ }
public function api_call($url, $params){
|
Suppress error
Suppress error in case if response is not available
|
diff --git a/command/state.go b/command/state.go
index <HASH>..<HASH> 100644
--- a/command/state.go
+++ b/command/state.go
@@ -4,6 +4,7 @@ import (
"fmt"
"os"
"path/filepath"
+ "strings"
"github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform/state"
@@ -208,7 +209,7 @@ func remoteState(
}
// Initialize the remote client based on the local state
- client, err := remote.NewClient(local.Remote.Type, local.Remote.Config)
+ client, err := remote.NewClient(strings.ToLower(local.Remote.Type), local.Remote.Config)
if err != nil {
return nil, errwrap.Wrapf(fmt.Sprintf(
"Error initializing remote driver '%s': {{err}}",
|
Handles upper case characters in the cached state file's remote type
If the cached state file contains a remote type field with upper case
characters, eg 'Consul', it was no longer possible to find the 'consul'
remote plugin.
|
diff --git a/src/actions/index.js b/src/actions/index.js
index <HASH>..<HASH> 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -112,7 +112,7 @@ function buildDirectionsQuery(state) {
// Add any waypoints.
if (waypoints.length) {
waypoints.forEach((waypoint) => {
- query = query.concat(waypoint.geometery.coordinates);
+ query = query.concat(waypoint.geometry.coordinates);
query.push(';');
});
}
|
s/geometery/geometry/
|
diff --git a/email_log/tests/tests.py b/email_log/tests/tests.py
index <HASH>..<HASH> 100644
--- a/email_log/tests/tests.py
+++ b/email_log/tests/tests.py
@@ -1,5 +1,11 @@
from __future__ import unicode_literals
+try:
+ from unittest import skipUnless
+except ImportError: # Python 2.6
+ from django.utils.unittest import skipUnless
+from django import VERSION
+from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
from django.test.utils import override_settings
from django.utils.six import text_type
@@ -109,3 +115,14 @@ class AdminTests(TestCase):
page = self.client.get('/admin/email_log/email/{0}/delete/'
.format(email.pk))
self.assertEqual(page.status_code, 403)
+
+
+class SouthSupportTests(TestCase):
+
+ @skipUnless(VERSION < (1, 7, 0), "test only applies to 1.6 and below")
+ def test_import_migrations_module(self):
+ try:
+ from email_log.migrations import __doc__ # noqa
+ except ImproperlyConfigured as e:
+ exception = e
+ self.assertIn("SOUTH_MIGRATION_MODULES", exception.args[0])
|
Add test for South ImproperlyConfigured error
|
diff --git a/lib/Shipmile/Api/Orders.php b/lib/Shipmile/Api/Orders.php
index <HASH>..<HASH> 100644
--- a/lib/Shipmile/Api/Orders.php
+++ b/lib/Shipmile/Api/Orders.php
@@ -34,7 +34,7 @@ class Orders
return $response;
}
- public function markReady($order_id, array $options = array())
+ public function markReady(array $options = array())
{
$body = (isset($options['body']) ? $options['body'] : array());
|
BugFix: Passed two variables in pickup instead of one
|
diff --git a/server-coreless/src/main/java/org/openqa/selenium/server/browserlaunchers/HTABrowserLauncher.java b/server-coreless/src/main/java/org/openqa/selenium/server/browserlaunchers/HTABrowserLauncher.java
index <HASH>..<HASH> 100644
--- a/server-coreless/src/main/java/org/openqa/selenium/server/browserlaunchers/HTABrowserLauncher.java
+++ b/server-coreless/src/main/java/org/openqa/selenium/server/browserlaunchers/HTABrowserLauncher.java
@@ -89,6 +89,12 @@ public class HTABrowserLauncher implements BrowserLauncher {
File selRunnerDest = new File(coreDir, "RemoteRunner.hta");
File testRunnerSrc = new File(coreDir, "TestRunner.html");
File testRunnerDest = new File(coreDir, "TestRunner.hta");
+ // custom user-extensions
+ File userExt = this.configuration.getUserExtensions();
+ if (userExt != null) {
+ File selUserExt = new File(coreDir, "scripts/user-extensions.js");
+ f.copyFile(userExt, selUserExt, null, true);
+ }
f.copyFile(selRunnerSrc, selRunnerDest);
f.copyFile(testRunnerSrc, testRunnerDest);
} catch (IOException e) {
|
Fix SRC-<I> [User Extension is Not Loaded When Launching with *iehta] with patch from adam goucher.
r<I>
|
diff --git a/client/webpack.config.js b/client/webpack.config.js
index <HASH>..<HASH> 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -208,9 +208,7 @@ const webpackConfig = {
safari10: false,
}
: {
- compress: {
- passes: 2,
- },
+ compress: true,
mangle: true,
} ),
},
|
build: Do only one compression pass (#<I>)
|
diff --git a/bulbs/contributions/serializers.py b/bulbs/contributions/serializers.py
index <HASH>..<HASH> 100644
--- a/bulbs/contributions/serializers.py
+++ b/bulbs/contributions/serializers.py
@@ -40,7 +40,7 @@ class ContributionReportingSerializer(serializers.ModelSerializer):
("title", obj.content.title),
("url", obj.content.get_absolute_url()),
("content_type", obj.content.__class__.__name__),
- ("feature_type", obj.content.feature_type),
+ ("feature_type", getattr(obj.content.feature_type, "name", None)),
("published", timezone.localtime(obj.content.published))
])
@@ -97,4 +97,3 @@ class ContentReportingSerializer(serializers.ModelSerializer):
def get_published(self, obj):
return timezone.localtime(obj.published)
-
|
Let's use the name for the feature type, instead of just the id
|
diff --git a/closure/goog/tweak/tweakui.js b/closure/goog/tweak/tweakui.js
index <HASH>..<HASH> 100644
--- a/closure/goog/tweak/tweakui.js
+++ b/closure/goog/tweak/tweakui.js
@@ -526,7 +526,7 @@ goog.tweak.EntriesPanel.prototype.createComboBoxDom_ =
var values = tweak.getValidValues();
for (var i = 0, il = values.length; i < il; ++i) {
var optionElem = dh.createElement('option');
- optionElem.text = values[i];
+ optionElem.text = String(values[i]);
selectElem.appendChild(optionElem);
}
ret.appendChild(selectElem);
|
Fix a type warning, and make type warnings default to errors
for closureCompiled.
R=agrieve
DELTA=2 (1 added, 0 deleted, 1 changed)
Revision created by MOE tool push_codebase.
MOE_MIGRATION=<I>
git-svn-id: <URL>
|
diff --git a/internal/uidriver/glfw/ui.go b/internal/uidriver/glfw/ui.go
index <HASH>..<HASH> 100644
--- a/internal/uidriver/glfw/ui.go
+++ b/internal/uidriver/glfw/ui.go
@@ -691,8 +691,9 @@ func (u *UserInterface) run(context driver.UIContext) error {
u.setWindowSize(ww, wh, u.isFullscreen(), u.vsync)
}
- // Set the window size and the window position in this order on Linux (X) (#1118),
- // but this is inverted on Windows. This is very tricky, but there is no obvious way to solve this.
+ // Set the window size and the window position in this order on Linux or other UNIX using X (#1118),
+ // but this should be inverted on Windows. This is very tricky, but there is no obvious way to solve this.
+ // This doesn't matter on macOS.
if runtime.GOOS == "windows" {
setPosition()
setSize()
|
uidriver/glfw: Update comments
|
diff --git a/lib/custom/src/MShop/Customer/Manager/Laravel.php b/lib/custom/src/MShop/Customer/Manager/Laravel.php
index <HASH>..<HASH> 100644
--- a/lib/custom/src/MShop/Customer/Manager/Laravel.php
+++ b/lib/custom/src/MShop/Customer/Manager/Laravel.php
@@ -453,7 +453,7 @@ class Laravel
$stmt->bind( $idx++, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
$stmt->bind( $idx++, $item->getLabel() );
- $stmt->bind( $idx++, $item->getCode() );
+ $stmt->bind( $idx++, $billingAddress->getEmail() );
$stmt->bind( $idx++, $billingAddress->getCompany() );
$stmt->bind( $idx++, $billingAddress->getVatID() );
$stmt->bind( $idx++, $billingAddress->getSalutation() );
|
Fixed saving modified code/e-mail
|
diff --git a/lib/usb-connection.js b/lib/usb-connection.js
index <HASH>..<HASH> 100644
--- a/lib/usb-connection.js
+++ b/lib/usb-connection.js
@@ -29,7 +29,7 @@ try {
// var VENDOR_REQ_IN = usb.LIBUSB_REQUEST_TYPE_VENDOR | usb.LIBUSB_RECIPIENT_DEVICE | usb.LIBUSB_ENDPOINT_IN;
} catch (e) {
haveusb = false;
- log.error('WARNING: No usb controller found on this system.');
+ log.error('WARNING: No USB controller found on this system. Please run npm install -g t2-cli to compile USB drivers for your version of node');
}
var Daemon = require('./usb/usb-daemon');
|
Update error message for USB controller when the version of node is changed (#<I>)
|
diff --git a/app/controllers/katello/content_search_controller.rb b/app/controllers/katello/content_search_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/katello/content_search_controller.rb
+++ b/app/controllers/katello/content_search_controller.rb
@@ -541,12 +541,18 @@ module Katello
def multi_repo_content_search(content_class, search_obj, repos, offset, default_field, search_mode = :all, in_repo = nil)
user = current_user
search = Tire::Search::Search.new(content_class.index)
+
+ query_options = {
+ :lowercase_expanded_terms => false,
+ :default_field => default_field
+ }
+
search.instance_eval do
query do
if search_obj.is_a?(Array) || search_obj.nil?
all
else
- string search_obj, :default_field => default_field
+ string search_obj, query_options
end
end
|
Fixes #<I>: Allow searching on capital letters for Packages in CS.
|
diff --git a/src/Command/GeneratorConfigFormBaseCommand.php b/src/Command/GeneratorConfigFormBaseCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/GeneratorConfigFormBaseCommand.php
+++ b/src/Command/GeneratorConfigFormBaseCommand.php
@@ -8,18 +8,10 @@ namespace Drupal\AppConsole\Command;
class GeneratorConfigFormBaseCommand extends GeneratorFormCommand {
- protected function getFormType ()
- {
- return 'ConfigFormBase';
- }
-
- protected function getCommandName ()
- {
- return 'generate:form:config';
- }
-
protected function configure()
{
+ $this->setFormType('ConfigFormBase');
+ $this->setCommandName('generate:form:config');
parent::configure();
}
|
Use new setter methods at parent class
|
diff --git a/src/Illuminate/Database/DetectsLostConnections.php b/src/Illuminate/Database/DetectsLostConnections.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Database/DetectsLostConnections.php
+++ b/src/Illuminate/Database/DetectsLostConnections.php
@@ -34,7 +34,7 @@ trait DetectsLostConnections
'reset by peer',
'Physical connection is not usable',
'TCP Provider: Error code 0x68',
- 'Name or service not known',
+ 'getaddrinfo failed: Name or service not known',
'ORA-03114',
'Packets out of order. Expected',
]);
|
Stricter error message in place of "Name or service not known"
|
diff --git a/openquake/server/static/js/engine.js b/openquake/server/static/js/engine.js
index <HASH>..<HASH> 100644
--- a/openquake/server/static/js/engine.js
+++ b/openquake/server/static/js/engine.js
@@ -195,7 +195,7 @@
function(jqXHR, textStatus, errorThrown)
{
if (jqXHR.status == 404) {
- diaerror.show(false, "Removing calculation", "The removal command for:<br><b>(" + calc_id + ") " + calc_desc + "</b> is failed.");
+ diaerror.show(false, "Removing calculation", "Removal command for:<br><b>(" + calc_id + ") " + calc_desc + "</b> failed.");
}
else {
diaerror.show(false, "Removing calculation " + calc_id, "Failed: " + textStatus);
|
Changed title The removal command for bla bla is failed to Removal command bla bla failed
Former-commit-id: d<I>acd8cf9f4b<I>b0fb<I>b3c<I>c<I>a5f9a
|
diff --git a/ext_emconf.php b/ext_emconf.php
index <HASH>..<HASH> 100755
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -25,7 +25,7 @@ $EM_CONF[$_EXTKEY] = array(
'constraints' => array(
'depends' => array(
'php' => '5.3.0-0.0.0',
- 'typo3' => '6.2.1-6.2.99',
+ 'typo3' => '6.2.1-7.1.99',
'extbase' => '6.2.0-6.2.99',
),
'conflicts' => array(
|
Updated TYPO3 version max to 7.x
|
diff --git a/lib/adash/config.rb b/lib/adash/config.rb
index <HASH>..<HASH> 100644
--- a/lib/adash/config.rb
+++ b/lib/adash/config.rb
@@ -5,6 +5,7 @@ module Adash
@@client_id = f.readline.chomp
@@client_secret = f.readline.chomp
@@redirect_port = f.readline.chomp.to_i
+ @@credentials_path = "#{Dir.home}/.config/adash/config"
end
def self.client_id
@@ -18,5 +19,9 @@ module Adash
def self.redirect_port
@@redirect_port
end
+
+ def self.credentials_path
+ @@credentials_path
+ end
end
end
|
Add self.credentionals_path to Adash::Config
|
diff --git a/lib/metro/views/yaml_view.rb b/lib/metro/views/yaml_view.rb
index <HASH>..<HASH> 100644
--- a/lib/metro/views/yaml_view.rb
+++ b/lib/metro/views/yaml_view.rb
@@ -22,7 +22,7 @@ module Metro
# @return a Hash that contains the contents of the view.
#
def self.parse(view_path)
- YAML.load File.read yaml_view_path(view_path)
+ YAML.load(File.read(yaml_view_path(view_path))) or { }
end
#
|
YAML View will now handle empty YAML files by returning a hash and not a bool
|
diff --git a/bokeh/glyphs.py b/bokeh/glyphs.py
index <HASH>..<HASH> 100644
--- a/bokeh/glyphs.py
+++ b/bokeh/glyphs.py
@@ -228,6 +228,8 @@ class Circle(Marker):
# Other kinds of Markers, to match what GGplot provides
class Square(Marker):
__view_model__ = "square"
+ size = DataSpec(units="screen", default=4)
+ angle = DataSpec
class Triangle(Marker):
__view_model__ = "triangle"
|
Fixing square marker to have the additional dataspecs per BokehJS
|
diff --git a/tests/__init__.py b/tests/__init__.py
index <HASH>..<HASH> 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -133,6 +133,23 @@ class StripeItem(dict):
return self.deleted
+ @classmethod
+ def class_url(cls):
+ return "/v1/test-items/"
+
+ def instance_url(self):
+ """Superficial mock that emulates instance_url."""
+ id = self.get("id")
+ base = self.class_url()
+ return "%s/%s" % (base, id)
+
+ def request(self, method, url, params) -> dict:
+ """Superficial mock that emulates request method."""
+ assert method == "post"
+ for key, value in params.items():
+ self.__setattr__(key, value)
+ return self
+
class StripeList(dict):
"""Mock a generic Stripe Iterable.
|
tests: Add StripeItem.request mock method
|
diff --git a/salt/utils/versions.py b/salt/utils/versions.py
index <HASH>..<HASH> 100644
--- a/salt/utils/versions.py
+++ b/salt/utils/versions.py
@@ -90,10 +90,14 @@ def _format_warning(message, category, filename, lineno, line=None):
@contextlib.contextmanager
def _patched_format_warning():
- saved = warnings.formatwarning
- warnings.formatwarning = _format_warning
- yield
- warnings.formatwarning = saved
+ if six.PY2:
+ saved = warnings.formatwarning
+ warnings.formatwarning = _format_warning
+ yield
+ warnings.formatwarning = saved
+ else:
+ # Under Py3 we no longer have to patch warnings.formatwarning
+ yield
def warn_until(version,
|
We don't have to patch `warnings.formatwarning` under Py3
|
diff --git a/lib/praxis-blueprints/blueprint.rb b/lib/praxis-blueprints/blueprint.rb
index <HASH>..<HASH> 100644
--- a/lib/praxis-blueprints/blueprint.rb
+++ b/lib/praxis-blueprints/blueprint.rb
@@ -281,7 +281,7 @@ module Praxis
attributes.each do | name, attr |
# Note: we can freely pass master view for attributes that aren't blueprint/containers because
# their dump methods will ignore it (they always dump everything regardless)
- attribute name, view: :master
+ attribute name, view: :default
end
end
end
|
Make :master views usable (non-recursive for the most part) by rendering subviews using :default
|
diff --git a/resources/views/tools/bread/edit-add.blade.php b/resources/views/tools/bread/edit-add.blade.php
index <HASH>..<HASH> 100644
--- a/resources/views/tools/bread/edit-add.blade.php
+++ b/resources/views/tools/bread/edit-add.blade.php
@@ -153,7 +153,7 @@
<option value="">-- {{ __('voyager::generic.none') }} --</option>
@foreach($fieldOptions as $tbl)
<option value="{{ $tbl['field'] }}"
- @if($dataType->order_column == $tbl['field']) selected @endif
+ @if(isset($dataType) && $dataType->order_column == $tbl['field']) selected @endif
>{{ $tbl['field'] }}</option>
@endforeach
</select>
@@ -169,7 +169,7 @@
<option value="">-- {{ __('voyager::generic.none') }} --</option>
@foreach($fieldOptions as $tbl)
<option value="{{ $tbl['field'] }}"
- @if($dataType->order_display_column == $tbl['field']) selected @endif
+ @if(isset($dataType) && $dataType->order_display_column == $tbl['field']) selected @endif
>{{ $tbl['field'] }}</option>
@endforeach
</select>
|
Ordering fix (#<I>)
Datatype is not defined when adding BREAD to a table, so this was failing
|
diff --git a/lxd/instance/drivers/driver_lxc.go b/lxd/instance/drivers/driver_lxc.go
index <HASH>..<HASH> 100644
--- a/lxd/instance/drivers/driver_lxc.go
+++ b/lxd/instance/drivers/driver_lxc.go
@@ -5493,7 +5493,7 @@ func (d *lxc) FileSFTPConn() (net.Conn, error) {
return forkfileConn, nil
}
- // Check for ongoing operations (that may involve shifting).
+ // Check for ongoing operations (that may involve shifting or replacing the root volume).
_ = operationlock.Get(d.Project(), d.Name()).Wait()
// Setup reverter.
|
lxd/instance/drivers/driver/lxc: Improve comment in FileSFTPConn
|
diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
+++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -15,6 +15,8 @@ use Symfony\Component\DomCrawler\Field\FormField;
/**
* This is an internal class that must not be used directly.
+ *
+ * @internal
*/
class FormFieldRegistry
{
|
Tag the FormFieldRegistry as being internal
|
diff --git a/rbac_test.go b/rbac_test.go
index <HASH>..<HASH> 100644
--- a/rbac_test.go
+++ b/rbac_test.go
@@ -84,3 +84,29 @@ func TestRbacPermission(t *testing.T) {
t.Fatalf("role-c should not have %s because of the unbinding with role-b", pB)
}
}
+
+func BenchmarkRbacGranted(b *testing.B) {
+ rbac = New()
+ rA.AddPermission(pA)
+ rB.AddPermission(pB)
+ rC.AddPermission(pC)
+ rbac.Add(rA)
+ rbac.Add(rB)
+ rbac.Add(rC)
+ for i := 0; i < b.N; i++ {
+ rbac.IsGranted("role-a", pA, nil)
+ }
+}
+
+func BenchmarkRbacNotGranted(b *testing.B) {
+ rbac = New()
+ rA.AddPermission(pA)
+ rB.AddPermission(pB)
+ rC.AddPermission(pC)
+ rbac.Add(rA)
+ rbac.Add(rB)
+ rbac.Add(rC)
+ for i := 0; i < b.N; i++ {
+ rbac.IsGranted("role-a", pB, nil)
+ }
+}
|
add benchmark of IsGranted
|
diff --git a/test/draw_line_string.test.js b/test/draw_line_string.test.js
index <HASH>..<HASH> 100644
--- a/test/draw_line_string.test.js
+++ b/test/draw_line_string.test.js
@@ -573,7 +573,7 @@ test('draw_line_string continue LineString', t => {
properties: {},
geometry: {
type: 'LineString',
- coordinates: coordinates
+ coordinates: coordinates.slice(0)
}
};
const line = new LineString(context, geojson);
@@ -603,5 +603,14 @@ test('draw_line_string continue LineString', t => {
/start or the end/,
'not at line endpoint'
);
+ drawLineStringMode(context, { featureId: 1, from: [0, 0] });
+ t.equal(context._test.line.id, 1, 'initialized with correct line');
+ t.deepEqual(context._test.line.coordinates, [[0, 0], ...coordinates],
+ 'added one coordinate at the start endpoint');
+
+ drawLineStringMode(context, { featureId: 1, from: [10, 10] });
+ t.deepEqual(context._test.line.coordinates, [[0, 0], ...coordinates, [10, 10]],
+ 'added one coordinate at the end endpoint');
+
t.end();
});
|
Test line continuation initialization at both endpoints
|
diff --git a/spock/plugins/helpers/physics.py b/spock/plugins/helpers/physics.py
index <HASH>..<HASH> 100644
--- a/spock/plugins/helpers/physics.py
+++ b/spock/plugins/helpers/physics.py
@@ -76,7 +76,7 @@ class PhysicsPlugin(PluginBase):
self.pos.on_ground = mtv.y > 0
self.apply_vector(mtv)
- def clear_velocity(self, _ = None, __ = None):
+ def clear_velocity(self, _=None, __=None):
self.vec.__init__(0, 0, 0)
def get_drag(self, vec):
|
flake8 is important /s
|
diff --git a/tool/tctl/common/helpers_test.go b/tool/tctl/common/helpers_test.go
index <HASH>..<HASH> 100644
--- a/tool/tctl/common/helpers_test.go
+++ b/tool/tctl/common/helpers_test.go
@@ -110,6 +110,7 @@ func makeAndRunTestAuthServer(t *testing.T, opts ...testServerOptionFunc) (auth
}
cfg.CachePolicy.Enabled = false
+ cfg.Proxy.DisableWebInterface = true
auth, err = service.NewTeleport(cfg)
require.NoError(t, err)
require.NoError(t, auth.Start())
diff --git a/tool/tctl/common/resource_command_test.go b/tool/tctl/common/resource_command_test.go
index <HASH>..<HASH> 100644
--- a/tool/tctl/common/resource_command_test.go
+++ b/tool/tctl/common/resource_command_test.go
@@ -29,6 +29,9 @@ import (
// TestDatabaseResource tests tctl db rm/get commands.
func TestDatabaseResource(t *testing.T) {
fileConfig := &config.FileConfig{
+ Global: config.Global{
+ DataDir: t.TempDir(),
+ },
Databases: config.Databases{
Service: config.Service{
EnabledFlag: "true",
|
Fix tctl db resource UT (#<I>)
|
diff --git a/packages/react-jsx-highcharts/src/components/Series/Series.js b/packages/react-jsx-highcharts/src/components/Series/Series.js
index <HASH>..<HASH> 100644
--- a/packages/react-jsx-highcharts/src/components/Series/Series.js
+++ b/packages/react-jsx-highcharts/src/components/Series/Series.js
@@ -24,7 +24,6 @@ const Series = memo(
visible = true,
children = null,
axisId,
- colorAxisId,
requiresAxis = true,
...restProps
}) => {
@@ -49,7 +48,7 @@ const Series = memo(
const providerValueRef = useRef(null);
const axis = useAxis(axisId);
- const colorAxis = useColorAxis(colorAxisId);
+ const colorAxis = useColorAxis();
useEffect(() => {
if (requiresAxis && !axis) return;
|
Don't allow coloraxis to be referenced by id
|
diff --git a/src/livestreamer_cli/main.py b/src/livestreamer_cli/main.py
index <HASH>..<HASH> 100644
--- a/src/livestreamer_cli/main.py
+++ b/src/livestreamer_cli/main.py
@@ -174,6 +174,7 @@ def output_stream_http(plugin, streams):
server.close(True)
player.close()
+ server.close()
def output_stream_passthrough(stream):
|
cli: Explicitly close the server listening socket.
Avoids a ResourceWarning for “--player-continuous-http” mode.
|
diff --git a/Behat/DefaultContext.php b/Behat/DefaultContext.php
index <HASH>..<HASH> 100644
--- a/Behat/DefaultContext.php
+++ b/Behat/DefaultContext.php
@@ -70,9 +70,13 @@ abstract class DefaultContext extends RawMinkContext implements Context, KernelA
*/
public function purgeDatabase(BeforeScenarioScope $scope)
{
- $purger = new ORMPurger($this->getService('doctrine.orm.entity_manager'));
- $purger->setPurgeMode(ORMPurger::PURGE_MODE_TRUNCATE);
+ $entityManager = $this->getService('doctrine.orm.entity_manager');
+ $entityManager->getConnection()->executeUpdate("SET foreign_key_checks = 0;");
+
+ $purger = new ORMPurger($entityManager);
$purger->purge();
+
+ $entityManager->getConnection()->executeUpdate("SET foreign_key_checks = 1;");
}
/**
|
The most shameful hack ever made, but works
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -14,16 +14,14 @@ end
RSpec.configure do |config|
config.color = true
- config.order = "random"
- config.formatter = ENV["CI"] == "true" ? :progress : :documentation
config.disable_monkey_patching!
+ config.example_status_persistence_file_path = "./tmp/rspec-examples.txt"
config.filter_run_when_matching :focus
- config.example_status_persistence_file_path = "./tmp/rspec-status.txt"
+ config.formatter = ENV["CI"] == "true" ? :progress : :documentation
+ config.mock_with(:rspec) { |mocks| mocks.verify_partial_doubles = true }
+ config.order = "random"
config.shared_context_metadata_behavior = :apply_to_host_groups
-
- config.mock_with :rspec do |mocks|
- mocks.verify_partial_doubles = true
- end
+ config.warnings = true
config.expect_with :rspec do |expectations|
expectations.syntax = :expect
|
Added Ruby warnings to RSpec helper.
Ensures we are being good citizens by not causing warnings for
downstream gems/projects.
The configurations settings were alpha-sorted for faster ability to
scan.
|
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index <HASH>..<HASH> 100644
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -435,11 +435,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
// Restore exif data to file
if (this.encodingType == JPEG) {
String exifPath;
- if (this.saveToPhotoAlbum) {
- exifPath = FileHelper.getRealPath(uri, this.cordova);
- } else {
- exifPath = uri.getPath();
- }
+ exifPath = uri.getPath();
exif.createOutFile(exifPath);
exif.writeExifData();
}
|
CB-<I>: Removing FileHelper call that was failing on Samsung Galaxy S3, now that we have a real path, we only need to update the MediaStore, not pull from it in this case
|
diff --git a/lib/user_stream/version.rb b/lib/user_stream/version.rb
index <HASH>..<HASH> 100644
--- a/lib/user_stream/version.rb
+++ b/lib/user_stream/version.rb
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
module UserStream
- VERSION = "1.0.0"
+ VERSION = "1.1.0"
end
|
Version bump to <I>.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,13 @@ except ImportError:
use_setuptools()
from setuptools import setup
-import textwrap
import os
+import sys
+import textwrap
+
+extra_tests_require = []
+if sys.version_info < (3, 0):
+ extra_tests_require.append('mock==1.0.1')
ROOT = os.path.abspath(os.path.dirname(__file__))
@@ -33,8 +38,7 @@ setup(
tests_require=[
'nose==1.3',
'django-setuptest==0.1.4',
- 'mock==1.0.1'
- ],
+ ] + extra_tests_require,
test_suite='setuptest.setuptest.SetupTestSuite',
keywords = "aws ses sns seacucumber boto",
classifiers=['Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'Topic :: Internet :: WWW/HTTP']
|
Removing mock from setup.py for Python 3.x
|
diff --git a/org/postgresql/test/jdbc2/ArrayTest.java b/org/postgresql/test/jdbc2/ArrayTest.java
index <HASH>..<HASH> 100644
--- a/org/postgresql/test/jdbc2/ArrayTest.java
+++ b/org/postgresql/test/jdbc2/ArrayTest.java
@@ -81,7 +81,7 @@ public class ArrayTest extends TestCase
assertTrue(arrrs.next());
assertEquals(3,arrrs.getInt(1));
assertEquals(3,arrrs.getInt(2));
- assertFalse(arrrs.next());
+ assertTrue(!arrrs.next());
assertTrue(arrrs.previous());
assertEquals(3,arrrs.getInt(2));
arrrs.first();
@@ -106,7 +106,7 @@ public class ArrayTest extends TestCase
assertTrue(arrrs.next());
assertEquals(3, arrrs.getInt(1));
assertEquals("fa\"b", arrrs.getString(2));
- assertFalse(arrrs.next());
+ assertTrue(!arrrs.next());
arrrs.close();
rs.close();
|
My version of junit (<I>) doesn't have assertFalse. ArrayTest uses
it in a couple of places. This patch changes assertFalse(condition)
to assertTrue(!condition).
Oliver Jowett
|
diff --git a/src/victory-container/victory-container.js b/src/victory-container/victory-container.js
index <HASH>..<HASH> 100644
--- a/src/victory-container/victory-container.js
+++ b/src/victory-container/victory-container.js
@@ -28,9 +28,10 @@ export default class VictoryContainer extends React.Component {
* children. VictoryContainer works with VictoryArea, VictoryAxis, VictoryBar, VictoryLine,
* VictoryScatter, VictoryChart, VictoryGroup, and VictoryStack.
* If no children are provided, VictoryContainer will render an empty SVG.
- * Props from children are used to determine defauly style, height, and width.
+ * Props from children are used to determine default style, height, and width.
*/
- children: React.PropTypes.oneOfType([ React.PropTypes.arrayOf(React.PropTypes.node),
+ children: React.PropTypes.oneOfType([
+ React.PropTypes.arrayOf(React.PropTypes.node),
React.PropTypes.node
]),
/**
|
adding tests for victory container and they all pass so far
|
diff --git a/fireplace/card.py b/fireplace/card.py
index <HASH>..<HASH> 100644
--- a/fireplace/card.py
+++ b/fireplace/card.py
@@ -615,6 +615,9 @@ class Secret(Spell):
pass
def _set_zone(self, value):
+ if value == Zone.PLAY:
+ # Move secrets to the SECRET Zone when played
+ value = Zone.SECRET
if self.zone == Zone.SECRET:
self.controller.secrets.remove(self)
if value == Zone.SECRET:
@@ -627,10 +630,6 @@ class Secret(Spell):
return False
return super().is_playable()
- def summon(self):
- super().summon()
- self.zone = Zone.SECRET
-
def reveal(self):
return self.game.queue_actions(self, [Reveal(self)])
|
Move Secrets to Zone.SECRET when played into Zone.PLAY
|
diff --git a/lib/paleta/version.rb b/lib/paleta/version.rb
index <HASH>..<HASH> 100644
--- a/lib/paleta/version.rb
+++ b/lib/paleta/version.rb
@@ -1,3 +1,3 @@
module Paleta
- VERSION = '0.0.3'
+ VERSION = '0.0.4'
end
|
bumped version to <I>
|
diff --git a/lib/maxminddb/version.rb b/lib/maxminddb/version.rb
index <HASH>..<HASH> 100644
--- a/lib/maxminddb/version.rb
+++ b/lib/maxminddb/version.rb
@@ -1,3 +1,3 @@
module MaxMindDB
- VERSION = "0.1.3"
+ VERSION = "0.1.4"
end
|
Changed the version to '<I>'.
|
diff --git a/lib/transition-to-from-auto.js b/lib/transition-to-from-auto.js
index <HASH>..<HASH> 100644
--- a/lib/transition-to-from-auto.js
+++ b/lib/transition-to-from-auto.js
@@ -123,8 +123,8 @@
}
}
- transition.transitionProp = transitionProp;
- transition.transitionEnd = transitionEnd;
+ transition.prop = transitionProp;
+ transition.end = transitionEnd;
if (typeof module !== "undefined" && module.exports){
module.exports = transition;
|
.prop and .end for detected transition
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ with open('requirements/base.txt') as f:
with open('requirements/test.txt') as f:
tests_reqs = [line for line in f.read().split('\n') if line]
with open('requirements/contrib.txt') as f:
- tests_reqs = [line for line in f.read().split('\n') if line]
+ tests_reqs.extend([line for line in f.read().split('\n') if line])
if sys.version_info[0] > 2:
readme = open('README.rst', encoding='utf-8').read()
|
:wrench: Fix test packages
|
diff --git a/rkt/pods.go b/rkt/pods.go
index <HASH>..<HASH> 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -943,16 +943,25 @@ func (p *pod) getAppsImageManifests() (AppsImageManifests, error) {
return aim, nil
}
-// getApps returns a list of apps in the pod
-func (p *pod) getApps() (schema.AppList, error) {
+// getManifest returns the PodManifest of the pod
+func (p *pod) getManifest() (*schema.PodManifest, error) {
pmb, err := p.readFile("pod")
if err != nil {
return nil, fmt.Errorf("error reading pod manifest: %v", err)
}
- pm := new(schema.PodManifest)
+ pm := &schema.PodManifest{}
if err = pm.UnmarshalJSON(pmb); err != nil {
return nil, fmt.Errorf("invalid pod manifest: %v", err)
}
+ return pm, nil
+}
+
+// getApps returns a list of apps in the pod
+func (p *pod) getApps() (schema.AppList, error) {
+ pm, err := p.getManifest()
+ if err != nil {
+ return nil, err
+ }
return pm.Apps, nil
}
|
rkt: factor out code to get PodManifest
|
diff --git a/pig/src/main/java/com/twitter/elephantbird/pig/util/PigToThrift.java b/pig/src/main/java/com/twitter/elephantbird/pig/util/PigToThrift.java
index <HASH>..<HASH> 100644
--- a/pig/src/main/java/com/twitter/elephantbird/pig/util/PigToThrift.java
+++ b/pig/src/main/java/com/twitter/elephantbird/pig/util/PigToThrift.java
@@ -11,8 +11,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.data.DataBag;
import org.apache.pig.data.DataByteArray;
@@ -43,7 +44,7 @@ import com.twitter.elephantbird.util.TypeRef;
* Any remaining fields will be left unset.
*/
public class PigToThrift<T extends TBase<?, ?>> {
- public static final Logger LOG = LogManager.getLogger(PigToThrift.class);
+ public static final Logger LOG = LoggerFactory.getLogger(PigToThrift.class);
private TStructDescriptor structDesc;
|
fix build error from log4j being used in PigToThrift
|
diff --git a/src/Model/Write/Products/Iterator.php b/src/Model/Write/Products/Iterator.php
index <HASH>..<HASH> 100644
--- a/src/Model/Write/Products/Iterator.php
+++ b/src/Model/Write/Products/Iterator.php
@@ -352,6 +352,9 @@ class Iterator extends EavIterator
$parentIds = array_keys($parentChildMap);
$result = array_combine($parentIds, array_fill(0, count($parentIds), []));
foreach ($iterator as $entity) {
+ if (!isset($map[$entity['entity_id']])) {
+ continue;
+ }
$parentId = $map[$entity['entity_id']];
if ($this->skipEntityChild($entity, $stockMap, $parentId)) {
@@ -528,6 +531,9 @@ class Iterator extends EavIterator
$type = $types->factory($fakeProduct);
if (!$type->isComposite($fakeProduct)) {
+ foreach ($group as $entityId => $entity) {
+ $childrenIds[$entityId] = $type->getChildrenIds($entityId, false);
+ }
continue;
}
@@ -678,4 +684,4 @@ class Iterator extends EavIterator
$attributes = $this->filterEntityAttributes($attributes);
return $attributes;
}
-}
\ No newline at end of file
+}
|
stock qty on simple product
This update is for including simple product on getting quantity stock value
|
diff --git a/graphicscontext.go b/graphicscontext.go
index <HASH>..<HASH> 100644
--- a/graphicscontext.go
+++ b/graphicscontext.go
@@ -67,6 +67,8 @@ func (c *graphicsContext) needsRestoring(context *opengl.Context) (bool, error)
}
func (c *graphicsContext) initializeIfNeeded() error {
+ // glViewport must be called at every frame on iOS
+ ui.GLContext().ResetViewportSize()
if !c.initialized {
if err := graphics.Initialize(ui.GLContext()); err != nil {
return err
|
graphics: Reset Viewport cache at each frame
|
diff --git a/lib/installer.js b/lib/installer.js
index <HASH>..<HASH> 100644
--- a/lib/installer.js
+++ b/lib/installer.js
@@ -177,25 +177,19 @@ exports.promptAdminUser = function (callback) {
};
/**
- * Creates a hoodie admin user
+ * Creates a Pocket admin user
*/
exports.saveAdminUser = function (cfg, couch_pwd, user, callback) {
- // couchdb user doc
- var doc = {
- _id: 'org.couchdb.user:' + user.name,
- roles: ['hoodie-admin:' + cfg.id],
- type: 'user',
- name: user.name,
- password: user.password
- };
- // add auth info to db url
- var db_url = url.parse(cfg.couch.url);
- db_url.auth = cfg.couch.username + ':' + couch_pwd;
-
- var path = '/_users/' + encodeURIComponent(doc._id);
- var user_url = url.resolve(db_url, path);
- couchr.put(user_url, doc, callback);
+ request({
+ url: cfg.couch.url + '/_config/admins/' + encodeURIComponent(user.name),
+ method: 'PUT',
+ body: '"' + user.password + '"',
+ auth: {
+ user: cfg.couch.username,
+ pass: couch_pwd
+ }
+ }, callback)
};
/**
|
create full _admin user for pocket instead of using hoodie-admin:appid role
|
diff --git a/lib/rack/oauth2/server/authorize/request_with_connect_params.rb b/lib/rack/oauth2/server/authorize/request_with_connect_params.rb
index <HASH>..<HASH> 100644
--- a/lib/rack/oauth2/server/authorize/request_with_connect_params.rb
+++ b/lib/rack/oauth2/server/authorize/request_with_connect_params.rb
@@ -1,6 +1,9 @@
class Rack::OAuth2::Server::Authorize
module RequestWithConnectParams
- CONNECT_EXT_PARAMS = [:nonce, :display, :prompt, :request, :request_uri, :id_token]
+ CONNECT_EXT_PARAMS = [
+ :nonce, :display, :prompt, :max_age, :ui_locales, :claims_locales,
+ :id_token_hint, :login_hint, :acr_values, :claims, :request, :request_uri
+ ]
def self.prepended(klass)
klass.send :attr_optional, *CONNECT_EXT_PARAMS
|
support more request params (max_age, login_hint etc.)
|
diff --git a/ontrack-ui/src/main/java/net/nemerosa/ontrack/boot/resources/BranchResourceDecorator.java b/ontrack-ui/src/main/java/net/nemerosa/ontrack/boot/resources/BranchResourceDecorator.java
index <HASH>..<HASH> 100644
--- a/ontrack-ui/src/main/java/net/nemerosa/ontrack/boot/resources/BranchResourceDecorator.java
+++ b/ontrack-ui/src/main/java/net/nemerosa/ontrack/boot/resources/BranchResourceDecorator.java
@@ -178,6 +178,13 @@ public class BranchResourceDecorator extends AbstractResourceDecorator<Branch> {
branch.getType() == BranchType.TEMPLATE_INSTANCE
&& resourceContext.isProjectFunctionGranted(branch, BranchTemplateMgt.class)
)
+ // Template instance connection
+ .link(
+ "_templateInstanceConnect",
+ on(BranchController.class).connectTemplateInstance(branch.getId()),
+ branch.getType() == BranchType.CLASSIC
+ && resourceContext.isProjectFunctionGranted(branch, BranchTemplateMgt.class)
+ )
// Template instance synchronisation
.link(
"_templateInstanceSync",
|
#<I> Form to get the connection setup - link
|
diff --git a/modules/tester.js b/modules/tester.js
index <HASH>..<HASH> 100644
--- a/modules/tester.js
+++ b/modules/tester.js
@@ -70,11 +70,11 @@ var Tester = function(casper, options) {
});
this.on('success', function(success) {
- this.exporter.addSuccess(success.file, success.message);
+ this.exporter.addSuccess(fs.absolute(success.file), success.message);
});
this.on('fail', function(failure) {
- this.exporter.addFailure(failure.file, failure.message, failure.details || "test failed", failure.type || "unknown");
+ this.exporter.addFailure(fs.absolute(failure.file), failure.message, failure.details || "test failed", failure.type || "unknown");
this.testResults.failures.push(failure);
});
diff --git a/modules/xunit.js b/modules/xunit.js
index <HASH>..<HASH> 100644
--- a/modules/xunit.js
+++ b/modules/xunit.js
@@ -96,7 +96,7 @@ function generateClassName(classname) {
script = script.substring(fs.workingDirectory.length + 1);
return script.substring(0, script.lastIndexOf('.'));
}
- return classname;
+ return classname || "unknown";
}
/**
|
refs 1d<I>e5 - generateClassname does not remove file extension now if given an already relative path as parameter
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.