diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/base/src/main/java/uk/ac/ebi/atlas/profiles/ExpressionsRowDeserializer.java b/base/src/main/java/uk/ac/ebi/atlas/profiles/ExpressionsRowDeserializer.java
index <HASH>..<HASH> 100644
--- a/base/src/main/java/uk/ac/ebi/atlas/profiles/ExpressionsRowDeserializer.java
+++ b/base/src/main/java/uk/ac/ebi/atlas/profiles/ExpressionsRowDeserializer.java
@@ -5,7 +5,7 @@ import uk.ac.ebi.atlas.model.Expression;
import java.util.Queue;
public interface ExpressionsRowDeserializer<V, T extends Expression> {
- // Because @SafeVarArgs can’t be added to non-final methods...
+ // Warning because @SafeVarArgs can’t be added to non-final/non-static methods...
ExpressionsRowDeserializer<V, T> reload(V... values);
T next();
T nextExpression(Queue<V> expressionLevelsBuffer);
|
Some better explanation of why this raises a warning and, unless we change the var-args method, it can’t be avoided
|
diff --git a/johnny/tests/web.py b/johnny/tests/web.py
index <HASH>..<HASH> 100644
--- a/johnny/tests/web.py
+++ b/johnny/tests/web.py
@@ -6,6 +6,7 @@
from django.conf import settings
from django.db import connection
from johnny import middleware
+import django
import base
try:
@@ -40,6 +41,9 @@ class TestTransactionMiddleware(base.TransactionJohnnyWebTestCase):
def test_queries_from_templates(self):
"""Verify that doing the same request w/o a db write twice does not
populate the cache properly."""
+ # it seems that django 1.3 doesn't exhibit this bug!
+ if django.VERSION[:2] == (1, 3):
+ return
connection.queries = []
q = base.message_queue()
response = self.client.get('/test/template_queries')
|
the check for the bug in django's TransactionMiddleware was actually failing in <I> because that bug is fixed in <I>; lets not check for it anymore; all non-multidb tests are now working in stable django releases > <I>, and django-trunk to boot
|
diff --git a/javascript/webdriver-jsapi/locators.js b/javascript/webdriver-jsapi/locators.js
index <HASH>..<HASH> 100644
--- a/javascript/webdriver-jsapi/locators.js
+++ b/javascript/webdriver-jsapi/locators.js
@@ -66,7 +66,7 @@ webdriver.Locator.factory_ = function(type) {
webdriver.Locator.Strategy = {
'className': webdriver.Locator.factory_('class name'),
'class name': webdriver.Locator.factory_('class name'),
- 'css': webdriver.Locator.factory_('css'),
+ 'css': webdriver.Locator.factory_('css selector'),
'id': webdriver.Locator.factory_('id'),
'js': webdriver.Locator.factory_('js'),
'linkText': webdriver.Locator.factory_('link text'),
|
JasonLeyba: Use the correct strategy name for CSS locators.
r<I>
|
diff --git a/news-bundle/src/Resources/contao/dca/tl_news.php b/news-bundle/src/Resources/contao/dca/tl_news.php
index <HASH>..<HASH> 100644
--- a/news-bundle/src/Resources/contao/dca/tl_news.php
+++ b/news-bundle/src/Resources/contao/dca/tl_news.php
@@ -681,7 +681,7 @@ class tl_news extends Backend
while ($objAlias->next())
{
- $arrAlias[$objAlias->parent][$objAlias->id] = $objAlias->title . ' (' . ($GLOBALS['TL_LANG']['tl_article'][$objAlias->inColumn] ?: $objAlias->inColumn) . ', ID ' . $objAlias->id . ')';
+ $arrAlias[$objAlias->parent][$objAlias->id] = $objAlias->title . ' (' . ($GLOBALS['TL_LANG']['COLS'][$objAlias->inColumn] ?: $objAlias->inColumn) . ', ID ' . $objAlias->id . ')';
}
}
|
[News] Move the column names into their own language namespace (see #<I>)
|
diff --git a/assets/live-tools/tools.js b/assets/live-tools/tools.js
index <HASH>..<HASH> 100644
--- a/assets/live-tools/tools.js
+++ b/assets/live-tools/tools.js
@@ -52,7 +52,6 @@ if(!window.crabfarm) {
var removeOverlay = function() {
overlay.remove();
- window.crabfarm.showSelectorGadget();
};
overlay.bind("click", removeOverlay);
diff --git a/lib/crabfarm/live/interactable.rb b/lib/crabfarm/live/interactable.rb
index <HASH>..<HASH> 100644
--- a/lib/crabfarm/live/interactable.rb
+++ b/lib/crabfarm/live/interactable.rb
@@ -27,6 +27,15 @@ module Crabfarm
end
+ def examine(_tools=true)
+ if Crabfarm.live?
+ Crabfarm.live.show_primary_contents if self.is_a? BaseNavigator
+ Crabfarm.live.show_content raw_document if self.is_a? BaseReducer
+ Crabfarm.live.show_selector_gadget if _tools
+ raise LiveInterrupted.new
+ end
+ end
+
end
end
end
|
feat(live): adds examine method
Also disables selector gadget by default
|
diff --git a/src/models/Part.php b/src/models/Part.php
index <HASH>..<HASH> 100644
--- a/src/models/Part.php
+++ b/src/models/Part.php
@@ -108,7 +108,7 @@ class Part extends \hipanel\base\Model
[['id', 'src_id', 'dst_id', 'move_type'], 'required', 'on' => 'repair'],
// Update
- [['id', 'model_id', 'serial', 'price', 'currency', 'company_id', 'order_id'], 'required', 'on' => 'update'],
+ [['id', 'model_id', 'serial', 'price', 'currency', 'company_id'], 'required', 'on' => 'update'],
// Move / Bulk-move
[['src_id', 'dst_id', 'type'], 'required', 'on' => 'move'],
|
Fixed: `order_id` is not required at part update
|
diff --git a/src/Panda/Views/Viewer.php b/src/Panda/Views/Viewer.php
index <HASH>..<HASH> 100644
--- a/src/Panda/Views/Viewer.php
+++ b/src/Panda/Views/Viewer.php
@@ -102,11 +102,7 @@ class Viewer
}
// Load the view file
- if ($this->executable) {
- $this->output = include $this->view;
- } else {
- $this->output = file_get_contents($this->view);
- }
+ $this->output = $this->executable ? include $this->view : file_get_contents($this->view);
// Interpolate parameters on the view
$this->output = StringHelper::interpolate($this->output, $this->parameters);
|
Simplify if to a ternary operator
|
diff --git a/src/Form/TermsOfUseForm.php b/src/Form/TermsOfUseForm.php
index <HASH>..<HASH> 100644
--- a/src/Form/TermsOfUseForm.php
+++ b/src/Form/TermsOfUseForm.php
@@ -219,7 +219,7 @@ class TermsOfUseForm extends FormBase {
$config->save();
$this->messenger->addMessage($this->t('Open Y Terms and Conditions have been accepted.'));
- $form_state->setRedirect('<front>');
+ $form_state->setRedirect('openy_system.openy_terms_and_conditions');
}
}
|
OS-<I> updated redirect route
|
diff --git a/BaseBundle/Tests/DependencyInjection/Compiler/TwigGlobalsCompilerPassTest.php b/BaseBundle/Tests/DependencyInjection/Compiler/TwigGlobalsCompilerPassTest.php
index <HASH>..<HASH> 100644
--- a/BaseBundle/Tests/DependencyInjection/Compiler/TwigGlobalsCompilerPassTest.php
+++ b/BaseBundle/Tests/DependencyInjection/Compiler/TwigGlobalsCompilerPassTest.php
@@ -1,10 +1,4 @@
<?php
-/**
- * Created by PhpStorm.
- * User: perruchot
- * Date: 11/5/15
- * Time: 3:37 PM
- */
namespace OpenOrchestra\BaseBundle\Tests\DependencyInjection\Compiler;
|
delete comment auto-generate by ide
|
diff --git a/gcs/conn.go b/gcs/conn.go
index <HASH>..<HASH> 100644
--- a/gcs/conn.go
+++ b/gcs/conn.go
@@ -18,6 +18,8 @@ import (
"net/http"
"time"
+ "golang.org/x/oauth2"
+
"github.com/jacobsa/reqtrace"
storagev1 "google.golang.org/api/storage/v1"
@@ -40,10 +42,11 @@ type Conn interface {
// Configuration accepted by NewConn.
type ConnConfig struct {
- // An HTTP client, assumed to handle authorization and authentication. See
- // github.com/jacobsa/gcloud/oauthutil for a convenient way to create one of
- // these.
- HTTPClient *http.Client
+ // An oauth2 token source to use for authenticating to GCS.
+ //
+ // You probably want this one:
+ // http://godoc.org/golang.org/x/oauth2/google#DefaultTokenSource
+ TokenSource oauth2.TokenSource
// The value to set in User-Agent headers for outgoing HTTP requests. If
// empty, a default will be used.
|
Accept a token source instead of an HTTP client.
This slightly reduces the user's cognitive load for boilerplate, and
makes it easier to centralize wiring of httputil debugging.
|
diff --git a/timber.php b/timber.php
index <HASH>..<HASH> 100644
--- a/timber.php
+++ b/timber.php
@@ -113,7 +113,7 @@ class Timber {
*/
public static function get_posts($query = false, $PostClass = 'TimberPost'){
$posts = TimberPostGetter::get_posts($query, $PostClass);
- return self::maybe_set_preview( $posts );
+ return TimberPostGetter::maybe_set_preview( $posts );
}
/**
|
replaced call to self with TimberPostGetter #<I>
|
diff --git a/library/Theme/Navigation.php b/library/Theme/Navigation.php
index <HASH>..<HASH> 100644
--- a/library/Theme/Navigation.php
+++ b/library/Theme/Navigation.php
@@ -111,9 +111,9 @@ class Navigation
$label = 'Translate';
if (get_field('google_translate_show_as', 'option') == 'icon') {
- $label = '<span data-tooltip="Translate"><i class="pricon pricon-globe pricon-lg"></i></span>';
+ $label = '<span data-tooltip="Translate"><i class="pricon pricon-globe"></i></span>';
} elseif (get_field('google_translate_show_as', 'option') == 'combined') {
- $label = '<i class="pricon pricon-globe pricon-lg"></i> Translate';
+ $label = '<i class="pricon pricon-globe"></i> Translate';
}
$items .= '<li class="menu-item-translate"><a href="#translate" class="translate-icon-btn" aria-label="translate">' . $label . '</a></li>';
|
Default to normal sized icon in header
|
diff --git a/src/webroot/cms/blog-manager/blog/blog.js b/src/webroot/cms/blog-manager/blog/blog.js
index <HASH>..<HASH> 100644
--- a/src/webroot/cms/blog-manager/blog/blog.js
+++ b/src/webroot/cms/blog-manager/blog/blog.js
@@ -1052,7 +1052,7 @@ function (Y) {
if (this.options.standalone) {
// Open content manager action
- var url = Manager.Loader.getStaticPath() + Manager.Loader.getActionBasePath('SiteMap') + '/h/page/' + record_id;
+ var url = Manager.Loader.getDynamicPath() + Manager.Loader.getActionBasePath('SiteMap') + '/h/page/' + record_id;
Y.Cookie.set('supra_language', this.locale);
document.location = url;
|
#<I> Blog app
- Fixed incorrect path being opened after blog post is created
|
diff --git a/grimoire_elk/enriched/mediawiki.py b/grimoire_elk/enriched/mediawiki.py
index <HASH>..<HASH> 100644
--- a/grimoire_elk/enriched/mediawiki.py
+++ b/grimoire_elk/enriched/mediawiki.py
@@ -75,8 +75,7 @@ class MediaWikiEnrich(Enrich):
for revision in revisions:
user = self.get_sh_identity(revision)
- identities.append(user)
- return identities
+ yield user
def get_field_author(self):
return 'user'
|
[enrich-mediawiki] Replace list with yield
This code replaces the list used in the method get_identities with
a yield, thus reducing the memory footprint.
|
diff --git a/vulcan/errors.py b/vulcan/errors.py
index <HASH>..<HASH> 100644
--- a/vulcan/errors.py
+++ b/vulcan/errors.py
@@ -2,7 +2,7 @@ from twisted.python.failure import Failure
from twisted.web.error import Error
from twisted.web import http
-from vulcan import log
+from twisted.python import log
from vulcan.utils import safe_format
diff --git a/vulcan/test/test_httpserver.py b/vulcan/test/test_httpserver.py
index <HASH>..<HASH> 100644
--- a/vulcan/test/test_httpserver.py
+++ b/vulcan/test/test_httpserver.py
@@ -2,7 +2,7 @@ from . import *
import json
-from treq.test.util import TestCase
+from twisted.trial.unittest import TestCase
from twisted.internet import defer, task
from twisted.python.failure import Failure
|
use trial TestCase instead of treq import log from twisted instead of vulcan
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -46,15 +46,13 @@ if __name__ == "__main__":
python_requires='>=3.6',
packages=[
'codespell_lib',
+ 'codespell_lib.tests',
'codespell_lib.data',
],
package_data={'codespell_lib': [
os.path.join('data', 'dictionary*.txt'),
os.path.join('data', 'linux-kernel.exclude'),
]},
- exclude_package_data={'codespell_lib': [
- os.path.join('tests', '*'),
- ]},
entry_points={
'console_scripts': [
'codespell = codespell_lib:_script_main'
|
MAINT: Add tests as submodule (#<I>)
|
diff --git a/javascript/web/LiveSearchGOlr.js b/javascript/web/LiveSearchGOlr.js
index <HASH>..<HASH> 100644
--- a/javascript/web/LiveSearchGOlr.js
+++ b/javascript/web/LiveSearchGOlr.js
@@ -31,7 +31,10 @@ function LiveSearchGOlrInit(){
ll('Using _establish_buttons');
if( personality == 'annotation' ){
manager.clear_buttons();
- manager.add_button(facet_matrix_button);
+ // Only add matrix button for labs for now.
+ if( sd.beta() && sd.beta() == '1' ){
+ manager.add_button(facet_matrix_button);
+ }
manager.add_button(gaf_download_button);
manager.add_button(ann_flex_download_button);
//manager.add_button(gaf_galaxy_button);
|
only show ann matrix button in labs/beta
|
diff --git a/lib/Core/SourceCodeLocator/TemporarySourceLocator.php b/lib/Core/SourceCodeLocator/TemporarySourceLocator.php
index <HASH>..<HASH> 100644
--- a/lib/Core/SourceCodeLocator/TemporarySourceLocator.php
+++ b/lib/Core/SourceCodeLocator/TemporarySourceLocator.php
@@ -8,6 +8,27 @@ use Phpactor\WorseReflection\Core\SourceCodeLocator;
use Phpactor\WorseReflection\Core\Exception\SourceNotFound;
use Phpactor\WorseReflection\Core\Reflector\SourceCodeReflector;
+/**
+ * Source locator for keeping track of source code provided at call time.
+ *
+ * Note this locator IS NOT SUITABLE FOR LONG RUNNING PROCESSES due to the way
+ * it handles source code without a path.
+ *
+ * During a given process many calls maybe made to the reflector, and any code
+ * provided directory (rather than located from the filesystem) should have
+ * precedence over other code.
+ *
+ * Because it's possible to provide source without a path (which is a mistake)
+ * we have no way of identifying code which is _updated_ so we just push to an
+ * array with a numerical index in this case.
+ *
+ * In a long-running process (i.e. a server) this will result in an every
+ * growing stack of outdated data.
+ *
+ * This locator should ONLY be used on short-lived processes (i.e. web request,
+ * or RPC request) or in situations where you are confident you provide the
+ * path for all source code.
+ */
class TemporarySourceLocator implements SourceCodeLocator
{
/**
|
Add note about the suitability of the temporary source locator
|
diff --git a/source/test/common/test_error_preemption_handling.py b/source/test/common/test_error_preemption_handling.py
index <HASH>..<HASH> 100644
--- a/source/test/common/test_error_preemption_handling.py
+++ b/source/test/common/test_error_preemption_handling.py
@@ -28,8 +28,7 @@ class TestErrorPreemptionHandling():
def setup_class(cls):
# This methods runs on class creation and creates the state machine
testing_utils.test_multithrading_lock.acquire()
- state_machine, version, creation_time = global_storage.load_statemachine_from_path(
- rafcon.__path__[0] + "/../test_scripts/unit_test_state_machines/action_block_execution_test")
+ state_machine = storage.load_statemachine_from_path(testing_utils.get_test_sm_path("unit_test_state_machines/action_block_execution_test"))
cls.state_machine = state_machine
state_machine_manager.add_state_machine(state_machine)
state_machine_manager.active_state_machine_id = state_machine.state_machine_id
|
fix wrong path
error occured during merge
|
diff --git a/packages/perspective-viewer/src/js/view.js b/packages/perspective-viewer/src/js/view.js
index <HASH>..<HASH> 100644
--- a/packages/perspective-viewer/src/js/view.js
+++ b/packages/perspective-viewer/src/js/view.js
@@ -748,6 +748,14 @@ registerElement(template, {
}
},
+ 'index': {
+ set: function () {
+ if (this._table) {
+ console.error(`Setting 'index' attribute after initialization has no effect`);
+ }
+ }
+ },
+
'row-pivots': {
set: function () {
let pivots = JSON.parse(this.getAttribute('row-pivots'));
|
Added warning when index is set after data load.
|
diff --git a/conductor/src/main/java/com/bluelinelabs/conductor/Controller.java b/conductor/src/main/java/com/bluelinelabs/conductor/Controller.java
index <HASH>..<HASH> 100644
--- a/conductor/src/main/java/com/bluelinelabs/conductor/Controller.java
+++ b/conductor/src/main/java/com/bluelinelabs/conductor/Controller.java
@@ -1082,7 +1082,7 @@ public abstract class Controller {
final View inflate(@NonNull ViewGroup parent) {
if (view != null && view.getParent() != null && view.getParent() != parent) {
detach(view, true, false);
- removeViewReference(view.getContext());
+ removeViewReference(view != null ? view.getContext() : null);
}
if (view == null) {
|
Fix NPE when removing view reference (#<I>)
Great catch, thanks!
|
diff --git a/mysql/client.js b/mysql/client.js
index <HASH>..<HASH> 100644
--- a/mysql/client.js
+++ b/mysql/client.js
@@ -83,7 +83,6 @@ function dump(d)
this.write_packet = function(packet, pnum)
{
packet.addHeader(pnum);
- sys.puts("writing: " + sys.inspect(packet));
this.connection.write(packet.data, 'binary');
}
|
binary encoding in write; debug output removed
|
diff --git a/lib/transforms/serializeSourceMaps.js b/lib/transforms/serializeSourceMaps.js
index <HASH>..<HASH> 100644
--- a/lib/transforms/serializeSourceMaps.js
+++ b/lib/transforms/serializeSourceMaps.js
@@ -6,6 +6,11 @@ module.exports = function () {
var potentiallyOrphanedAssetsById = {};
assetGraph.findAssets({ type: 'JavaScript', isLoaded: true }).forEach(function (javaScript) {
+ // For now, don't attempt to attach source maps to data-bind attributes:
+ if (javaScript.isInline && assetGraph.findRelations({ type: [ 'HtmlDataBindAttribute', 'HtmlKnockoutContainerless' ], to: javaScript }).length > 0) {
+ return;
+ }
+
var nonInlineAncestorUrl = javaScript.nonInlineAncestor.url;
var hasLocationInformationPointingAtADifferentSourceFile = false;
estraverse.traverse(javaScript.parseTree, {
|
serializeSourceMaps: Don't attempt to introduce source maps for data-bind="..." and <!-- ko ... -->
|
diff --git a/lib/jazzy/config.rb b/lib/jazzy/config.rb
index <HASH>..<HASH> 100644
--- a/lib/jazzy/config.rb
+++ b/lib/jazzy/config.rb
@@ -248,13 +248,13 @@ module Jazzy
default: []
config_attr :theme_directory,
- command_line: '--theme [apple | DIRPATH]',
- description: "Which theme to use. Specify either 'apple' (default) or "\
- 'the path to your mustache templates and other assets for '\
- 'a custom theme.',
+ command_line: '--theme [apple | fullwidth | DIRPATH]',
+ description: "Which theme to use. Specify either 'apple' (default), "\
+ "'fullwidth' or the path to your mustache templates and " \
+ 'other assets for a custom theme.',
default: 'apple',
parse: ->(t) do
- return expand_path(t) unless t == 'apple'
+ return expand_path(t) unless (t == 'apple' || t == 'fullwidth')
Pathname(__FILE__).parent + 'themes' + t
end
|
add fullwidth as a --theme option
|
diff --git a/lib/unsound/version.rb b/lib/unsound/version.rb
index <HASH>..<HASH> 100644
--- a/lib/unsound/version.rb
+++ b/lib/unsound/version.rb
@@ -1,3 +1,3 @@
module Unsound
- VERSION = "0.0.3"
+ VERSION = "0.1.1"
end
|
bump to <I> since i released from the feature branch again =/
|
diff --git a/actstream/jsonfield.py b/actstream/jsonfield.py
index <HASH>..<HASH> 100644
--- a/actstream/jsonfield.py
+++ b/actstream/jsonfield.py
@@ -2,12 +2,13 @@
Decide on a JSONField implementation based on available packages.
-There are two possible options, preferred in the following order:
- - JSONField from django-jsonfield with django-jsonfield-compat
- - JSONField from django-mysql (needs MySQL 5.7+)
+These are the options:
+ - With recent Django >= 3.1 use Django's builtin JSONField.
+ - For Django versions < 3.1 we need django-jsonfield-backport
+ and will use its JSONField instead.
-Raises an ImportError if USE_JSONFIELD is True but none of these are
-installed.
+Raises an ImportError if USE_JSONFIELD is True, but none of the above
+apply.
Falls back to a simple Django TextField if USE_JSONFIELD is False,
however that field will be removed by migration 0002 directly
|
Remove mysql details from docstring (#<I>)
* Remove mysql details from docstring
The django-mysql JSONField option (introduced before Django had its own builtin JSONField) has been removed, so we should not mention it in the docstring anymore.
* Fix typos
|
diff --git a/lib/epub/cfi.rb b/lib/epub/cfi.rb
index <HASH>..<HASH> 100644
--- a/lib/epub/cfi.rb
+++ b/lib/epub/cfi.rb
@@ -14,6 +14,8 @@ module EPUB
end
class Location
+ include Comparable
+
attr_reader :paths
def initialize(paths=[])
|
Make EPUB::CFI comparable
|
diff --git a/packages/legacy-sensor/test/tracing/test.js b/packages/legacy-sensor/test/tracing/test.js
index <HASH>..<HASH> 100644
--- a/packages/legacy-sensor/test/tracing/test.js
+++ b/packages/legacy-sensor/test/tracing/test.js
@@ -48,11 +48,6 @@ describe('legacy sensor/tracing', function () {
}).registerTestHooks();
it('must trace request(<string>, options, cb)', () => {
- if (semver.lt(process.versions.node, '10.9.0')) {
- // The (url, options[, callback]) API only exists since Node 10.9.0:
- return;
- }
-
return clientControls
.sendRequest({
method: 'GET',
@@ -196,10 +191,6 @@ describe('legacy sensor/tracing', function () {
));
it('must trace get(<string>, options, cb)', () => {
- if (semver.lt(process.versions.node, '10.9.0')) {
- // The (url, options[, callback]) API only exists since Node 10.9.0.
- return;
- }
return clientControls
.sendRequest({
method: 'GET',
|
chore: removed node version check in packages/legacy-sensor/test/tracing/test.js
refs <I>
- no one is using Node < <I>
- CI uses <I>
- IMO its fine to remove these checks although we define >= <I> as engine
|
diff --git a/ginkgo/run_command.go b/ginkgo/run_command.go
index <HASH>..<HASH> 100644
--- a/ginkgo/run_command.go
+++ b/ginkgo/run_command.go
@@ -193,7 +193,7 @@ func (r *SpecRunner) combineCoverprofiles(runners []*testrunner.TestRunner) erro
_, err = combined.Write(contents)
// Add a newline to the end of every file if missing.
- if err == nil && contents[len(contents)-1] != '\n' {
+ if err == nil && len(contents) > 0 && contents[len(contents)-1] != '\n' {
_, err = combined.Write([]byte("\n"))
}
|
Test if a coverprofile content is empty before checking its latest character (#<I>)
|
diff --git a/lib/wired/builders/facebook_builder.rb b/lib/wired/builders/facebook_builder.rb
index <HASH>..<HASH> 100644
--- a/lib/wired/builders/facebook_builder.rb
+++ b/lib/wired/builders/facebook_builder.rb
@@ -51,16 +51,12 @@ Home pagina, show fangate: <%= @show_fangate %>
copy_file 'facebook/sessions_controller.rb', 'app/controllers/sessions_controller.rb'
copy_file 'facebook/cookie.html.erb', 'app/views/sessions/cookie.html.erb'
facebook_cookie_fix =<<-COOKIE_FIX
- helper_method :allow_iframe_requests
+ before_action :allow_iframe_requests
helper_method :current_user
- before_filter :cookie_fix
- before_filter :add_global_javascript_variables
- before_filter :set_origin
- before_filter :set_p3p
-
- def cookie
- # third party cookie fix
- end
+ before_action :cookie_fix
+ before_action :add_global_javascript_variables
+ before_action :set_origin
+ before_action :set_p3p
private
def set_p3p
|
iframe_requests is not a helper but a method, and filters are deprecated, use actions
|
diff --git a/src/CacheProfiles/BaseCacheProfile.php b/src/CacheProfiles/BaseCacheProfile.php
index <HASH>..<HASH> 100644
--- a/src/CacheProfiles/BaseCacheProfile.php
+++ b/src/CacheProfiles/BaseCacheProfile.php
@@ -24,7 +24,7 @@ abstract class BaseCacheProfile implements CacheProfile
public function useCacheNameSuffix(Request $request): string
{
if (Auth::check()) {
- return Auth::user()->id;
+ return Auth::id();
}
return '';
|
Use Auth::id() instead of Auth::user()->id (#<I>)
This PR allows greater flexibility when using other authentication drivers by requesting the users ID via `Authenticatable::getAuthIdentifier()` through the `Auth` facade.
|
diff --git a/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php b/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php
+++ b/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php
@@ -82,7 +82,7 @@ trait AuthenticatesAndRegistersUsers {
}
return redirect($this->loginPath())
- ->withInput($request->only('email'))
+ ->withInput($request->only('email', 'remember'))
->withErrors([
'email' => 'These credentials do not match our records.',
]);
|
Return to login page with remember input checkbox too
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ here = path.abspath(path.dirname(__file__))
setup(
name='wikitextparser',
# Scheme: [N!]N(.N)*[{a|b|rc}N][.postN][.devN]
- version='0.8.5.dev1',
+ version='0.8.6.dev1',
description='A simple, purely python, WikiText parsing tool.',
long_description=open(path.join(here, 'README.rst')).read(),
url='https://github.com/5j9/wikitextparser',
|
Bump the version to '<I>.dev1'
|
diff --git a/Application.php b/Application.php
index <HASH>..<HASH> 100644
--- a/Application.php
+++ b/Application.php
@@ -29,6 +29,7 @@ class Application extends BaseApplication
$sfRequest = SymfonyRequest::create($request->getPath(), $request->getMethod());
$sfRequest->attributes->set('react.espresso.request', $request);
$sfRequest->attributes->set('react.espresso.response', $response);
+
return $sfRequest;
}
}
diff --git a/ControllerCollection.php b/ControllerCollection.php
index <HASH>..<HASH> 100644
--- a/ControllerCollection.php
+++ b/ControllerCollection.php
@@ -13,6 +13,7 @@ class ControllerCollection extends BaseControllerCollection
public function match($pattern, $to)
{
$wrapped = $this->wrapController($to);
+
return parent::match($pattern, $wrapped);
}
|
Run CS fixer on code base
|
diff --git a/drivers/chown.go b/drivers/chown.go
index <HASH>..<HASH> 100644
--- a/drivers/chown.go
+++ b/drivers/chown.go
@@ -5,10 +5,10 @@ import (
"encoding/json"
"fmt"
"os"
- "path/filepath"
"github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/reexec"
+ "github.com/opencontainers/selinux/pkg/pwalk"
)
const (
@@ -51,16 +51,13 @@ func chownByMapsMain() {
if len(toHost.UIDs()) == 0 && len(toHost.GIDs()) == 0 {
toHost = nil
}
- chown := func(path string, info os.FileInfo, err error) error {
- if err != nil {
- return fmt.Errorf("error walking to %q: %v", path, err)
- }
+ chown := func(path string, info os.FileInfo, _ error) error {
if path == "." {
return nil
}
return platformLChown(path, info, toHost, toContainer)
}
- if err := filepath.Walk(".", chown); err != nil {
+ if err := pwalk.Walk(".", chown); err != nil {
fmt.Fprintf(os.Stderr, "error during chown: %v", err)
os.Exit(1)
}
|
drivers/chown: use pwalk.Walk
This is a parallel Walk implementation and we're expecting some
speedup
|
diff --git a/e2e_test/playground/transaction_service/app.js b/e2e_test/playground/transaction_service/app.js
index <HASH>..<HASH> 100644
--- a/e2e_test/playground/transaction_service/app.js
+++ b/e2e_test/playground/transaction_service/app.js
@@ -32,21 +32,30 @@ app.directive('customDirective', function () {
}
}
})
+function exponentialize (seed, times) {
+ var res = seed
+ for (var j = 0; j < times; j++) {
+ res = res.concat(res)
+ }
+ return res
+}
app.controller('MainCtrl', function mainCtrl ($scope, $http, $resource) {
$scope.confirmation = function (conf) {
$scope.confirmation = conf
}
- var i = 0
- $scope.repeatArray = [10]
+ var repeatArray = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+
+ $scope.repeatArray = repeatArray
setTimeout(function () {
- $scope.repeatArray.push(i++)
+ $scope.repeatArray.push(1)
$scope.$apply()
}, 0)
$http.get('confirmation.json').then(function (response) {
$scope.confirmation(response.data)
+ $scope.repeatArray = exponentialize(repeatArray, 8)
}, function () {
throw new Error('Confirmation failed.')
})
|
add big datasets to e2e_test/playground
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ setup(
'requests==2.9.1',
'gevent==1.1.2',
'gevent-websocket==0.9.5',
+ 'pyzmq==17.1.2'
],
extras_require = {
|
GUI Issue #<I> - Adding pyzmq installation requirement
|
diff --git a/select2.js b/select2.js
index <HASH>..<HASH> 100644
--- a/select2.js
+++ b/select2.js
@@ -961,12 +961,19 @@ the specific language governing permissions and limitations under the Apache Lic
// mozilla and IE
el.bind("propertychange.select2 DOMAttrModified.select2", sync);
+
+
+ // hold onto a reference of the callback to work around a chromium bug
+ if (this.mutationCallback === undefined) {
+ this.mutationCallback = function (mutations) {
+ mutations.forEach(sync);
+ }
+ }
+
// safari and chrome
if (typeof WebKitMutationObserver !== "undefined") {
if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
- this.propertyObserver = new WebKitMutationObserver(function (mutations) {
- mutations.forEach(sync);
- });
+ this.propertyObserver = new WebKitMutationObserver(this.mutationCallback);
this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
}
},
|
work around chrome and mutation observer bug. fixes #<I>
|
diff --git a/satpy/modifiers/_crefl.py b/satpy/modifiers/_crefl.py
index <HASH>..<HASH> 100644
--- a/satpy/modifiers/_crefl.py
+++ b/satpy/modifiers/_crefl.py
@@ -118,7 +118,7 @@ class ReflectanceCorrector(ModifierBase, DataDownloadMixin):
@staticmethod
def _read_var_from_hdf4_file(local_filename, var_name):
try:
- return ReflectanceCorrector._read_var_from_hdf4_file(local_filename, var_name)
+ return ReflectanceCorrector._read_var_from_hdf4_file_pyhdf(local_filename, var_name)
except (ImportError, OSError):
return ReflectanceCorrector._read_var_from_hdf4_file_netcdf4(local_filename, var_name)
|
Fix typo in crefl DEM reading
|
diff --git a/Command/Command.php b/Command/Command.php
index <HASH>..<HASH> 100644
--- a/Command/Command.php
+++ b/Command/Command.php
@@ -68,9 +68,13 @@ class Command extends AbstractCommand
*/
protected function doExecute()
{
+ $this->input->args = array($this->name);
+
$output = $this->application
->getDefaultCommand()
->getArgument('help')
+ ->setInput($this->input)
+ ->setOutput($this->output)
->execute();
$this->out($output);
|
Add color support when default doExecute call HelpCommand
|
diff --git a/lib/fuzzystringmatch/inline/jarowinkler.rb b/lib/fuzzystringmatch/inline/jarowinkler.rb
index <HASH>..<HASH> 100644
--- a/lib/fuzzystringmatch/inline/jarowinkler.rb
+++ b/lib/fuzzystringmatch/inline/jarowinkler.rb
@@ -34,8 +34,8 @@ double getDistance( char *s1, char *s2 )
{
char *_max;
char *_min;
- int _max_length = 0;
- int _min_length = 0;
+ long _max_length = 0;
+ long _min_length = 0;
if ( strlen(s1) > strlen(s2) ) {
_max = s1; _max_length = strlen(s1);
_min = s2; _min_length = strlen(s2);
@@ -46,8 +46,8 @@ double getDistance( char *s1, char *s2 )
}
int range = max( _max_length / 2 - 1, 0 );
- int indexes[_min_length];
- for( int i = 0 ; i < _min_length ; i++ ) {
+ long indexes[_min_length];
+ for( long i = 0 ; i < _min_length ; i++ ) {
indexes[i] = -1;
}
|
Quiet warnings when loading into Rails <I> with Ruby <I> on Mac OSX, to the effect of 'jarowinkler.rb:<I>: warning: implicit conversion shortens <I>-bit value into a <I>-bit value'
|
diff --git a/core/ArrayLib.php b/core/ArrayLib.php
index <HASH>..<HASH> 100755
--- a/core/ArrayLib.php
+++ b/core/ArrayLib.php
@@ -4,7 +4,7 @@
* @package sapphire
* @subpackage misc
*/
-class ArrayLib extends Object {
+class ArrayLib {
/**
* Inverses the first and second level keys of an associative
|
MINOR ArrayLib - removed unncessary extending of Object since this class only has a bunch of static functions (from r<I>)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@<I> <I>b<I>ca-7a2a-<I>-9d3b-<I>d<I>a<I>a9
|
diff --git a/src/module.js b/src/module.js
index <HASH>..<HASH> 100644
--- a/src/module.js
+++ b/src/module.js
@@ -203,9 +203,26 @@ angular.module('stormpath', [
* @return {Object} config $http config object.
*/
StormpathAgentInterceptor.prototype.request = function(config){
- if ($isCurrentDomain(config.url)){
+
+ var uriExpressions = [
+ '/change$',
+ '/forgot$',
+ '/login$',
+ '/logout$',
+ '/me$',
+ '/oauth/token$',
+ '/oauth/token$',
+ '/register$',
+ '/revoke$',
+ '/verify$'
+ ];
+
+ if (uriExpressions.some(function(expr){
+ return new RegExp(expr).test(config.url);
+ })) {
config.headers = angular.extend(config.headers, $spHeaders);
}
+
return config;
};
|
Change agent header strategy to a whitelist strategy
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ from os import path
here = path.abspath(path.dirname(__file__))
__author__ = 'Magnus Knutas'
-VERSION = '1.3.2'
+VERSION = '1.3.3'
with open("README.md", "r") as fh:
long_description = fh.read()
|
Update setup.py
Update version number
|
diff --git a/_pytest/main.py b/_pytest/main.py
index <HASH>..<HASH> 100644
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -34,8 +34,8 @@ def pytest_addoption(parser):
# "**/test_*.py", "**/*_test.py"]
#)
group = parser.getgroup("general", "running and selection options")
- group._addoption('-x', '--exitfirst', action="store_true", default=False,
- dest="exitfirst",
+ group._addoption('-x', '--exitfirst', action="store_const",
+ dest="maxfail", const=1,
help="exit instantly on first error or failed test."),
group._addoption('--maxfail', metavar="num",
action="store", type=int, dest="maxfail", default=0,
@@ -74,10 +74,10 @@ def pytest_namespace():
collect = dict(Item=Item, Collector=Collector, File=File, Session=Session)
return dict(collect=collect)
+
def pytest_configure(config):
pytest.config = config # compatibiltiy
- if config.option.exitfirst:
- config.option.maxfail = 1
+
def wrap_session(config, doit):
"""Skeleton command line program"""
|
implement exitfirst as store_const option
this makes it possible to override with a later maxfail
|
diff --git a/packages/bonde-styleguide/src/content/Button/Button.js b/packages/bonde-styleguide/src/content/Button/Button.js
index <HASH>..<HASH> 100644
--- a/packages/bonde-styleguide/src/content/Button/Button.js
+++ b/packages/bonde-styleguide/src/content/Button/Button.js
@@ -115,7 +115,13 @@ Button.propTypes = {
/** Flat button style. */
flat: bool,
/** Button text color. */
- color: string
+ color: string,
+ /** Button type. */
+ type: string,
+}
+
+Button.defaultProps = {
+ type: 'button',
}
Button.displayName = 'Button'
|
chore(styleguide): button component type as button by default
|
diff --git a/choria/framework.go b/choria/framework.go
index <HASH>..<HASH> 100644
--- a/choria/framework.go
+++ b/choria/framework.go
@@ -359,7 +359,7 @@ func (fw *Framework) MiddlewareServers() (servers srvcache.Servers, err error) {
}
}
- if servers.Count() == 0 {
+ if servers.Count() == 0 && fw.Config.Choria.UseSRVRecords {
servers, err = fw.QuerySrvRecords([]string{"_mcollective-server._tcp", "_x-puppet-mcollective._tcp"})
if err != nil {
log.Warnf("Could not resolve Middleware Server SRV records: %s", err)
|
(#<I>) avoid some warning level logs
|
diff --git a/ternary/plotting.py b/ternary/plotting.py
index <HASH>..<HASH> 100644
--- a/ternary/plotting.py
+++ b/ternary/plotting.py
@@ -93,10 +93,10 @@ def triangle_coordinates(i, j, alt=False):
# Alt refers to the inner triangles not covered by the default case
return [(i/2. + j + 1, i * SQRT3OVER2), (i/2. + j + 1.5, (i + 1) * SQRT3OVER2), (i/2. + j + 0.5, (i + 1) * SQRT3OVER2)]
-def heatmap(d, steps, cmap_name=None, boundary=True, ax=None, scientific=True):
+def heatmap(d, steps, cmap_name=None, boundary=True, ax=None, scientific=False):
"""Plots counts in the dictionary d as a heatmap. d is a dictionary of (i,j) --> c pairs where N = i + j + k."""
if not ax:
- ax = pyplot
+ ax = pyplot.subplot()
if not cmap_name:
cmap = DEFAULT_COLOR_MAP
else:
|
Added axes parameter to heatmap to allow for imbedding into e.g. gridspec layouts.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ class JPypeSetup(object):
self.javaHome = os.getenv("JAVA_HOME")
if self.javaHome is None:
possibleHomes = ['/usr/lib/jvm/default-java',
+ '/usr/lib/jvm/java-6-sun/',
'/usr/lib/jvm/java-1.5.0-gcj-4.4',
'/usr/lib/jvm/jdk1.6.0_30',
'/usr/lib/jvm/java-1.5.0-sun-1.5.0.08',
|
Add another linux java jdk path.
|
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
index <HASH>..<HASH> 100644
--- a/lib/beaker-hostgenerator/data.rb
+++ b/lib/beaker-hostgenerator/data.rb
@@ -68,7 +68,7 @@ module BeakerHostGenerator
'pe_ver' => options[:pe_ver] || pe_version,
'pe_upgrade_dir' => options[:pe_upgrade_dir] || pe_dir(pe_upgrade_version),
'pe_upgrade_ver' => options[:pe_upgrade_ver] || pe_upgrade_version,
- }
+ }.reject { |key, value| value.nil? }
end
# This is where all the information for all platforms lives, irrespective
|
Do not generate empty entries for pe_*
This is not needed to specify and only increases the generated data.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
setup(name='citrination-client',
- version='3.1.0',
+ version='3.2.0',
url='http://github.com/CitrineInformatics/python-citrination-client',
description='Python client for accessing the Citrination api',
packages=find_packages(exclude=('docs')),
|
bump the version to <I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -28,8 +28,6 @@ There is no GUI here. The GUI is https://github.com/jflesch/paperwork .
"/archive/unstable.tar.gz"),
classifiers=[
"Development Status :: 5 - Production/Stable",
- "Environment :: X11 Applications :: GTK",
- "Environment :: X11 Applications :: Gnome",
"Intended Audience :: End Users/Desktop",
("License :: OSI Approved ::"
" GNU General Public License v3 or later (GPLv3+)"),
|
setup.py: backend is not an X<I> application
|
diff --git a/c7n/resources/asg.py b/c7n/resources/asg.py
index <HASH>..<HASH> 100644
--- a/c7n/resources/asg.py
+++ b/c7n/resources/asg.py
@@ -126,7 +126,7 @@ class LaunchInfo(object):
lid = asg.get('LaunchTemplate')
if lid is not None:
- return (lid['LaunchTemplateId'], lid['LaunchTemplateVersion'])
+ return (lid['LaunchTemplateId'], lid['Version'])
# we've noticed some corner cases where the asg name is the lc name, but not
# explicitly specified as launchconfiguration attribute.
|
asg - not-encrypted filter launch template version key(#<I>)
|
diff --git a/server/const.go b/server/const.go
index <HASH>..<HASH> 100644
--- a/server/const.go
+++ b/server/const.go
@@ -41,7 +41,7 @@ var (
const (
// VERSION is the current version for the server.
- VERSION = "2.2.1"
+ VERSION = "2.2.2-beta"
// PROTO is the currently supported protocol.
// 0 was the original
|
Bump to <I>-beta
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -73,14 +73,12 @@ tests_require = [
'logbook',
'mock',
'nose',
- 'pycodestyle',
'pytz',
'pytest>=3.2.0,<3.3.0',
- 'pytest-timeout==1.2.0',
+ 'pytest-timeout==1.2.1',
'pytest-xdist==1.18.2',
- 'pytest-pythonpath==0.7.1',
- 'pytest-sugar==0.9.0',
- 'pytest-cov',
+ 'pytest-pythonpath==0.7.2',
+ 'pytest-cov==2.5.1',
'pytest-flake8==1.0.0',
'requests',
'tornado>=4.1,<5.0',
|
ref: Update pytest requirements (#<I>)
|
diff --git a/src/main/java/org/fit/cssbox/css/DOMAnalyzer.java b/src/main/java/org/fit/cssbox/css/DOMAnalyzer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/fit/cssbox/css/DOMAnalyzer.java
+++ b/src/main/java/org/fit/cssbox/css/DOMAnalyzer.java
@@ -314,7 +314,11 @@ public class DOMAnalyzer
//fix the DOM tree structure according to HTML syntax
HTMLNorm.normalizeHTMLTree(doc);
//convert attributes to style definitions
- HTMLNorm.attributesToStyles(getBody(), "");
+ Element body = getBody();
+ if (body != null)
+ HTMLNorm.attributesToStyles(body, "");
+ else
+ log.error("No <body> element found in the DOM.");
}
/**
|
Avoid exception when there is no <body> element in the DOM.
|
diff --git a/Settings.php b/Settings.php
index <HASH>..<HASH> 100644
--- a/Settings.php
+++ b/Settings.php
@@ -2,29 +2,51 @@
/**
* @file
- * Contains Drupal\Component\Utility\Settings.
+ * Contains \Drupal\Component\Utility\Settings.
*/
namespace Drupal\Component\Utility;
-class Settings {
+/**
+ * Read only settings that are initialized with the class.
+ */
+final class Settings {
/**
+ * Array with the settings.
+ *
* @var array
*/
- protected $storage;
+ private $storage = array();
/**
- * @var Settings
+ * Singleton instance.
+ *
+ * @var \Drupal\Component\Utility\Settings
*/
- static $singleton;
+ private static $instance;
/**
+ * Returns the settings instance.
+ *
+ * A singleton is used because this class is used before the container is
+ * available.
+ *
+ * @return \Drupal\Component\Utility\Settings
+ */
+ public static function getSingleton() {
+ return self::$instance;
+ }
+
+ /**
+ * Constructor.
+ *
* @param array $settings
+ * Array with the settings.
*/
function __construct(array $settings) {
$this->storage = $settings;
- self::$singleton = $this;
+ self::$instance = $this;
}
/**
|
Issue #<I> by Berdir, deviance, Lars Toomre: Make queue a container service.
|
diff --git a/views/layouts/main.php b/views/layouts/main.php
index <HASH>..<HASH> 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -7,7 +7,6 @@ $user = Yii::$app->adminuser->getIdentity();
$this->beginPage()
?><!DOCTYPE html>
<html ng-app="zaa" ng-controller="LayoutMenuController">
-
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
@@ -29,10 +28,7 @@ $this->beginPage()
<script>
var authToken = '<?=$user->getAuthToken();?>';
</script>
-
- <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
</head>
-
<body ng-cloak>
<?php $this->beginBody() ?>
<!-- ANGULAR SCRIPTS -->
|
removed materialize font from layout file.
|
diff --git a/src/main/java/com/postmark/java/PostmarkClient.java b/src/main/java/com/postmark/java/PostmarkClient.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/postmark/java/PostmarkClient.java
+++ b/src/main/java/com/postmark/java/PostmarkClient.java
@@ -59,6 +59,7 @@ public class PostmarkClient {
gsonBuilder.registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter());
gsonBuilder.setPrettyPrinting();
gsonBuilder.setExclusionStrategies(new SkipMeExclusionStrategy(Boolean.class));
+ gsonBuilder.disableHtmlEscaping();
logger.addHandler(new ConsoleHandler());
logger.setLevel(Level.ALL);
|
Disabled HTML escaping so that trailing = in Base<I> are not encoded with \u<I>d
|
diff --git a/src/java/com/threerings/cast/CharacterSprite.java b/src/java/com/threerings/cast/CharacterSprite.java
index <HASH>..<HASH> 100644
--- a/src/java/com/threerings/cast/CharacterSprite.java
+++ b/src/java/com/threerings/cast/CharacterSprite.java
@@ -1,5 +1,5 @@
//
-// $Id: CharacterSprite.java,v 1.39 2003/01/13 22:53:04 mdb Exp $
+// $Id: CharacterSprite.java,v 1.40 2003/01/13 23:54:19 mdb Exp $
package com.threerings.cast;
@@ -180,6 +180,9 @@ public class CharacterSprite extends ImageSprite
// documentation inherited
public void paint (Graphics2D gfx)
{
+ // attempt to composite our action frames if necessary
+ compositeActionFrames();
+
if (_frames != null) {
decorateBehind(gfx);
// paint the image using _ibounds rather than _bounds which
@@ -197,7 +200,7 @@ public class CharacterSprite extends ImageSprite
* their frames. This is called lazily after we have been instructed
* to use a new action.
*/
- protected void compositeActionFrames ()
+ protected final void compositeActionFrames ()
{
if (_frames == null) {
setFrames(_aframes.getFrames(_orient));
|
We need to composite our action frames because it's possible that during
our tick we'll do something that invalidates our existing frames and we
need to composite the new ones in paint().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@<I> <I>f4-<I>e9-<I>-aa3c-eee0fc<I>fb1
|
diff --git a/build/tasks/ci.js b/build/tasks/ci.js
index <HASH>..<HASH> 100644
--- a/build/tasks/ci.js
+++ b/build/tasks/ci.js
@@ -1,4 +1,4 @@
var gulp = require('gulp');
-// gulp.task('ci', ['default', 'coveralls']);
-gulp.task('ci', ['default']);
+gulp.task('ci', ['default', 'coveralls']);
+// gulp.task('ci', ['default']);
|
chore(ci-build-task): changed ci task to try travis
|
diff --git a/tests/test_connection.py b/tests/test_connection.py
index <HASH>..<HASH> 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -21,7 +21,7 @@ class TestSerfConnection(object):
rpc = connection.SerfConnection(port=40000)
with pytest.raises(connection.SerfConnectionError) as exceptionInfo:
rpc.handshake()
- assert 'Error 61 connecting localhost:40000. Connection refused.' \
+ assert 'connecting localhost:40000. Connection refused.' \
in str(exceptionInfo)
def test_connection_to_serf_agent(self):
|
Don't expect that we'll always have the same error number
|
diff --git a/lib/model-api/utils.rb b/lib/model-api/utils.rb
index <HASH>..<HASH> 100644
--- a/lib/model-api/utils.rb
+++ b/lib/model-api/utils.rb
@@ -408,8 +408,9 @@ module ModelApi
metadata = filtered_ext_attrs(klass, opts[:operation] || :index, opts)
model_metadata = opts[:model_metadata] || model_metadata(klass)
includes = []
- if (metadata_includes = model_metadata[:collection_includes]).is_a?(Array)
- includes += metadata_includes.map(&:to_sym)
+ if (metadata_includes = model_metadata[:collection_includes]).present?
+ meta_includes = [meta_includes] unless meta_includes.is_a?(Array)
+ includes += metadata_includes
end
metadata.each do |_attr, attr_metadata|
includes << attr_metadata[:key] if attr_metadata[:type] == :association
|
Allow more flexibility in specifying includes (for ActiveRecord) in collection queries.
|
diff --git a/src/LayoutNode.js b/src/LayoutNode.js
index <HASH>..<HASH> 100644
--- a/src/LayoutNode.js
+++ b/src/LayoutNode.js
@@ -50,11 +50,23 @@ define(function(require, exports, module) {
*/
LayoutNode.prototype.reset = function() {
this._invalidated = false;
- this._spec.transform = undefined;
this.trueSizeRequested = false;
};
/**
+ * Set the spec of the node
+ *
+ * @param {Object} spec
+ */
+ LayoutNode.prototype.setSpec = function(spec) {
+ this._spec.align = spec.align;
+ this._spec.origin = spec.origin;
+ this._spec.size = spec.size;
+ this._spec.transform = spec.transform;
+ this._spec.opacity = spec.opacity;
+ };
+
+ /**
* Set the content of the node
*
* @param {Object} set
@@ -75,6 +87,9 @@ define(function(require, exports, module) {
rotate: set.rotate || [0, 0, 0]
});
}
+ else {
+ this._spec.transform = undefined;
+ }
this.scrollLength = set.scrollLength;
};
|
Added setSpec function for compatibility with FlowLayoutNode
|
diff --git a/lib/flex/utils.rb b/lib/flex/utils.rb
index <HASH>..<HASH> 100644
--- a/lib/flex/utils.rb
+++ b/lib/flex/utils.rb
@@ -45,5 +45,29 @@ module Flex
load File.expand_path('../../tasks/index.rake', __FILE__)
end
+ module Delegation
+
+ extend self
+
+ def delegate(mod, *methods)
+ to = methods.pop[:to]
+
+ file, line = caller.first.split(':', 2)
+ line = line.to_i
+
+ methods.each do |method|
+ mod.module_eval(<<-method, file, line - 2)
+ def #{method}(*args, &block) # def method_name(*args, &block)
+ if #{to} || #{to}.respond_to?(:#{method}) # if client || client.respond_to?(:name)
+ #{to}.__send__(:#{method}, *args, &block) # client.__send__(:name, *args, &block)
+ end # end
+ end # end
+ method
+ end
+
+ end
+
+ end
+
end
end
|
added simple Delegation module (used internally)
|
diff --git a/nats.go b/nats.go
index <HASH>..<HASH> 100644
--- a/nats.go
+++ b/nats.go
@@ -143,6 +143,7 @@ type Conn struct {
pending *bytes.Buffer
fch chan bool
info serverInfo
+ _ uint32 // needed to correctly align the following ssid field on i386 systems
ssid int64
subs map[int64]*Subscription
mch chan *Msg
|
fixed issue #<I> with <I>bit numbers on <I> systems
|
diff --git a/public_html/profiles/social/modules/social_features/social_group/src/Plugin/Block/GroupHeroBlock.php b/public_html/profiles/social/modules/social_features/social_group/src/Plugin/Block/GroupHeroBlock.php
index <HASH>..<HASH> 100644
--- a/public_html/profiles/social/modules/social_features/social_group/src/Plugin/Block/GroupHeroBlock.php
+++ b/public_html/profiles/social/modules/social_features/social_group/src/Plugin/Block/GroupHeroBlock.php
@@ -74,7 +74,7 @@ class GroupHeroBlock extends BlockBase {
$build['#cache']['tags'] = $tags;
$build['#cache'] = array(
- 'max-age' => 0;
+ 'max-age' => 0
);
return $build;
|
DS-<I> - small issue
|
diff --git a/src/api/layers.js b/src/api/layers.js
index <HASH>..<HASH> 100644
--- a/src/api/layers.js
+++ b/src/api/layers.js
@@ -174,7 +174,7 @@
viz.addTooltip(layerView);
}
if(options.legends) {
- viz.addLegends([layerData], (options.mobile_layout || options.force_mobile));
+ viz.addLegends([layerData], ((mobileEnabled && options.mobile_layout) || options.force_mobile));
}
if(options.time_slider && layerView.model.get('type') === 'torque') {
viz.addTimeSlider(layerView);
|
Fixes a bug that prevented showing the legends when using createLayer
|
diff --git a/db/migrate/20140131065836_create_socializer_person_places.rb b/db/migrate/20140131065836_create_socializer_person_places.rb
index <HASH>..<HASH> 100644
--- a/db/migrate/20140131065836_create_socializer_person_places.rb
+++ b/db/migrate/20140131065836_create_socializer_person_places.rb
@@ -4,7 +4,7 @@ class CreateSocializerPersonPlaces < ActiveRecord::Migration[7.0]
def change
create_table :socializer_person_places do |t|
t.references :person, null: false
- t.string :city_name
+ t.string :city_name, null: false
t.boolean :current, default: false
t.timestamps
|
add `NOT NULL` to socializer_person_places.city_name - models validates its presence but it's not non-NULL in the database
|
diff --git a/src/extensions/parseFlex.js b/src/extensions/parseFlex.js
index <HASH>..<HASH> 100644
--- a/src/extensions/parseFlex.js
+++ b/src/extensions/parseFlex.js
@@ -5,7 +5,7 @@ const parseFlexChar = (char) => {
return 'flex: 0 0 auto;';
}
- return `flex: ${char} 0 auto;`
+ return `flex: ${char} 0 0;`
}
export default (flex) => {
|
Fix nested FlexFields support
|
diff --git a/test/setup.rb b/test/setup.rb
index <HASH>..<HASH> 100644
--- a/test/setup.rb
+++ b/test/setup.rb
@@ -1,4 +1,4 @@
$LOAD_PATH.unshift(File.expand_path("#{__FILE__}/../../lib")) # Add PROJECT/lib to $LOAD_PATH
require 'crudtree'
-require '/home/freak/coding/ruby/git-sources/baretest/lib/baretest/rr'
+require 'baretest/mocha'
include CRUDtree
|
rr doesn't work with <I> :-(
|
diff --git a/components/form-ng/form-ng__update-text.js b/components/form-ng/form-ng__update-text.js
index <HASH>..<HASH> 100644
--- a/components/form-ng/form-ng__update-text.js
+++ b/components/form-ng/form-ng__update-text.js
@@ -84,13 +84,7 @@ angular.module('Ring.form')
/**
* Update initial value if field has been changed outside form.input (e.g. new value from rest)
*/
- var viewValue = scope.form.input.$viewValue;
-
- if (typeof viewValue === 'string' && scope.isMultiLine() === 'list') {
- viewValue = viewValue.split(multiLineSplitPattern);
- }
-
- if (angular.isDefined(newValue) && !angular.equals(newValue, viewValue)) {
+ if (angular.isDefined(newValue) && !angular.equals(newValue, scope.form.input.$modelValue)) {
scope.initial = newValue;
scope.form.$setPristine();
} else if (scope.form.$dirty && angular.equals(scope.initial, newValue)) {
|
RG-<I> Save button not appears for multiline fields: proper version
Former-commit-id: e5fb<I>f2c3f<I>ac<I>b1c<I>aa<I>
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2943,7 +2943,8 @@ var CodeMirror = (function() {
function e_target(e) {return e.target || e.srcElement;}
function e_button(e) {
- if (e.which) return e.which;
+ if (mac && e.ctrlKey && e.which === 1) return 3;
+ else if (e.which) return e.which;
else if (e.button & 1) return 1;
else if (e.button & 2) return 3;
else if (e.button & 4) return 2;
|
treat mac+ctrl+click as right-click
|
diff --git a/lib/mongo/monitoring/publishable.rb b/lib/mongo/monitoring/publishable.rb
index <HASH>..<HASH> 100644
--- a/lib/mongo/monitoring/publishable.rb
+++ b/lib/mongo/monitoring/publishable.rb
@@ -33,18 +33,24 @@ module Mongo
#
# @since 2.1.0
def publish_command(messages)
- start = Time.now
- payload = messages.first.payload
- Monitoring.started(Monitoring::COMMAND, command_started(payload))
+ if monitoring?
+ start = Time.now
+ payload = messages.first.payload
+ Monitoring.started(Monitoring::COMMAND, command_started(payload))
+ end
begin
result = yield(messages)
- Monitoring.completed(
- Monitoring::COMMAND,
- command_completed(payload, result ? result.payload : nil, start)
- )
+ if monitoring?
+ Monitoring.completed(
+ Monitoring::COMMAND,
+ command_completed(payload, result ? result.payload : nil, start)
+ )
+ end
result
rescue Exception => e
- Monitoring.failed(Monitoring::COMMAND, command_failed(payload, e, start))
+ if monitoring?
+ Monitoring.failed(Monitoring::COMMAND, command_failed(payload, e, start))
+ end
raise e
end
end
@@ -83,6 +89,10 @@ module Mongo
def duration(start)
Time.now - start
end
+
+ def monitoring?
+ options[:monitor] != false
+ end
end
end
end
|
SPEC-<I>: Monitoring defaults to true, allow user customization
|
diff --git a/anyconfig/api.py b/anyconfig/api.py
index <HASH>..<HASH> 100644
--- a/anyconfig/api.py
+++ b/anyconfig/api.py
@@ -269,7 +269,8 @@ def multi_load(paths, ac_parser=None, ac_template=False, ac_context=None,
cups = single_load(path, ac_parser=ac_parser,
ac_template=ac_template, ac_context=cnf, **opts)
- cnf.update(cups)
+ if cups:
+ cnf.update(cups)
return _maybe_validated(cnf, schema, **options)
|
fix: only update cnf if needed (diff is not empty)
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -45,7 +45,8 @@ module.exports = function(grunt) {
waitsFor: false,
runs: false,
exports: false,
- process: false
+ process: false,
+ setImmediate: false
}
}
},
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -27,7 +27,8 @@
plugin[level].apply(plugin, args);
};
- process.nextTick(compute);
+ // using execution deferral
+ setImmediate(compute);
});
};
|
fix #1 use setImmediate instead of process next tick
|
diff --git a/routes.js b/routes.js
index <HASH>..<HASH> 100644
--- a/routes.js
+++ b/routes.js
@@ -289,7 +289,7 @@ function getSearchQuery(model, searchValue) {
}).join('||');
}
else {
- return searchRule.replace('__value__', valueRegex);
+ return searchRule.replace(/__value__/g, valueRegex);
}
}
|
Support for multiple occurrences of __value__ in search string
|
diff --git a/test/test.js b/test/test.js
index <HASH>..<HASH> 100644
--- a/test/test.js
+++ b/test/test.js
@@ -9,11 +9,11 @@ mockery.enable({ warnOnUnregistered: false })
global.testing = true
// Run tests
-const assets = require('./lib/assets');
-const deploy = require('./lib/deploy');
-const makeappx = require('./lib/makeappx');
-const makepri = require('./lib/makepri');
-const manifest = require('./lib/manifest');
-const sign = require('./lib/sign');
-const zip = require('./lib/zip');
-const utils = require('./lib/utils');
\ No newline at end of file
+require('./lib/assets');
+require('./lib/deploy');
+require('./lib/makeappx');
+require('./lib/makepri');
+require('./lib/manifest');
+require('./lib/sign');
+require('./lib/zip');
+require('./lib/utils');
|
:wrench: Improve test code
|
diff --git a/src/modules/PublicLab.MapModule.js b/src/modules/PublicLab.MapModule.js
index <HASH>..<HASH> 100644
--- a/src/modules/PublicLab.MapModule.js
+++ b/src/modules/PublicLab.MapModule.js
@@ -13,7 +13,7 @@ module.exports = PublicLab.MapModule = PublicLab.Module.extend({
_module.options = options || _editor.options.mapModule || {};
if (_module.options === true) _module.options = {}; // so we don't make options be /true/
_module.options.name = 'map' ;
- _module.options.instructions = 'Add a map to your note. Learn about <a href="https://publiclab.org/location-privacy">location privacy here</a>' ;
+ _module.options.instructions = 'Add a map to your note. Learn about <a href="https://publiclab.org/location-privacy" target="_blank">location privacy here »</a>' ;
_module._super(_editor, _module.options) ;
_module.options.required = false;
|
updated privacy link (#<I>)
|
diff --git a/demos/blog/protected/models/User.php b/demos/blog/protected/models/User.php
index <HASH>..<HASH> 100644
--- a/demos/blog/protected/models/User.php
+++ b/demos/blog/protected/models/User.php
@@ -100,11 +100,12 @@ class User extends CActiveRecord
*
* @param int cost parameter for Blowfish hash algorithm
* @return string the salt
+ * @throws CException if improper cost passed
*/
protected function generateSalt($cost=10)
{
if(!is_numeric($cost)||$cost<4||$cost>31){
- throw new CException(Yii::t('Cost parameter must be between 4 and 31.'));
+ throw new CException('Cost parameter must be between 4 and 31.');
}
// Get some pseudo-random data from mt_rand().
$rand='';
@@ -115,9 +116,9 @@ class User extends CActiveRecord
// Mix the bits cryptographically.
$rand=sha1($rand,true);
// Form the prefix that specifies hash algorithm type and cost parameter.
- $salt='$2a$'.str_pad((int)$cost,2,'0',STR_PAD_RIGHT).'$';
+ $salt='$2a$'.sprintf('%02d',$cost).'$';
// Append the random salt string in the required base64 format.
$salt.=strtr(substr(base64_encode($rand),0,22),array('+'=>'.'));
return $salt;
}
-}
\ No newline at end of file
+}
|
Demo blog, User model enhancements:
1. Added EOL at the end of file.
2. Added @throws tag to the User::generateSalt() method.
3. Removed invalid and unnecessary Yii::t() translation call.
4. Fixes #<I>. `str_pad` replaced with `sprintf`.
|
diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
index <HASH>..<HASH> 100644
--- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
@@ -118,7 +118,15 @@ class PWMOut(object):
self._channel = None
self._pwmpin = None
+ def _is_deinited(self):
+ if self._pwmpin is None:
+ raise ValueError("Object has been deinitialize and can no longer "
+ "be used. Create a new object.")
+
def _write_pin_attr(self, attr, value):
+ # Make sure the pin is active
+ self._is_deinited()
+
path = os.path.join(
self._sysfs_path,
self._channel_path.format(self._channel),
@@ -130,6 +138,9 @@ class PWMOut(object):
f_attr.write(value + "\n")
def _read_pin_attr(self, attr):
+ # Make sure the pin is active
+ self._is_deinited()
+
path = os.path.join(
self._sysfs_path,
self._channel_path.format(self._channel),
|
add '_is_deinited()' to guard against reads/writes on an inactive pin.
|
diff --git a/abydos/stemmer.py b/abydos/stemmer.py
index <HASH>..<HASH> 100644
--- a/abydos/stemmer.py
+++ b/abydos/stemmer.py
@@ -805,9 +805,9 @@ def dutch(word):
return word
# lowercase, normalize, decompose, filter umlauts & acutes out, and compose
- word = unicodedata.normalize('NFKD', _unicode(word.lower()))
- word = ''.join([c for c in word if c not in set('̈́')])
- word = unicodedata.normalize('NFC', word.lower())
+ word = unicodedata.normalize('NFC', _unicode(word.lower()))
+ _accented = dict(zip([ord(_) for _ in 'äëïöüáéíóú'], 'aeiouaeiou'))
+ word = word.translate(_accented)
for i in _range(len(word)):
if i == 0 and word[0] == 'y':
@@ -849,7 +849,7 @@ def dutch(word):
# Step 3a
if word[-4:] == 'heid':
- if len(word[r2_start:]) >= 4 and word[-2] != 'c':
+ if len(word[r2_start:]) >= 4 and word[-5] != 'c':
word = word[:-4]
if word[-2:] == 'en':
if (len(word[r1_start:]) >= 2 and
|
fixed index bug error
switched from removing all umlauts & acute accents to just removing those attached to aeiou
|
diff --git a/src/Plugin/CatalogInventory/Model/Stock/Item.php b/src/Plugin/CatalogInventory/Model/Stock/Item.php
index <HASH>..<HASH> 100644
--- a/src/Plugin/CatalogInventory/Model/Stock/Item.php
+++ b/src/Plugin/CatalogInventory/Model/Stock/Item.php
@@ -22,7 +22,7 @@ class Item
\Magento\CatalogInventory\Model\Stock\Item $subject,
\Closure $proceed
) {
- $result = $subject->get(Cfg::E_CATINV_STOCK_ITEM_A_STOCK_ID);
+ $result = $subject->getData(Cfg::E_CATINV_STOCK_ITEM_A_STOCK_ID);
return $result;
}
}
\ No newline at end of file
|
MOBI-<I> - Send PV info from Odoo to Magento
|
diff --git a/lib/document/Document.js b/lib/document/Document.js
index <HASH>..<HASH> 100644
--- a/lib/document/Document.js
+++ b/lib/document/Document.js
@@ -104,6 +104,14 @@ class Document extends NativeMethod {
return new Record(this, data, _.defaults(options, this.options));
}
/**
+ * find and return single record
+ * @param {id} id
+ * @param {boolean} record
+ */
+ findById(id, record = true) {
+ return this.findOne({ _id: id }).then(res => (record ? this.create(res) : res));
+ }
+ /**
* Return default options for document
* @memberof Document
*/
|
[Document] document: added findById method
|
diff --git a/lib/her/model.rb b/lib/her/model.rb
index <HASH>..<HASH> 100644
--- a/lib/her/model.rb
+++ b/lib/her/model.rb
@@ -40,6 +40,7 @@ module Her
# Supported ActiveModel modules
include ActiveModel::AttributeMethods
include ActiveModel::Validations
+ include ActiveModel::Validations::Callbacks
include ActiveModel::Conversion
include ActiveModel::Dirty
include ActiveModel::Naming
|
Adding Active model before and after validation
We have method valid? which is requested from ActiveModel
and don't have any callback to update values before it
|
diff --git a/tweepy/api.py b/tweepy/api.py
index <HASH>..<HASH> 100644
--- a/tweepy/api.py
+++ b/tweepy/api.py
@@ -219,7 +219,14 @@ class API(object):
:allowed_param:
"""
f = kwargs.pop('file', None)
- headers, post_data = API._pack_image(filename, 4883,
+
+ file_type = imghdr.what(filename)
+ if file_type == 'gif':
+ max_size = 15360
+ else:
+ max_size = 4883
+
+ headers, post_data = API._pack_image(filename, max_size,
form_field='media', f=f)
kwargs.update({'headers': headers, 'post_data': post_data})
|
increase max image size for gif
|
diff --git a/vent/api/menu_helpers.py b/vent/api/menu_helpers.py
index <HASH>..<HASH> 100644
--- a/vent/api/menu_helpers.py
+++ b/vent/api/menu_helpers.py
@@ -98,8 +98,10 @@ class MenuHelper:
output = check_output(shlex.split(cmd),
stderr=STDOUT)
- image_attrs = d_client.images.get(image_name).attrs
- image_id = image_attrs['Id'].split(':')[1][:12]
+ image_attrs = d_client.images.get(
+ image_name).attrs
+ image_id = image_attrs['Id'].split(':')
+ image_id = image_id[1][:12]
if image_id:
plugin_c.set_option(section,
|
changed line lengths to satisify codeclimate
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ here = path.abspath(path.dirname(__file__))
setup(
name='vcf2clinvar',
- version='0.1.dev2',
+ version='0.1.dev3',
description='Match a personal genome VCF datafile to ClinVar',
url='https://github.com/PersonalGenomesOrg/vcf2clinvar',
author='Personal Genome Project Informatics Group',
diff --git a/vcf2clinvar/__init__.py b/vcf2clinvar/__init__.py
index <HASH>..<HASH> 100755
--- a/vcf2clinvar/__init__.py
+++ b/vcf2clinvar/__init__.py
@@ -17,7 +17,10 @@ from .genome import GenomeVCFLine
def _next_line(filebuffer):
- next_line = filebuffer.readline()
+ try:
+ next_line = filebuffer.readline()
+ except AttributeError:
+ next_line = filebuffer.next()
try:
next_line = next_line.decode('utf-8')
return next_line
|
Fall back to "next" if no "readline"
|
diff --git a/lib/puppet/pops/parser/pn_parser.rb b/lib/puppet/pops/parser/pn_parser.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/pops/parser/pn_parser.rb
+++ b/lib/puppet/pops/parser/pn_parser.rb
@@ -164,7 +164,7 @@ class PNParser
end
when TYPE_DIGIT
- dc = skip_decimal_digits
+ skip_decimal_digits
c = peek_cp
if c == 0x2e # '.'
@pos += 1
|
(PUP-<I>) Remove unused variable causing rubocop failure
|
diff --git a/packages/ember-routing-handlebars/lib/helpers/query_params.js b/packages/ember-routing-handlebars/lib/helpers/query_params.js
index <HASH>..<HASH> 100644
--- a/packages/ember-routing-handlebars/lib/helpers/query_params.js
+++ b/packages/ember-routing-handlebars/lib/helpers/query_params.js
@@ -13,7 +13,7 @@ import QueryParams from "ember-routing/system/query_params";
Example
- {#link-to 'posts' (query-params direction="asc")}}Sort{{/link-to}}
+ {{#link-to 'posts' (query-params direction="asc")}}Sort{{/link-to}}
@method query-params
@for Ember.Handlebars.helpers
@@ -36,4 +36,4 @@ export function queryParamsHelper(options) {
return QueryParams.create({
values: options.hash
});
-}
\ No newline at end of file
+}
|
[DOC release] Fix invalid Handlebars syntax in query-params docs.
|
diff --git a/lib/beaker-aws/version.rb b/lib/beaker-aws/version.rb
index <HASH>..<HASH> 100644
--- a/lib/beaker-aws/version.rb
+++ b/lib/beaker-aws/version.rb
@@ -1,3 +1,3 @@
module BeakerAws
- VERSION = '0.2.0'
+ VERSION = '0.3.0'
end
|
(GEM) update beaker-aws version to <I>
|
diff --git a/app/controllers/socializer/likes_controller.rb b/app/controllers/socializer/likes_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/socializer/likes_controller.rb
+++ b/app/controllers/socializer/likes_controller.rb
@@ -1,6 +1,7 @@
module Socializer
class LikesController < ApplicationController
- before_action :set_likable, only: [:create, :destroy]
+ before_action :set_likable, only: [:create, :destroy]
+ before_action :set_activity, only: [:create, :destroy]
# REFACTOR: should handle activity/tooltip as well as people likes
# Used to display the Like tooltip
@@ -19,7 +20,6 @@ module Socializer
def create
@likable.like!(current_user) unless current_user.likes?(@likable)
- @activity = @likable.activitable
respond_to do |format|
format.js
@@ -28,7 +28,6 @@ module Socializer
def destroy
@likable.unlike!(current_user) if current_user.likes?(@likable)
- @activity = @likable.activitable
respond_to do |format|
format.js
@@ -42,6 +41,10 @@ module Socializer
@likable = ActivityObject.find(params[:id])
end
+ def set_activity
+ @activity = @likable.activitable
+ end
+
# # Never trust parameters from the scary internet, only allow the white list through.
# def like_params
# params.require(:like).permit(:actor_id, :activity_object_id)
|
dry @activity for likes_controller
|
diff --git a/src/Serializer/JmsSerializer.php b/src/Serializer/JmsSerializer.php
index <HASH>..<HASH> 100644
--- a/src/Serializer/JmsSerializer.php
+++ b/src/Serializer/JmsSerializer.php
@@ -134,7 +134,14 @@ class JmsSerializer implements SerializerInterface
);
}
- private function getSourceClassFromMapping($params)
+ /**
+ * gets the source class.
+ *
+ * @param array $params
+ * @return mixed
+ * @author Daniel Wendlandt
+ */
+ private function getSourceClassFromMapping(array $params)
{
$index = $params['index'];
$type = $params['type'];
|
typehint in class and added docblock
|
diff --git a/example/image-classification/train_model.py b/example/image-classification/train_model.py
index <HASH>..<HASH> 100644
--- a/example/image-classification/train_model.py
+++ b/example/image-classification/train_model.py
@@ -26,7 +26,7 @@ def fit(args, network, data_loader):
logging.basicConfig(level=logging.DEBUG, format=head)
logging.info('start with arguments %s', args)
- # load model?
+ # load model
model_prefix = args.model_prefix
if model_prefix is not None:
model_prefix += "-%d" % (kv.rank)
@@ -37,7 +37,7 @@ def fit(args, network, data_loader):
model_args = {'arg_params' : tmp.arg_params,
'aux_params' : tmp.aux_params,
'begin_epoch' : args.load_epoch}
- # save model?
+ # save model
checkpoint = None if model_prefix is None else mx.callback.do_checkpoint(model_prefix)
# data
|
del "?" from comment
"?" should not exist in comment
|
diff --git a/create_app.py b/create_app.py
index <HASH>..<HASH> 100644
--- a/create_app.py
+++ b/create_app.py
@@ -252,9 +252,6 @@ for line in fileinput.input(boot_file, inplace=True):
else:
print(line, end='')
-# To use the app's own Qt framework
-subprocess.call(['macdeployqt', 'dist/%s' % MAC_APP_NAME])
-
# Workaround for what appears to be a bug with py2app and Homebrew
# See https://bitbucket.org/ronaldoussoren/py2app/issue/26#comment-2092445
PF_dir = get_config_var('PYTHONFRAMEWORKINSTALLDIR')
|
Mac app: Don't call macdeployqt because we switched to use PyQt5 wheels
|
diff --git a/lib/active_admin/orm/active_record/comments.rb b/lib/active_admin/orm/active_record/comments.rb
index <HASH>..<HASH> 100644
--- a/lib/active_admin/orm/active_record/comments.rb
+++ b/lib/active_admin/orm/active_record/comments.rb
@@ -11,14 +11,10 @@ ActiveAdmin::Application.inheritable_setting :comments_registration_name, 'Comme
# Insert helper modules
ActiveAdmin::Namespace.send :include, ActiveAdmin::Comments::NamespaceHelper
ActiveAdmin::Resource.send :include, ActiveAdmin::Comments::ResourceHelper
-
-# Add the module to the show page
ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comments::ShowPageHelper
# Load the model as soon as it's referenced. By that point, Rails & Kaminari will be ready
-module ActiveAdmin
- autoload :Comment, 'active_admin/orm/active_record/comments/comment'
-end
+ActiveAdmin.autoload :Comment, 'active_admin/orm/active_record/comments/comment'
# Walk through all the loaded namespaces after they're loaded
ActiveAdmin.after_load do |app|
|
code style updates to AA::Comment
|
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index <HASH>..<HASH> 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -168,7 +168,7 @@ $string['forgotten'] = "Forgotten your username or password?";
$string['format'] = "Format";
$string['formathtml'] = "HTML format";
$string['formatsocial'] = "Social format";
-$string['formattext'] = "Moodle text format";
+$string['formattext'] = "Moodle auto-format";
$string['formattexttype'] = "Formatting";
$string['formattopics'] = "Topics format";
$string['formatweeks'] = "Weekly format";
|
Revised string for formattext to make more sense
|
diff --git a/test/integration/login_test.js b/test/integration/login_test.js
index <HASH>..<HASH> 100644
--- a/test/integration/login_test.js
+++ b/test/integration/login_test.js
@@ -149,6 +149,7 @@ suite('integration - existing user flow', function(){
assert.isNull(err)
})
})
+ /*
.waitForElementByCssSelector('.btn-success', 5000, function(err, el){
// Start a test
assert.isNull(err, "error selecting success button")
@@ -168,6 +169,10 @@ suite('integration - existing user flow', function(){
assert.include(url, "strider-test-robot/strider-extension-loader")
done()
})
+ */
+ .url(function(err, url){
+ done()
+ })
})
/*
|
disable broken integration tests (TODO: PB)
|
diff --git a/cassandra/query.py b/cassandra/query.py
index <HASH>..<HASH> 100644
--- a/cassandra/query.py
+++ b/cassandra/query.py
@@ -507,7 +507,8 @@ class BoundStatement(Statement):
components = []
for statement_index in routing_indexes:
val = self.values[statement_index]
- components.append(struct.pack("HsB", len(val), val, 0))
+ l = len(val)
+ components.append(struct.pack(">H%dsB" % l, l, val, 0))
self._routing_key = b"".join(components)
|
Fix routing key encoding for compound primary keys
- make component size big-endian
- include component string size in format string
|
diff --git a/src/Provider/FileSession.php b/src/Provider/FileSession.php
index <HASH>..<HASH> 100644
--- a/src/Provider/FileSession.php
+++ b/src/Provider/FileSession.php
@@ -25,7 +25,9 @@ class FileSession implements SessionInterface
public function __destruct()
{
- file_put_contents($this->file, '<?php return ' . var_export($this->dataSet, true) . ';');
+ if (count($this->dataSet) > 0) {
+ file_put_contents($this->file, '<?php return ' . var_export($this->dataSet, true) . ';');
+ }
}
/**
|
fileSession write if datas are exists
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.