hash
stringlengths
40
40
diff
stringlengths
131
26.7k
message
stringlengths
7
694
project
stringlengths
5
67
split
stringclasses
1 value
diff_languages
stringlengths
2
24
d300256ca4dd8b6f921afe8ef2de05d7e9c084e7
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index <HASH>..<HASH> 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -86,6 +86,7 @@ module ActiveRecord::Associations::Builder # Post.first.comments and Post.first.comments= methods are defined by this method... def define_accessors(model, reflection) mixin = model.generated_feature_methods + name = reflection.name self.class.define_readers(mixin, name) self.class.define_writers(mixin, name) end diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb index <HASH>..<HASH> 100644 --- a/activerecord/lib/active_record/associations/builder/singular_association.rb +++ b/activerecord/lib/active_record/associations/builder/singular_association.rb @@ -8,7 +8,7 @@ module ActiveRecord::Associations::Builder def define_accessors(model, reflection) super - self.class.define_constructors(model.generated_feature_methods, name) if reflection.constructable? + self.class.define_constructors(model.generated_feature_methods, reflection.name) if reflection.constructable? end # Defines the (build|create)_association methods for belongs_to or has_one association
Use the reflection name instead of the accessor
rails_rails
train
rb,rb
c62ced7ca7a6cf715f62bd10981560a809c723dd
diff --git a/rows.go b/rows.go index <HASH>..<HASH> 100644 --- a/rows.go +++ b/rows.go @@ -271,7 +271,7 @@ func (f *File) getRowHeight(sheet string, row int) int { ws, _ := f.workSheetReader(sheet) for i := range ws.SheetData.Row { v := &ws.SheetData.Row[i] - if v.R == row+1 && v.Ht != 0 { + if v.R == row && v.Ht != 0 { return int(convertRowHeightToPixels(v.Ht)) } }
fix getRowHeight actually get the height of the next row (#<I>)
360EntSecGroup-Skylar_excelize
train
go
b01ed4be54aebafe38c78382d348977087978900
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,10 @@ setup( keywords='crypto pki', - install_requires=['asn1crypto', 'oscrypto'], + install_requires=[ + 'asn1crypto>=0.13', + 'oscrypto>=0.12' + ], packages=find_packages(exclude=['tests*', 'dev*']), cmdclass={
Minimum asn1crypto and oscrypto versions
wbond_csrbuilder
train
py
a631115c9980a8ebf40e571e8ad11599090a1f05
diff --git a/src/HAB/Pica/Record/Field.php b/src/HAB/Pica/Record/Field.php index <HASH>..<HASH> 100644 --- a/src/HAB/Pica/Record/Field.php +++ b/src/HAB/Pica/Record/Field.php @@ -133,6 +133,13 @@ class Field protected $_shorthand; /** + * Subfields. + * + * @var array + */ + protected $_subfields; + + /** * Constructor. * * @throws InvalidArgumentException Invalid field tag or occurrence
Declare $_subfields property * src/HAB/Pica/Record/Field.php: Declare $_subfields property. ...after all this years... ;)
dmj_PicaRecord
train
php
b210437ed1fccdb7d527ff6227b8d52dd7481fb7
diff --git a/src/Cartalyst/AsseticFilters/UriRewriteFilter.php b/src/Cartalyst/AsseticFilters/UriRewriteFilter.php index <HASH>..<HASH> 100644 --- a/src/Cartalyst/AsseticFilters/UriRewriteFilter.php +++ b/src/Cartalyst/AsseticFilters/UriRewriteFilter.php @@ -264,7 +264,7 @@ class UriRewriteFilter implements FilterInterface { } } - $base = $_SERVER['REQUEST_URI']; + $base = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null; if ($request->getHost()) {
check for REQUEST_URI before assigning it prevents exceptions from being thrown if executed through cli
cartalyst_assetic-filters
train
php
e0ceeee6a1c8543bd840b93abf9177025e3cec44
diff --git a/cts/analytics/ab_testing_test.go b/cts/analytics/ab_testing_test.go index <HASH>..<HASH> 100644 --- a/cts/analytics/ab_testing_test.go +++ b/cts/analytics/ab_testing_test.go @@ -7,6 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/algolia/algoliasearch-client-go/v3/algolia/analytics" + "github.com/algolia/algoliasearch-client-go/v3/algolia/opt" "github.com/algolia/algoliasearch-client-go/v3/algolia/wait" "github.com/algolia/algoliasearch-client-go/v3/cts" ) @@ -66,7 +67,7 @@ func TestABTesting(t *testing.T) { { found := false - res, err := analyticsClient.GetABTests() + res, err := analyticsClient.GetABTests(opt.Limit(100)) require.NoError(t, err) for _, b := range res.ABTests { if b.ABTestID == abTestID {
test: prevent flakiness for TestABTesting test
algolia_algoliasearch-client-go
train
go
38fb98594b9da616639a9bed68700f24bca93e70
diff --git a/lib/deep_cover/cli/exec.rb b/lib/deep_cover/cli/exec.rb index <HASH>..<HASH> 100755 --- a/lib/deep_cover/cli/exec.rb +++ b/lib/deep_cover/cli/exec.rb @@ -24,7 +24,7 @@ module DeepCover require 'yaml' env_var = {'DEEP_COVER' => 't', - 'DEEP_COVER_OPTIONS' => YAML.dump(processed_options.slice(*DEFAULTS.keys)), + 'DEEP_COVER_OPTIONS' => YAML.dump(processed_options.transform_keys(&:to_sym).slice(*DEFAULTS.keys)), } # Clear inspiration from Bundler's kernel_exec
Fix exec in <I>, looks like backport was helping us more than Ruby<I>
deep-cover_deep-cover
train
rb
0c78598eebe638baecfdd3d1924bf339df6f3a37
diff --git a/lib/active_scaffold/config/core.rb b/lib/active_scaffold/config/core.rb index <HASH>..<HASH> 100644 --- a/lib/active_scaffold/config/core.rb +++ b/lib/active_scaffold/config/core.rb @@ -354,12 +354,20 @@ module ActiveScaffold::Config end def [](name) + return nil unless @global_columns[name] @columns[name.to_sym] ||= CowProxy.wrap @global_columns[name] end - def method_missing(name, *args) + def each + return enum_for(:each) unless block_given? + @global_columns.each do |col| + yield self[col.name] + end + end + + def method_missing(name, *args, &block) if @global_columns.respond_to?(name, true) - @global_columns.send(name, *args) + @global_columns.send(name, *args, &block) else super end
fix iterating on config.user.columns, needs to wrap column in case column is changed
activescaffold_active_scaffold
train
rb
a1112d7a76e6e500acae8f4113e1d61ed2572384
diff --git a/lib/capybara/driver/rack_test_driver.rb b/lib/capybara/driver/rack_test_driver.rb index <HASH>..<HASH> 100644 --- a/lib/capybara/driver/rack_test_driver.rb +++ b/lib/capybara/driver/rack_test_driver.rb @@ -1,4 +1,5 @@ require 'rack/test' +require 'rack/utils' require 'mime/types' require 'nokogiri' require 'cgi' @@ -163,16 +164,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base end def merge_param!(params, key, value) - collection = key.sub!(/\[\]$/, '') - if collection - if params[key] - params[key] << value - else - params[key] = [value] - end - else - params[key] = value - end + Rack::Utils.normalize_params(params, key, value) end end
Teach rack test driver to work with comlex field names such as user[pictures][][path]. See <URL>
teamcapybara_capybara
train
rb
03c57fef4ba969c1e50aa27081027ebfe4d1a73c
diff --git a/tests/integration/components/sl-alert-test.js b/tests/integration/components/sl-alert-test.js index <HASH>..<HASH> 100644 --- a/tests/integration/components/sl-alert-test.js +++ b/tests/integration/components/sl-alert-test.js @@ -119,9 +119,9 @@ test( 'Dismiss Action is called on button click', function( assert ) { {{/sl-alert}} ` ); - const $button = this.$( '>:first-child' ).find( 'button' ); + const button = this.$( '>:first-child' ).find( 'button' ); this.on( 'dismissAction', dismissAction ); - $button.click(); + button.click(); }); test( 'Dismiss Action is not possible when dismissable is false', function( assert ) {
Closes softlayer/sl-ember-components#<I>
softlayer_sl-ember-components
train
js
0df45c5c4cc5909b898502d78e1e7fda5766fa69
diff --git a/okhttp/src/main/java/com/squareup/okhttp/CertificatePinner.java b/okhttp/src/main/java/com/squareup/okhttp/CertificatePinner.java index <HASH>..<HASH> 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/CertificatePinner.java +++ b/okhttp/src/main/java/com/squareup/okhttp/CertificatePinner.java @@ -100,6 +100,13 @@ import static java.util.Collections.unmodifiableList; * complexity and limit your ability to migrate between certificate authorities. * Do not use certificate pinning without the blessing of your server's TLS * administrator! + * + * <h4>Note about self-signed certificates</h4> + * {@link CertificatePinner} can not be used to pin self-signed certificate + * if such certificate is not accepted by {@link javax.net.ssl.TrustManager}. + * + * @see <a href="https://www.owasp.org/index.php/Certificate_and_Public_Key_Pinning"> + * OWASP: Certificate and Public Key Pinning</a> */ public final class CertificatePinner { public static final CertificatePinner DEFAULT = new Builder().build();
Add Javadoc about self-signed certificates
square_okhttp
train
java
cc510cecd5bb31bb12ef09103b69d02b49a6ab25
diff --git a/tacl/results.py b/tacl/results.py index <HASH>..<HASH> 100644 --- a/tacl/results.py +++ b/tacl/results.py @@ -162,7 +162,6 @@ class Results: [constants.LABEL_COUNT_FIELDNAME, DELETE_FIELDNAME] self._matches = pd.concat(new_results, ignore_index=True).reindex( columns=all_cols) - self._matches del self._matches[DELETE_FIELDNAME] def collapse_witnesses(self):
Removed stray useless line.
ajenhl_tacl
train
py
42e9b37c22fa00a6173c218999eba9d52726db6d
diff --git a/src/phpGPX/Serializers/TrackXmlSerializer.php b/src/phpGPX/Serializers/TrackXmlSerializer.php index <HASH>..<HASH> 100644 --- a/src/phpGPX/Serializers/TrackXmlSerializer.php +++ b/src/phpGPX/Serializers/TrackXmlSerializer.php @@ -25,6 +25,12 @@ abstract class TrackXmlSerializer $srcNode = $domDocument->createElement("src", $collection->source); $element->appendChild($srcNode); } + + if (!empty($collection->name)) + { + $srcNode = $domDocument->createElement("name", $collection->name); + $element->appendChild($srcNode); + } if (!empty($collection->url)) { @@ -151,4 +157,4 @@ abstract class TrackXmlSerializer return $TrackPointExtensionNode->hasChildNodes() ? $element : null; } -} \ No newline at end of file +}
Add collection name to XML saved track
Sibyx_phpGPX
train
php
fc7b839fd85e953d9634b41a50834f7a993e8d4f
diff --git a/sh.py b/sh.py index <HASH>..<HASH> 100644 --- a/sh.py +++ b/sh.py @@ -498,6 +498,16 @@ class RunningCommand(object): finishes, RunningCommand is smart enough to translate exit codes to exceptions. """ + # these are attributes that we allow to passthrough to OProc for + _OProc_attr_whitelist = set(( + "signal", + "terminate", + "kill", + "pid", + "sid", + "pgid", + )) + def __init__(self, cmd, call_args, stdin, stdout, stderr): """ cmd is an array, where each element is encoded as bytes (PY3) or str @@ -649,18 +659,6 @@ class RunningCommand(object): self.wait() return self.process.exit_code - @property - def pid(self): - return self.process.pid - - @property - def sid(self): - return self.process.sid - - @property - def pgid(self): - return self.process.pgid - def __len__(self): return len(str(self)) @@ -736,7 +734,7 @@ class RunningCommand(object): def __getattr__(self, p): # let these three attributes pass through to the OProc object - if p in ("signal", "terminate", "kill"): + if p in self._OProc_attr_whitelist: if self.process: return getattr(self.process, p) else:
refactor out OProc passthrough whitelist
amoffat_sh
train
py
df2566e3905bbddc0987e099f790d2767fb1ea1a
diff --git a/src/index.js b/src/index.js index <HASH>..<HASH> 100644 --- a/src/index.js +++ b/src/index.js @@ -916,8 +916,9 @@ if (shadowDomV1) { Object.keys(members).forEach(memberName => { const memberProperty = members[memberName]; - // All properties should be configurable. + // All properties should be configurable and enumerable. memberProperty.configurable = true; + memberProperty.enumerable = true; // Applying to the data properties only since we can't have writable accessor properties. if (memberProperty.hasOwnProperty('value')) { // eslint-disable-line no-prototype-builtins
fix(enumeration): make all added member properties enumerable
skatejs_named-slots
train
js
0d9adcdfdca94daa589faf10af1f123cb7d7e5b8
diff --git a/docker/models/images.py b/docker/models/images.py index <HASH>..<HASH> 100644 --- a/docker/models/images.py +++ b/docker/models/images.py @@ -140,6 +140,7 @@ class ImageCollection(Collection): ``"0-3"``, ``"0,1"`` decode (bool): If set to ``True``, the returned stream will be decoded into dicts on the fly. Default ``False``. + cachefrom (list): A list of images used for build cache resolution. Returns: (:py:class:`Image`): The built image.
Add cachefrom to build docstring
docker_docker-py
train
py
699c70b351e4755a0d63fc7bc743f678941a4f0f
diff --git a/lib/fog/rackspace/requests/queues/get_queue.rb b/lib/fog/rackspace/requests/queues/get_queue.rb index <HASH>..<HASH> 100644 --- a/lib/fog/rackspace/requests/queues/get_queue.rb +++ b/lib/fog/rackspace/requests/queues/get_queue.rb @@ -1,8 +1,8 @@ module Fog module Rackspace class Queues - class Real + class Real # This operation verifies whether the specified queue exists. # # @param [String] queue_name Specifies the name of the queue. @@ -20,6 +20,19 @@ module Fog ) end end + + class Mock + def get_queue(queue_name) + if data[queue_name].nil? + raise NotFound.new + else + response = Excon::Response.new + response.status = 204 + response + end + end + end + end end end
Mock the get_queue call.
fog_fog
train
rb
ada6b14dc101f7861848636c344df62ab6c5b594
diff --git a/src/plugins/Transloadit/index.js b/src/plugins/Transloadit/index.js index <HASH>..<HASH> 100644 --- a/src/plugins/Transloadit/index.js +++ b/src/plugins/Transloadit/index.js @@ -156,7 +156,9 @@ module.exports = class Transloadit extends Plugin { const tus = Object.assign({}, file.tus, { endpoint: assembly.tus_url, // Only send assembly metadata to the tus endpoint. - metaFields: Object.keys(tlMeta) + metaFields: Object.keys(tlMeta), + // Make sure tus doesn't resume a previous upload. + uploadUrl: null }) const transloadit = { assembly: assembly.assembly_id diff --git a/src/plugins/Tus10.js b/src/plugins/Tus10.js index <HASH>..<HASH> 100644 --- a/src/plugins/Tus10.js +++ b/src/plugins/Tus10.js @@ -125,14 +125,6 @@ module.exports = class Tus10 extends Plugin { isPaused ? upload.abort() : upload.start() }) - this.onRetry(file.id, () => { - this.removeUploadURL(file.id) - }) - - this.onRetryAll(file.id, () => { - this.removeUploadURL(file.id) - }) - this.onPauseAll(file.id, () => { upload.abort() })
Reuse upload URL by default for tus, reset it for each new :tl: assembly.
transloadit_uppy
train
js,js
7fc9cc1f519e5b2342c3ce00d98e53ed32b33011
diff --git a/src/DiDom/StyleAttribute.php b/src/DiDom/StyleAttribute.php index <HASH>..<HASH> 100644 --- a/src/DiDom/StyleAttribute.php +++ b/src/DiDom/StyleAttribute.php @@ -73,7 +73,7 @@ class StyleAttribute $properties = explode(';', $styleString); foreach ($properties as $property) { - list($name, $value) = explode(':', $property); + list($name, $value) = explode(':', $property, 2); $name = trim($name); $value = trim($value); diff --git a/tests/StyleAttributeTest.php b/tests/StyleAttributeTest.php index <HASH>..<HASH> 100644 --- a/tests/StyleAttributeTest.php +++ b/tests/StyleAttributeTest.php @@ -171,9 +171,9 @@ class StyleAttributeTest extends TestCase '16px', ], [ - 'color: blue; font-size: 16px; border: 1px solid black;', - 'font-size', - '16px', + 'background-image: url(https://example.com/image.jpg); background-repeat: no-repeat', + 'background-image', + 'url(https://example.com/image.jpg)', ], [ 'color: blue; font-size: 16px; border: 1px solid black;',
Fix parsing of a style property in "style" attribute when the value contains a colon
Imangazaliev_DiDOM
train
php,php
ba820ad62f700a392be802409f159703e2a60c50
diff --git a/src/webpack/presets/index.spec.js b/src/webpack/presets/index.spec.js index <HASH>..<HASH> 100644 --- a/src/webpack/presets/index.spec.js +++ b/src/webpack/presets/index.spec.js @@ -49,7 +49,7 @@ describe('configure', function () { module: { loaders: [ { - test: /\.jsx?$/, + test: /\.(jsx?|es6)$/, loader: 'babel' } ]
Fix unit test broken after new Babel extension
saguijs_sagui
train
js
c3a815dd37d98273d79184abdb72078045867d43
diff --git a/config/routes.rb b/config/routes.rb index <HASH>..<HASH> 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,3 @@ Roboto::Engine.routes.draw do - get '/' => 'Robots#show' + get '/' => 'robots#show' end -
make routes compatible with Rails <I>
LaunchAcademy_roboto
train
rb
4eff058d5a80da3b2b15349f1f16064cb8189eba
diff --git a/lib/editor/htmlarea/coursefiles.php b/lib/editor/htmlarea/coursefiles.php index <HASH>..<HASH> 100644 --- a/lib/editor/htmlarea/coursefiles.php +++ b/lib/editor/htmlarea/coursefiles.php @@ -22,6 +22,7 @@ $oldname = optional_param('oldname', '', PARAM_FILE); $usecheckboxes = optional_param('usecheckboxes', 1, PARAM_INT); $save = optional_param('save', 0, PARAM_BOOL); + $text = optional_param('text', '', PARAM_RAW); $confirm = optional_param('confirm', 0, PARAM_BOOL); @@ -393,7 +394,7 @@ case "edit": html_header($course, $wdir); - if (isset($text) and confirm_sesskey()) { + if (($text != '') and confirm_sesskey()) { $fileptr = fopen($basedir.$file,"w"); fputs($fileptr, stripslashes($text)); fclose($fileptr);
fixed register globals issue with $text; merged from MOODLE_<I>_STABLE
moodle_moodle
train
php
af6ec93228ae9a28bae79a77e588525e3ce7d064
diff --git a/ebooklib/epub.py b/ebooklib/epub.py index <HASH>..<HASH> 100644 --- a/ebooklib/epub.py +++ b/ebooklib/epub.py @@ -1579,7 +1579,10 @@ class EpubReader(object): nav_node = html_node.xpath("//nav[@*='toc']")[0] else: # parsing the list of pages - nav_node = html_node.xpath("//nav[@*='page-list']")[0] + _page_list = html_node.xpath("//nav[@*='page-list']") + if len(_page_list) == 0: + return + nav_node = _page_list[0] def parse_list(list_node): items = []
Fixed #<I> - Parsing files fails because of page-list
aerkalov_ebooklib
train
py
da9258de7d96fb8142882bdfeb5fcede93fb0387
diff --git a/invocations/console.py b/invocations/console.py index <HASH>..<HASH> 100644 --- a/invocations/console.py +++ b/invocations/console.py @@ -10,7 +10,7 @@ from invoke.vendor.six.moves import input # NOTE: originally cribbed from fab 1's contrib.console.confirm -def confirm(question, affirmative=True): +def confirm(question, assume_yes=True): """ Ask user a yes/no question and return their response as a boolean. @@ -27,14 +27,14 @@ def confirm(question, affirmative=True): to "y", "yes", "n" or "no", they will be re-prompted until they do. :param unicode question: The question part of the prompt. - :param bool affirmative: + :param bool assume_yes: Whether to assume the affirmative answer by default. Default value: ``True``. :returns: A `bool`. """ # Set up suffix - if affirmative: + if assume_yes: suffix = "Y/n" else: suffix = "y/N" @@ -47,7 +47,7 @@ def confirm(question, affirmative=True): response = response.lower().strip() # Normalize # Default if not response: - return affirmative + return assume_yes # Yes if response in ['y', 'yes']: return True
Rename a kwarg...it wasn't intuitive after leaving it for weeks
pyinvoke_invocations
train
py
8de7adf5819be44d538ae9f1297ff7f604925fea
diff --git a/restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java b/restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java index <HASH>..<HASH> 100644 --- a/restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java +++ b/restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java @@ -52,10 +52,12 @@ public class Ping { private Timer subsequentTimer; private boolean subsequentTimerIsSet = false; private PingTask ping; + private final String provider; Ping(Configuration configuration, ServletContext context){ this.configuration = configuration; this.context = context; + this.provider = configuration.getString("phone-number-provisioning[@class]"); } public void sendPing(){ @@ -91,6 +93,7 @@ public class Ping { buffer.append("<requesttype>").append("ping").append("</requesttype>"); buffer.append("<item>"); buffer.append("<endpointgroup>").append(endpoint).append("</endpointgroup>"); + buffer.append("<provider>").append(provider).append("</provider>"); buffer.append("</item>"); buffer.append("</body>"); buffer.append("</request>");
RESTCOMM-<I> #Resolve-Issue Fixed
RestComm_Restcomm-Connect
train
java
8a30f6cb10033cdd37d970273b0e953fbc55cd09
diff --git a/org/xbill/DNS/BitString.java b/org/xbill/DNS/BitString.java index <HASH>..<HASH> 100644 --- a/org/xbill/DNS/BitString.java +++ b/org/xbill/DNS/BitString.java @@ -130,10 +130,6 @@ BitString(String s) throws IOException { data = new byte[bytes()]; for (int i = 0; i < nbits; i++) data[i/8] |= ((set.get(i) ? 1 : 0) << (7 - i%8)); - for (int i = nbits; i < (((nbits + 7) >>> 3) << 3); i++) { - if (set.get(i)) - throw new IOException("Invalid binary label: " + s); - } } BitString(int _nbits, byte [] _data) {
Some invalid bitstring labels were being accepted. git-svn-id: <URL>
dnsjava_dnsjava
train
java
2a184d4350625df1371304749ba21d9932e36b07
diff --git a/src/Card/Card.js b/src/Card/Card.js index <HASH>..<HASH> 100644 --- a/src/Card/Card.js +++ b/src/Card/Card.js @@ -13,6 +13,10 @@ class Card extends Component { */ children: PropTypes.node, /** + * Override the inline-styles of the container element. + */ + containerStyle: PropTypes.object, + /** * If true, this card component is expandable. Can be set on any child of the `Card` component. */ expandable: PropTypes.bool, @@ -111,16 +115,20 @@ class Card extends Component { lastElement.type.muiName === 'CardTitle')); const { style, + containerStyle, ...other, } = this.props; const mergedStyles = Object.assign({ zIndex: 1, }, style); + const containerMergedStyles = Object.assign({ + paddingBottom: addBottomPadding ? 8 : 0, + }, containerStyle); return ( <Paper {...other} style={mergedStyles}> - <div style={{paddingBottom: addBottomPadding ? 8 : 0}}> + <div style={containerMergedStyles}> {newChildren} </div> </Paper>
[Card] add containerStyle prop add containerStyle prop to have the ability to customize inner div styles. i needed this to give the div width of <I>% then i can align the header to center and the body to left. Update Card.js Update Card.js Update Card.js rename childrenStyle to containerStyle Update Card.js [Card] add containerStyle prop
mui-org_material-ui
train
js
064a2aa401efcdb8500a7484e3031d8b4d43863e
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -2,13 +2,13 @@ from setuptools import setup setup( name = 'dharma', - packages = ['dharma'], - version = '1.0', + packages = ['dharma', 'dharma.core'], + version = '1.1', description = 'A generation-based, context-free grammar fuzzer.', author = 'Mozilla Security', author_email = 'fuzzing@mozilla.com', url = 'https://github.com/mozillasecurity/dharma', - download_url = 'https://github.com/mozillasecurity/dharma/tarball/1.0', + download_url = 'https://github.com/mozillasecurity/dharma/tarball/1.1', keywords = ['fuzzer', 'security', 'fuzzing', 'testing'], classifiers = [ # https://pypi.python.org/pypi?%3Aaction=list_classifiers 'Intended Audience :: Developers',
Changed setup.py to work with the <I> version
MozillaSecurity_dharma
train
py
eb0ffae08223e170e7945e04e160ebbaa922a48a
diff --git a/migrations/create_bouncer_tables.php b/migrations/create_bouncer_tables.php index <HASH>..<HASH> 100644 --- a/migrations/create_bouncer_tables.php +++ b/migrations/create_bouncer_tables.php @@ -41,6 +41,7 @@ class CreateBouncerTables extends Migration Schema::create(Models::table('permissions'), function (Blueprint $table) { $table->integer('ability_id')->unsigned()->index(); $table->morphs('entity'); + $table->boolean('forbidden')->default(false); $table->foreign('ability_id')->references('id')->on(Models::table('abilities')) ->onUpdate('cascade')->onDelete('cascade');
Add forbidden column to the permissions table, for future ability denials
JosephSilber_bouncer
train
php
0ef5f8429f8732f5cdf1207c5dd315e849434d0e
diff --git a/plan/refiner.go b/plan/refiner.go index <HASH>..<HASH> 100644 --- a/plan/refiner.go +++ b/plan/refiner.go @@ -220,7 +220,6 @@ func detachIndexScanConditions(conditions []expression.Expression, indexScan *Ph var curIndex int for curIndex = indexScan.accessEqualCount; curIndex < len(indexScan.Index.Columns); curIndex++ { checker := &conditionChecker{ - tableName: indexScan.Table.Name, idx: indexScan.Index, columnOffset: curIndex, length: indexScan.Index.Columns[curIndex].Length, @@ -264,9 +263,8 @@ func detachTableScanConditions(conditions []expression.Expression, table *model. var accessConditions, filterConditions []expression.Expression checker := conditionChecker{ - tableName: table.Name, - pkName: pkName, - length: types.UnspecifiedLength, + pkName: pkName, + length: types.UnspecifiedLength, } for _, cond := range conditions { cond = pushDownNot(cond, false, nil) @@ -305,7 +303,6 @@ func buildTableRange(p *PhysicalTableScan) error { // conditionChecker checks if this condition can be pushed to index plan. type conditionChecker struct { - tableName model.CIStr idx *model.IndexInfo columnOffset int // the offset of the indexed column to be checked. pkName model.CIStr
plan: clean code. (#<I>)
pingcap_tidb
train
go
fc34dbc27124a49ba5e3d492de0bfc50fe75ba61
diff --git a/test/unit/css.js b/test/unit/css.js index <HASH>..<HASH> 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1558,10 +1558,12 @@ QUnit.test( "Do not throw on frame elements from css method (#15098)", function( ( function() { var supportsCssVars, - div = jQuery( "<div>" ).appendTo( "#qunit-fixture" )[ 0 ]; + elem = jQuery( "<div>" ).appendTo( document.body ), + div = elem[ 0 ]; div.style.setProperty( "--prop", "value" ); - supportsCssVars = getComputedStyle( div ).getPropertyValue( "--prop" ); + supportsCssVars = !!getComputedStyle( div ).getPropertyValue( "--prop" ); + elem.remove(); QUnit[ supportsCssVars ? "test" : "skip" ]( "css(--customProperty)", function( assert ) { jQuery( "#qunit-fixture" ).append(
Tests: Clean up after the CSS Custom Properties support test Ref bcec<I>ee<I>e2d0e<I>bcb<I>e3d<I>a8f<I>f9 Ref <I>bf<I>d5b<I>f<I>dbc<I>b<I>f1c5a<I>
jquery_jquery
train
js
c0098dddb5722a3a9cf1b7a646f05eb282815052
diff --git a/duolingo.py b/duolingo.py index <HASH>..<HASH> 100644 --- a/duolingo.py +++ b/duolingo.py @@ -46,7 +46,6 @@ class Duolingo(object): requests. """ self.username = username - self.originalUsername = username self.password = password self.session_file = session_file self.user_url = "https://duolingo.com/users/%s" % self.username @@ -125,10 +124,6 @@ class Duolingo(object): self.username = username self.user_data=Struct(**self._get_data()) - def set_original_username(self): - self.username = self.originalUsername - self.user_data=Struct(**self._get_data()) - def get_leaderboard(self, unit, before): """ Get user's rank in the week in descending order, stream from
removed unnecessary original username variable and its setter
KartikTalwar_Duolingo
train
py
525fc0bc32e5fbde8fbe520e8e843e01e6bfa24a
diff --git a/lib/custom/src/MW/View/Helper/Jincluded/Standard.php b/lib/custom/src/MW/View/Helper/Jincluded/Standard.php index <HASH>..<HASH> 100644 --- a/lib/custom/src/MW/View/Helper/Jincluded/Standard.php +++ b/lib/custom/src/MW/View/Helper/Jincluded/Standard.php @@ -146,6 +146,7 @@ class Standard extends \Aimeos\MW\View\Helper\Base implements Iface if( $childItem->isAvailable() ) { $rtype = $childItem->getResourceType(); + $rtype = ( $pos = strrpos( $rtype, '/' ) ) !== false ? substr( $rtype, $pos + 1 ) : $rtype; $entry['relationships'][$rtype]['data'][] = ['id' => $childItem->getId(), 'type' => $rtype]; $this->map( $childItem, $fields, $fcn ); }
Don't create wrong links for data sub-domains
aimeos_ai-client-jsonapi
train
php
bf43f9da59d7aa8ecee5550a1a7ac0c3a8fd387c
diff --git a/ReText/window.py b/ReText/window.py index <HASH>..<HASH> 100644 --- a/ReText/window.py +++ b/ReText/window.py @@ -58,7 +58,8 @@ class ReTextWindow(QMainWindow): if globalSettings.iconTheme: QIcon.setThemeName(globalSettings.iconTheme) if QIcon.themeName() in ('hicolor', ''): - QIcon.setThemeName(get_icon_theme()) + if not QFile.exists(icon_path + 'document-new.png'): + QIcon.setThemeName(get_icon_theme()) if QFile.exists(icon_path+'retext.png'): self.setWindowIcon(QIcon(icon_path+'retext.png')) elif QFile.exists('/usr/share/pixmaps/retext.png'):
Do not try to get the icon theme when the icons pack is present
retext-project_retext
train
py
287fa1cc05b5e0aa726ab492ea1ec597f23ce2d1
diff --git a/lib/rabl/builder.rb b/lib/rabl/builder.rb index <HASH>..<HASH> 100644 --- a/lib/rabl/builder.rb +++ b/lib/rabl/builder.rb @@ -59,8 +59,9 @@ module Rabl # Replace nil values with empty strings if configured if Rabl.configuration.replace_nil_values_with_empty_strings - @_result = @_result.each_with_object({}) do |(k, v), hash| + @_result = @_result.inject({}) do |hash, (k, v)| hash[k] = v.nil? ? '' : v + hash end end
Use inject instead of each_with_object to maintain Ruby <I> compatibility
nesquena_rabl
train
rb
059db8a9cc846b6240858db7a865aa40622f9757
diff --git a/lib/tree.js b/lib/tree.js index <HASH>..<HASH> 100644 --- a/lib/tree.js +++ b/lib/tree.js @@ -30,8 +30,18 @@ var _Tree = function( obj, tree ) { , i , len = self.length , repo = repo || self.repo - , event = new events.EventEmitter(); + , event = new events.EventEmitter() + , prerequisites = 0; + function complete() { + if( i<len-1 ) { + next(i=i+1); + } + else { + event.emit( 'end' ); + } + } + function next(i) { var dir; var tree; @@ -45,19 +55,19 @@ var _Tree = function( obj, tree ) { else { dir = entry.name; tree = entry.tree(); + prerequisites++; !tree.error && tree.walk( repo ).on( 'entry', function( i, entry ) { entry.dir += dir + '/'; event.emit( 'entry', i, entry ); + }).on( 'end' , function( ) { + prerequisites--; + + (prerequisites == 0) && event.emit( 'end' ); }); } - if( i<len-1 ) { - next(i=i+1); - } - else { - event.emit( 'end' ); - } + (prerequisites == 0) && complete(); }); }
Fix Loading Issue in lib/tree.js This code fixes a bug whereby some tree elements will not yet have loaded when the 'end' event is signalled.
nodegit_nodegit
train
js
e89c274faa11f189bfed942e3b1a96211c65a0a7
diff --git a/symphony/content/content.logout.php b/symphony/content/content.logout.php index <HASH>..<HASH> 100644 --- a/symphony/content/content.logout.php +++ b/symphony/content/content.logout.php @@ -16,6 +16,26 @@ class contentLogout extends HTMLPage public function view() { Administration::instance()->logout(); - redirect(URL); + $redirectUrl = URL; + /** + * A successful logout attempt into the Symphony backend + * + * @delegate AuthorLogout + * @since Symphony 3.0.0 + * @param string $context + * '/logout/' + * @param integer $author_id + * The ID of Author ID that is about to be deleted + * @param Author $author + * The Author object. + * @param string $redirect_url + * The url to which the author will be redirected + */ + Symphony::ExtensionManager()->notifyMembers('AuthorLogout', '/logout/', [ + 'author' => Symphony::Author(), + 'author_id' => Symphony::Author()->get('id'), + 'redirect_url' => &$redirectUrl, + ]); + redirect($redirectUrl); } }
Add AuthorLogout delegate Picked from c<I>a<I>af<I> Picked from e<I>ba<I>a4b
symphonycms_symphony-2
train
php
c66fba3dfb391d00f9c11ad2faadcd434a91dd42
diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js index <HASH>..<HASH> 100644 --- a/benchmark/benchmark.js +++ b/benchmark/benchmark.js @@ -11,7 +11,7 @@ process.env.NODE_ENV = "production"; const CONCURRENCY = 10; -const DEPTH = 7; +const DEPTH = 8; const CACHE_DIVS = "CACHE_DIVS"; const CACHE_COMPONENT = "CACHE_COMPONENT";
Give benchmark a bit more work to do.
FormidableLabs_rapscallion
train
js
83e884345bc7455394cf9609aa6e1e501fa5843b
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup setup( name="threat_intel", - version='0.1.25', + version='0.1.26', provides=['threat_intel'], author="Yelp Security", url='https://github.com/Yelp/threat_intel',
Bumping the version to <I>
Yelp_threat_intel
train
py
5e7bcfeb849eebde8a8e24992f8c6930ba0790dc
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -85,6 +85,8 @@ var RedisStorage = createStorage(queue, unqueue, log); */ RedisStorage.prototype.redis = function() { if (!this.cn) this.cn = redis.createClient(); + // catch connection errors as service and so we can try reconnecting + this.cn.on('error', function() {true}); return this.cn; };
Adding error handler to avoid service kill when redis gone Could be perhaps improved with some error loggings for higher verbose levels. Conflicts: index.js
Zingle_http-later-redis
train
js
637f37641fb8072d73451b4ece85a512489508ea
diff --git a/src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js b/src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js index <HASH>..<HASH> 100644 --- a/src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js +++ b/src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js @@ -11,7 +11,9 @@ sap.ui.require([ "sap/ui/model/odata/OperationMode", "sap/ui/model/odata/v4/ODataModel", "sap/ui/model/Sorter", - "sap/ui/test/TestUtils" + "sap/ui/test/TestUtils", + // load Table resources upfront to avoid loading times > 1 second for the first test using Table + "sap/ui/table/Table" ], function (jQuery, ColumnListItem, Text, Controller, Filter, FilterOperator, OperationMode, ODataModel, Sorter, TestUtils) { /*global QUnit, sinon */
[INTERNAL] ODataModel.integration.qunit: Improve loading time for tests using Table Should fix the issue that the first test using Table goes red as it needs more than one second due to resource loading. PS1: PKS solo PS1: remove checkFinish from checkRequest (remainder from 1st try) Change-Id: Ie<I>d9d<I>ca<I>c9d<I>daf1c<I>fe<I>
SAP_openui5
train
js
7db69a1d0250a31e09f624d6bb579e6eb542b500
diff --git a/modules/backend/assets/js/october.dragscroll.js b/modules/backend/assets/js/october.dragscroll.js index <HASH>..<HASH> 100644 --- a/modules/backend/assets/js/october.dragscroll.js +++ b/modules/backend/assets/js/october.dragscroll.js @@ -84,7 +84,7 @@ return false }) - $(window).on('ready', $.proxy(this.fixScrollClasses, this)) + $(document).on('ready', $.proxy(this.fixScrollClasses, this)) $(window).on('resize', $.proxy(this.fixScrollClasses, this)) /*
Update october.dragscroll.js
octobercms_october
train
js
c2c8990244c19df72c2d98e584a961c96e270f00
diff --git a/requery-test/src/main/java/io/requery/test/FunctionalTest.java b/requery-test/src/main/java/io/requery/test/FunctionalTest.java index <HASH>..<HASH> 100644 --- a/requery-test/src/main/java/io/requery/test/FunctionalTest.java +++ b/requery-test/src/main/java/io/requery/test/FunctionalTest.java @@ -771,11 +771,14 @@ public abstract class FunctionalTest extends RandomData { for (int i = 0; i < 3; i++) { try (Result<Person> query = data.select(Person.class) .where(Person.NAME.equal(name)) + .orderBy(Person.NAME) .limit(5).get()) { assertEquals(5, query.toList().size()); } try (Result<Person> query = data.select(Person.class) - .where(Person.NAME.equal(name)).limit(5).offset(5).get()) { + .where(Person.NAME.equal(name)) + .orderBy(Person.NAME) + .limit(5).offset(5).get()) { assertEquals(5, query.toList().size()); } }
Resolve #<I> Update test case with orderBy/limit
requery_requery
train
java
b476c15abc968f1adb5fee433fdc7227fc550d19
diff --git a/fenzo-core/src/test/java/com/netflix/fenzo/AutoScalerTest.java b/fenzo-core/src/test/java/com/netflix/fenzo/AutoScalerTest.java index <HASH>..<HASH> 100644 --- a/fenzo-core/src/test/java/com/netflix/fenzo/AutoScalerTest.java +++ b/fenzo-core/src/test/java/com/netflix/fenzo/AutoScalerTest.java @@ -234,6 +234,7 @@ public class AutoScalerTest { do { Thread.sleep(1000); scheduler.scheduleOnce(requests, leases); + leases.clear(); } while (i++<coolDownSecs+2 && latch.getCount()>0); if(latch.getCount()<1) Assert.fail("Scale up action received for " + rule2.getRuleName() + " rule, was expecting only on "
fix unit test to not input same lease twice to scheduler
Netflix_Fenzo
train
java
81e2000ffdb68bfd9ae83ab867300ec025f40876
diff --git a/parser.go b/parser.go index <HASH>..<HASH> 100644 --- a/parser.go +++ b/parser.go @@ -936,14 +936,6 @@ func (p *Parser) normalizeColumn(col model.TableColumn) error { l := model.NewLength("8") l.SetDecimal("2") col.SetLength(l) - case model.ColumnTypeTinyText, model.ColumnTypeTinyBlob: - col.SetLength(model.NewLength("255")) - case model.ColumnTypeBlob, model.ColumnTypeText: - col.SetLength(model.NewLength("65535")) - case model.ColumnTypeMediumBlob, model.ColumnTypeMediumText: - col.SetLength(model.NewLength("16777215")) - case model.ColumnTypeLongBlob, model.ColumnTypeLongText: - col.SetLength(model.NewLength("4294967295")) } }
TEXT and BLOB do not have length
schemalex_schemalex
train
go
fbc70e4f13ab67d7e06c7c4c011cad40142116e3
diff --git a/tcex/tcex_ti/tcex_ti.py b/tcex/tcex_ti/tcex_ti.py index <HASH>..<HASH> 100644 --- a/tcex/tcex_ti/tcex_ti.py +++ b/tcex/tcex_ti/tcex_ti.py @@ -172,9 +172,9 @@ class TcExTi(object): else: try: if upper_indicator_type in self._custom_indicator_classes.keys(): - custom_indicator_details = self._custom_indicator_classes[indicator_type] + custom_indicator_details = self._custom_indicator_classes[upper_indicator_type] value_fields = custom_indicator_details.get('value_fields') - c = getattr(module, upper_indicator_type) + c = getattr(module, indicator_type.replace(' ', '')) if len(value_fields) == 1: indicator = c( self.tcex, kwargs.pop(value_fields[0], None), owner=owner, **kwargs @@ -188,6 +188,7 @@ class TcExTi(object): **kwargs ) elif len(value_fields) == 3: + print(value_fields) indicator = c( self.tcex, kwargs.pop(value_fields[0], None),
making it so that cusom indicators unique_id are url safe
ThreatConnect-Inc_tcex
train
py
916b9282d9f6296a59e69cb05b166c83b2676a19
diff --git a/go/chat/storage/inbox.go b/go/chat/storage/inbox.go index <HASH>..<HASH> 100644 --- a/go/chat/storage/inbox.go +++ b/go/chat/storage/inbox.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/context" ) -const inboxVersion = 23 +const inboxVersion = 24 var defaultMemberStatusFilter = []chat1.ConversationMemberStatus{ chat1.ConversationMemberStatus_ACTIVE,
Bump inbox storage version (#<I>)
keybase_client
train
go
b6fdd3861bb4265c22c84c9d81e367452ef0f7cf
diff --git a/Eloquent/Relations/MorphToMany.php b/Eloquent/Relations/MorphToMany.php index <HASH>..<HASH> 100644 --- a/Eloquent/Relations/MorphToMany.php +++ b/Eloquent/Relations/MorphToMany.php @@ -116,6 +116,19 @@ class MorphToMany extends BelongsToMany } /** + * Get the pivot models that are currently attached. + * + * @return \Illuminate\Support\Collection + */ + protected function getCurrentlyAttachedPivots() + { + return parent::getCurrentlyAttachedPivots()->map(function ($record) { + return $record->setMorphType($this->morphType) + ->setMorphClass($this->morphClass); + }); + } + + /** * Create a new query builder for the pivot table. * * @return \Illuminate\Database\Query\Builder
fix bug with update existing pivot and polymorphic many to many
illuminate_database
train
php
fa2ece5d1b49b1ed338db7a0f21ab868f3d28abd
diff --git a/openquake/calculators/tests/classical_test.py b/openquake/calculators/tests/classical_test.py index <HASH>..<HASH> 100644 --- a/openquake/calculators/tests/classical_test.py +++ b/openquake/calculators/tests/classical_test.py @@ -512,7 +512,7 @@ hazard_uhs-std.csv 'hazard_map-mean.csv'], case_39.__file__, delta=1E-5) def test_case_40(self): - # NGE East + # NGA East self.assert_curves_ok([ 'hazard_curve-mean-PGV.csv', 'hazard_map-mean.csv'], case_40.__file__, delta=1E-6)
Fixed misprint in comment [skip CI]
gem_oq-engine
train
py
9c22d4c6f331bc3fae28da2015ff2fbedfb06991
diff --git a/bin/cargo-tessel.js b/bin/cargo-tessel.js index <HASH>..<HASH> 100755 --- a/bin/cargo-tessel.js +++ b/bin/cargo-tessel.js @@ -42,15 +42,15 @@ parser.command('build') .help('Cross-compile a binary for Tessel.'); parser.command('sdk') + .callback(options => { + rust.cargo[options.subcommand](options).catch(closeCommand); + }) .option('subcommand', { position: 1, required: true, - options: ['install', 'uninstall'], + choices: ['install', 'uninstall'], help: '"install" or "uninstall" the SDK.', }) - .callback(options => { - rust.cargo[options.subcommand](options).catch(closeCommand); - }) .help('Manage the SDK for cross-compiling Rust binaries.');
Make callback first (consistent)
tessel_t2-cli
train
js
7a4e47eb0970dd1cdd496449d97d03253f856d76
diff --git a/src/tabs/index.js b/src/tabs/index.js index <HASH>..<HASH> 100644 --- a/src/tabs/index.js +++ b/src/tabs/index.js @@ -267,7 +267,7 @@ export default createComponent({ }, // emit event when clicked - onClick(index) { + onClick(item, index) { const { title, disabled, computedName } = this.children[index]; if (disabled) { this.$emit('disabled', computedName, title); @@ -275,6 +275,7 @@ export default createComponent({ this.setCurrentIndex(index); this.scrollToCurrentContent(); this.$emit('click', computedName, title); + route(item.$router, item); } }, @@ -360,8 +361,7 @@ export default createComponent({ default: () => item.slots('title'), }} onClick={() => { - this.onClick(index); - route(item.$router, item); + this.onClick(item, index); }} /> ));
fix(Tab): should not trigger route when disabled (#<I>)
youzan_vant
train
js
957ef6bf390d499453e1ab9f13b0d62ae6102e30
diff --git a/rivescript/sorting.py b/rivescript/sorting.py index <HASH>..<HASH> 100644 --- a/rivescript/sorting.py +++ b/rivescript/sorting.py @@ -47,7 +47,7 @@ class TriggerObj(object): self.option = self.alphabet.count('[') + self.alphabet.count('(') # Number of option 0 < 1 if self.star > 0: - if self.pound == 0 & self.under == 0 & self.option == 0: # Place single star last in the rank + if (self.pound == 0) & (self.under == 0) & (self.option == 0): # Place single star last in the rank self.pound = sys.maxsize self.under = sys.maxsize self.option = sys.maxsize
#<I> Fix proper use of bitwise operator
aichaos_rivescript-python
train
py
555b63a5e207c1e7e9c40551ba7ec15c06a44cf3
diff --git a/pygerduty.py b/pygerduty.py index <HASH>..<HASH> 100755 --- a/pygerduty.py +++ b/pygerduty.py @@ -126,7 +126,10 @@ class Collection(object): response = self.pagerduty.request( "GET", path, query_params=kwargs) - return self.container(self, **response.get(self.sname, {})) + if response.get(self.sname): + return self.container(self, **response.get(self.sname, {})) + else: + return self.container(self, **response) def delete(self, entity_id): path = "%s/%s" % (self.name, entity_id)
Handle cases such as /incidents/<ID> which return a single object rather than a collection.
dropbox_pygerduty
train
py
c9d5705afdd80091436b8d666ec67971aceffb6e
diff --git a/pulse.go b/pulse.go index <HASH>..<HASH> 100644 --- a/pulse.go +++ b/pulse.go @@ -64,7 +64,6 @@ type coreModule interface { } func main() { - gitversion = "0.0.1" // TODO parse git tags app := cli.NewApp() app.Name = "pulsed" app.Version = gitversion @@ -76,7 +75,7 @@ func main() { } func action(ctx *cli.Context) { - log.Info("Starting PulseD") + log.Info("Starting pulsed") logLevel := ctx.Int("log-level") logPath := ctx.String("log-path") maxProcs := ctx.Int("max-procs")
Removing gitversion variable declaration. Gitversion set during make of pulse
intelsdi-x_snap
train
go
38909758005abfb891770996f321a630f3c9ece2
diff --git a/src/packbits.py b/src/packbits.py index <HASH>..<HASH> 100644 --- a/src/packbits.py +++ b/src/packbits.py @@ -59,7 +59,7 @@ def encode(data): result.append(256-(repeat_count - 1)) result.append(data[pos]) - while pos < len(data)-1: + while pos < len(data)-1: current_byte = data[pos] if data[pos] == data[pos+1]: diff --git a/test_packbits.py b/test_packbits.py index <HASH>..<HASH> 100644 --- a/test_packbits.py +++ b/test_packbits.py @@ -62,7 +62,7 @@ def test_encode_long_raw(): print(encoded) assert packbits.decode(encoded) == data -def test_encode_long_raw(): +def test_encode_long_raw2(): data = b'12345678' * 16 encoded = packbits.encode(data) assert packbits.decode(encoded) == data
rename test (it was not executed before)
psd-tools_packbits
train
py,py
a96d357d9eeb8b908cc8ce5580ab771fc34a5dc8
diff --git a/src/main/java/com/couchbase/client/core/env/DefaultCoreEnvironment.java b/src/main/java/com/couchbase/client/core/env/DefaultCoreEnvironment.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/couchbase/client/core/env/DefaultCoreEnvironment.java +++ b/src/main/java/com/couchbase/client/core/env/DefaultCoreEnvironment.java @@ -427,14 +427,14 @@ public class DefaultCoreEnvironment implements CoreEnvironment { if (builder.queryServiceConfig != null) { this.queryServiceConfig = builder.queryServiceConfig; } else { - int minEndpoints = queryEndpoints() == VIEW_ENDPOINTS ? 0 : queryEndpoints(); + int minEndpoints = queryEndpoints() == QUERY_ENDPOINTS ? 0 : queryEndpoints(); this.queryServiceConfig = QueryServiceConfig.create(minEndpoints, queryEndpoints()); } if (builder.searchServiceConfig != null) { this.searchServiceConfig = builder.searchServiceConfig; } else { - int minEndpoints = searchEndpoints() == VIEW_ENDPOINTS ? 0 : searchEndpoints(); + int minEndpoints = searchEndpoints() == SEARCH_ENDPOINTS ? 0 : searchEndpoints(); this.searchServiceConfig = SearchServiceConfig.create(minEndpoints, searchEndpoints()); }
Use correct default value for endpoints. This is just a correctness fix, since the constants right now are all the same. Change-Id: Icae<I>d9bf3f<I>e<I>fdbfe<I>c8b<I> Reviewed-on: <URL>
couchbase_couchbase-jvm-core
train
java
bf6f185dd667e3d491b569bdf807b2c0a31d955e
diff --git a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php index <HASH>..<HASH> 100644 --- a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php +++ b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php @@ -31,12 +31,12 @@ use Webmozart\Assert\Assert; class Kernel extends HttpKernel { - public const VERSION = '1.3.14'; - public const VERSION_ID = '10314'; + public const VERSION = '1.3.15-DEV'; + public const VERSION_ID = '10315'; public const MAJOR_VERSION = '1'; public const MINOR_VERSION = '3'; - public const RELEASE_VERSION = '14'; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = '15'; + public const EXTRA_VERSION = 'DEV'; public function __construct(string $environment, bool $debug) {
Change application's version to <I>-DEV
Sylius_Sylius
train
php
1922c0bc72c6b5fdf6082bf246320ec8250d071f
diff --git a/client/js/azure/uploader.basic.js b/client/js/azure/uploader.basic.js index <HASH>..<HASH> 100644 --- a/client/js/azure/uploader.basic.js +++ b/client/js/azure/uploader.basic.js @@ -194,6 +194,7 @@ }), getSas = new qq.azure.GetSas({ cors: this._options.cors, + customHeaders: this._options.signature.customHeaders, endpointStore: { get: function() { return self._options.signature.endpoint;
fix(azure/uploader.basic): customHeaders omitted from delete SAS closes #<I>
FineUploader_fine-uploader
train
js
514b6f6517adca57f2c3c4a1c23a6e02546653b9
diff --git a/goagen/codegen/workspace.go b/goagen/codegen/workspace.go index <HASH>..<HASH> 100644 --- a/goagen/codegen/workspace.go +++ b/goagen/codegen/workspace.go @@ -310,7 +310,7 @@ func PackagePath(path string) (string, error) { if gp, err := filepath.Abs(gopath); err == nil { gopath = gp } - if strings.HasPrefix(absPath, gopath) { + if filepath.HasPrefix(absPath, gopath) { base := filepath.FromSlash(gopath + "/src") rel, err := filepath.Rel(base, absPath) return filepath.ToSlash(rel), err
Fix path prefix check. (#<I>) Windows paths are case-insensitive.
goadesign_goa
train
go
06323dbf8a760e0da25291cce8546a6ebeacdceb
diff --git a/spec/lol/champion_spec.rb b/spec/lol/champion_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lol/champion_spec.rb +++ b/spec/lol/champion_spec.rb @@ -1,5 +1,5 @@ -require "lol" require "spec_helper" +require "lol" include Lol diff --git a/spec/lol/client_spec.rb b/spec/lol/client_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lol/client_spec.rb +++ b/spec/lol/client_spec.rb @@ -1,5 +1,5 @@ -require "lol" require "spec_helper" +require "lol" require "json" include Lol diff --git a/spec/lol/game_spec.rb b/spec/lol/game_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lol/game_spec.rb +++ b/spec/lol/game_spec.rb @@ -1,5 +1,5 @@ -require "lol" require "spec_helper" +require "lol" require "json" include Lol diff --git a/spec/lol/league_spec.rb b/spec/lol/league_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lol/league_spec.rb +++ b/spec/lol/league_spec.rb @@ -0,0 +1 @@ +require "spec_helper"
moved spec_helper on top to get simplecov running correctly
mikamai_ruby-lol
train
rb,rb,rb,rb
aef1b9b357998f8f6be82045e31f9fe420b94396
diff --git a/lib/canonical-rails.rb b/lib/canonical-rails.rb index <HASH>..<HASH> 100644 --- a/lib/canonical-rails.rb +++ b/lib/canonical-rails.rb @@ -20,9 +20,6 @@ module CanonicalRails mattr_accessor :collection_actions @@collection_actions = [:index] - mattr_accessor :member_actions - @@member_actions = [:show] - mattr_accessor :whitelisted_parameters @@whitelisted_parameters = []
Remove member_actions as it is not being used.
jumph4x_canonical-rails
train
rb
186587a506a233e7a84b82d8da23da3cdb037698
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -69,6 +69,8 @@ setup( 'Programming Language :: Python', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Software Development :: Libraries :: Python Modules', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', ], platforms = ['any'], url = 'http://github.com/jcassee/django-analytical',
added py<I>/<I> classifiers as travis-ci tests these versions
jazzband_django-analytical
train
py
fc2cd53d7698e432ab5b250ffac53458263a49e2
diff --git a/mistune/util.py b/mistune/util.py index <HASH>..<HASH> 100644 --- a/mistune/util.py +++ b/mistune/util.py @@ -20,7 +20,12 @@ def escape(s, quote=True): def escape_url(link): - safe = '/#:()*?=%@+,&' + safe = ( + ':/?#@' # gen-delims - '[]' (rfc3986) + '!$&()*+,;=' # sub-delims - "'" (rfc3986) + '%' # leave already-encoded octets alone + ) + if html is None: return quote(link.encode('utf-8'), safe=safe) return html.escape(quote(html.unescape(link), safe=safe))
Make mistune.util.escape_url less aggressive This adds ';', '!', and '$' to the set of characters which will be passed unmolested by escape_url. These are all in RFC <I> reserved character list — that is to say: escaping these may change the meaning of a URL.
lepture_mistune
train
py
f9e8b0b1e2c7aa425fb8460d32607642a5c286f5
diff --git a/lib/loaders/LoaderBase.js b/lib/loaders/LoaderBase.js index <HASH>..<HASH> 100644 --- a/lib/loaders/LoaderBase.js +++ b/lib/loaders/LoaderBase.js @@ -191,12 +191,12 @@ var LoaderBase = new Class({ */ _onStateChange: function () { if (this.xhr.readyState > 1) { - var status = '' + var status var waiting = false // Fix error in IE8 where status isn't available until readyState=4 try { status = this.xhr.status } catch (e) { waiting = true } - if (status === '200') { + if (status === 200) { switch (this.xhr.readyState) { // send() has been called, and headers and status are available
Bugfix wrong status type comparision
Jam3_preloader
train
js
369ebf2a9100a2b9bf24c43eee2e465b5683f772
diff --git a/lib/flor/instruction.rb b/lib/flor/instruction.rb index <HASH>..<HASH> 100644 --- a/lib/flor/instruction.rb +++ b/lib/flor/instruction.rb @@ -37,17 +37,6 @@ class Flor::Instruction :over end - def self.names(*names) - - names.each { |n| (@@instructions ||= {})[n] = self } - end - class << self; alias :name :names; end - - def self.lookup(name) - - @@instructions[name] - end - protected def tree @@ -61,8 +50,21 @@ class Flor::Instruction end end -module Flor::Ins; end - +# class methods +# class Flor::Instruction + + def self.names(*names) + + names.each { |n| (@@instructions ||= {})[n] = self } + end + class << self; alias :name :names; end + + def self.lookup(name) + + @@instructions[name] + end end +module Flor::Ins; end +
set Flor::Instruction class methods apart
floraison_flor
train
rb
c9a4fda35af77213e9db106d039dcef3aa47935c
diff --git a/lib/toto.rb b/lib/toto.rb index <HASH>..<HASH> 100644 --- a/lib/toto.rb +++ b/lib/toto.rb @@ -143,7 +143,7 @@ module Toto end def self.articles ext - Dir["#{Paths[:articles]}/*.#{ext}"].sort { |file_name| File.basename(file_name) } + Dir["#{Paths[:articles]}/*.#{ext}"].sort_by { |file_name| File.basename(file_name) } end class Context
Ops, wrong call to .sort_by
cloudhead_toto
train
rb
0cd0477a4172f8c4d4d6c48c2bfb4ff942c10ce9
diff --git a/symbols/funcdecl.py b/symbols/funcdecl.py index <HASH>..<HASH> 100644 --- a/symbols/funcdecl.py +++ b/symbols/funcdecl.py @@ -11,7 +11,9 @@ from api import global_ from api.constants import TYPE_SIZES +import api.symboltable from symbol_ import Symbol +from function import SymbolFUNCTION class SymbolFUNCDECL(Symbol): @@ -22,6 +24,15 @@ class SymbolFUNCDECL(Symbol): self.entry = entry # Symbol table entry @property + def entry(self): + return self.children[0] + + @entry.setter + def entry(self, value): + assert isinstance(value, SymbolFUNCTION) + self.children = [value] + + @property def name(self): return self.entry.name @@ -39,7 +50,7 @@ class SymbolFUNCDECL(Symbol): @local_symbol_table.setter def local_symbol_table(self, value): - assert isinstance(value, dict) + assert isinstance(value, api.symboltable.SymbolTable.Scope) self.entry.local_symbol_table = value @property @@ -55,8 +66,8 @@ class SymbolFUNCDECL(Symbol): return TYPE_SIZES[self._type] @property - def mangled_(self): - return self.entry.mangled_ + def mangled(self): + return self.entry.mangled @classmethod def make_node(clss, func_name, lineno):
Little fixes for bugs discovered by TDD
boriel_zxbasic
train
py
57e2ff2a321d737ae3a63e2c49b8d6c07d30b2be
diff --git a/src/lib/exceptions.js b/src/lib/exceptions.js index <HASH>..<HASH> 100644 --- a/src/lib/exceptions.js +++ b/src/lib/exceptions.js @@ -85,7 +85,8 @@ module.exports = { 'filename': this.cleanFileUrl(stack.fileName), 'lineno': stack.lineNumber, 'colno': stack.columnNumber, - 'function': stack.functionName || '[anonymous]' + 'function': stack.functionName || '[anonymous]', + 'abs_path': stack.fileName } // Detect Sourcemaps
Add abs_path param to stack frames
opbeat_opbeat-react
train
js
e7ea0cd9673c300812fcebee8417cc24fcba96ab
diff --git a/gandi/conf.py b/gandi/conf.py index <HASH>..<HASH> 100644 --- a/gandi/conf.py +++ b/gandi/conf.py @@ -143,11 +143,13 @@ class GandiContextHelper(object): if ret is None: return default - def call(self, method, args): + def call(self, method, *args): """ call a remote api method and returned the result """ + print 'calling method:', method + print 'with params:', args try: func = getattr(self.api, method) - return func(self.apikey, args) + return func(self.apikey, *args) except socket.error: msg = 'Gandi API service is unreachable' raise UsageError(msg)
Fixes args passing to api call
Gandi_gandi.cli
train
py
4c27d574b81a321d0d5088cdb161bbd18a30e7ef
diff --git a/lib/ditty/controllers/component.rb b/lib/ditty/controllers/component.rb index <HASH>..<HASH> 100644 --- a/lib/ditty/controllers/component.rb +++ b/lib/ditty/controllers/component.rb @@ -42,7 +42,7 @@ module Ditty end # Create Form - get '/new' do + get '/new/?' do authorize settings.model_class, :create entity = settings.model_class.new(permitted_attributes(settings.model_class, :create)) @@ -66,7 +66,7 @@ module Ditty end # Read - get '/:id' do |id| + get '/:id/?' do |id| entity = read(id) halt 404 unless entity authorize entity, :read @@ -76,7 +76,7 @@ module Ditty end # Update Form - get '/:id/edit' do |id| + get '/:id/edit/?' do |id| entity = read(id) halt 404 unless entity authorize entity, :update @@ -87,7 +87,7 @@ module Ditty end # Update - put '/:id' do |id| + put '/:id/?' do |id| entity = read(id) halt 404 unless entity authorize entity, :update @@ -101,7 +101,7 @@ module Ditty update_response(entity) end - delete '/:id' do |id| + delete '/:id/?' do |id| entity = read(id) halt 404 unless entity authorize entity, :delete
chore: Allow trailing / on certain component routes
EagerELK_ditty
train
rb
5422655a863d4ddbfecd4c5040c0d2d723c6e3b9
diff --git a/discord/invite.py b/discord/invite.py index <HASH>..<HASH> 100644 --- a/discord/invite.py +++ b/discord/invite.py @@ -53,7 +53,7 @@ class Invite(Hashable): max_age: int How long the before the invite expires in seconds. A value of 0 indicates that it doesn't expire. code: str - The URL fragment used for the invite. :attr:`xkcd` is also a possible fragment. + The URL fragment used for the invite. guild: :class:`Guild` The guild the invite is for. revoked: bool @@ -89,7 +89,7 @@ class Invite(Hashable): self.max_uses = data.get('max_uses') inviter_data = data.get('inviter') - self.inviter = None if inviter_data is None else User(state=state, data=data) + self.inviter = None if inviter_data is None else User(state=state, data=inviter_data) self.channel = data.get('channel') def __str__(self):
Fix parsing of Invite.user
Rapptz_discord.py
train
py
956bd19c8b670b8603490a91bd641dde905c80a7
diff --git a/src/SearchableTrait.php b/src/SearchableTrait.php index <HASH>..<HASH> 100644 --- a/src/SearchableTrait.php +++ b/src/SearchableTrait.php @@ -87,7 +87,11 @@ trait SearchableTrait $this->makeGroupBy($query); + $clone_bindings = $query->getBindings(); + $query->setBindings([]); + $this->addBindingsToQuery($query, $this->search_bindings); + $this->addBindingsToQuery($query, $clone_bindings); if(is_callable($restriction)) { $query = $restriction($query); @@ -337,6 +341,12 @@ trait SearchableTrait } else { $original->from(DB::connection($this->connection)->raw("({$clone->toSql()}) as `{$tableName}`")); } - $original->mergeBindings($clone->getQuery()); + + $original->setBindings( + array_merge_recursive( + $clone->getBindings(), + $original->getBindings() + ) + ); } }
fix for bindings order when using where clause Bindings order were wrong.
nicolaslopezj_searchable
train
php
bc27b7cdf549d1648cb2f9c467ca0791db9bf4af
diff --git a/src/mesh.js b/src/mesh.js index <HASH>..<HASH> 100644 --- a/src/mesh.js +++ b/src/mesh.js @@ -528,7 +528,7 @@ export default class Mesh { break; case Layout.UV.key: dataView.setFloat32(offset, this.textures[i * 2], true); - dataView.setFloat32(offset + 4, this.vertices[i * 2 + 1], true); + dataView.setFloat32(offset + 4, this.textures[i * 2 + 1], true); break; case Layout.NORMAL.key: dataView.setFloat32(offset, this.vertexNormals[i * 3], true);
Fix bug in Layout buffer data for UV textures.
frenchtoast747_webgl-obj-loader
train
js
9ddea2d8d7b51470c3620da2913c74798471960c
diff --git a/scripts/updateLicense.py b/scripts/updateLicense.py index <HASH>..<HASH> 100644 --- a/scripts/updateLicense.py +++ b/scripts/updateLicense.py @@ -50,10 +50,12 @@ def update_go_license(name, force=False): if year == CURRENT_YEAR: break - new_line = COPYRIGHT_RE.sub('Copyright (c) %d' % CURRENT_YEAR, line) - assert line != new_line, ('Could not change year in: %s' % line) - lines[i] = new_line - changed = True + # Avoid updating the copyright year. + # + # new_line = COPYRIGHT_RE.sub('Copyright (c) %d' % CURRENT_YEAR, line) + # assert line != new_line, ('Could not change year in: %s' % line) + # lines[i] = new_line + # changed = True break if not found:
Do not update year for copyright in license (#<I>)
jaegertracing_jaeger-lib
train
py
a902e312d44bdc9fda95d7a2bcb43735182b0a1c
diff --git a/jbpm-designer-client/src/main/java/org/jbpm/designer/client/DesignerPresenter.java b/jbpm-designer-client/src/main/java/org/jbpm/designer/client/DesignerPresenter.java index <HASH>..<HASH> 100644 --- a/jbpm-designer-client/src/main/java/org/jbpm/designer/client/DesignerPresenter.java +++ b/jbpm-designer-client/src/main/java/org/jbpm/designer/client/DesignerPresenter.java @@ -306,4 +306,4 @@ public class DesignerPresenter { placeRequestImpl.addParameter("profile", "jbpm"); this.placeManager.goTo(placeRequestImpl); } -} \ No newline at end of file +}
- adding to more modifications regarding: - adapted to recent URIEncoder->URIUtil refactoring on uberfire
kiegroup_jbpm-designer
train
java
45852c7aab7ecd5fca597f3aaa828d812121bfbf
diff --git a/IndexedRedis/__init__.py b/IndexedRedis/__init__.py index <HASH>..<HASH> 100644 --- a/IndexedRedis/__init__.py +++ b/IndexedRedis/__init__.py @@ -549,13 +549,17 @@ class IndexedRedisModel(object): key = None for key, value in myDict.items(): - if key not in self.BINARY_FIELDS: + if key not in self.BINARY_FIELDS and (bytes == str or not isinstance(value, bytes)): if value != None: val = convertMethods[key](value) if isinstance(val, IRNullType): val = 'IRNullType()' - elif isinstance(val, (str, bytes, unicode)): - val = "'%s'" %(to_unicode(val),) + elif isinstance(val, (str, unicode)): + try: + val = "'%s'" %(to_unicode(val),) + except: + # Python 2.... + val = repr(val) else: val = to_unicode(val) ret += [key, '=', val, ', ']
Fix repr and bytes fields on python2 and 3
kata198_indexedredis
train
py
28086a0b59488915d4b7ab42e74dd03462a91f61
diff --git a/gtk_mock/combo_box_text.go b/gtk_mock/combo_box_text.go index <HASH>..<HASH> 100644 --- a/gtk_mock/combo_box_text.go +++ b/gtk_mock/combo_box_text.go @@ -10,3 +10,6 @@ func (*MockComboBoxText) AppendText(v1 string) { func (*MockComboBoxText) GetActiveText() string { return "" } + +func (*MockComboBoxText) RemoveAll() { +} diff --git a/gtka/combo_box_text.go b/gtka/combo_box_text.go index <HASH>..<HASH> 100644 --- a/gtka/combo_box_text.go +++ b/gtka/combo_box_text.go @@ -35,3 +35,7 @@ func (v *comboBoxText) AppendText(v1 string) { func (v *comboBoxText) GetActiveText() string { return v.internal.GetActiveText() } + +func (v *comboBoxText) RemoveAll() { + return v.internal.RemoveAll() +} diff --git a/gtki/combo_box_text.go b/gtki/combo_box_text.go index <HASH>..<HASH> 100644 --- a/gtki/combo_box_text.go +++ b/gtki/combo_box_text.go @@ -5,6 +5,7 @@ type ComboBoxText interface { AppendText(string) GetActiveText() string + RemoveAll() } func AssertComboBoxText(_ ComboBoxText) {}
Add support for removing all elements in a combobox text
coyim_gotk3adapter
train
go,go,go
e1b61825099eb335bb3356bf8bec062efd662e67
diff --git a/app/models/activation_key.rb b/app/models/activation_key.rb index <HASH>..<HASH> 100644 --- a/app/models/activation_key.rb +++ b/app/models/activation_key.rb @@ -33,11 +33,16 @@ class ActivationKey < ActiveRecord::Base validates :description, :katello_description_format => true validates :environment, :presence => true validate :environment_exists + validate :environment_not_locker def environment_exists errors.add(:environment, _("id: #{environment_id} doesn't exist ")) if environment.nil? end + def environment_not_locker + errors.add(:base, _("Cannot create activation keys in Locker environment ")) if environment and environment.locker? + end + # set's up system when registering with this activation key def apply_to_system(system) system.environment_id = self.environment_id if self.environment_id
<I> - validation in activation key model, can't be created for Locker env
Katello_katello
train
rb
a57f9c34179d4adf44b9b93c4d79b6c6a06107a3
diff --git a/plugins/blackbox/index.js b/plugins/blackbox/index.js index <HASH>..<HASH> 100644 --- a/plugins/blackbox/index.js +++ b/plugins/blackbox/index.js @@ -39,7 +39,12 @@ function blackbox(name, deps) { parser.on('data', function(data) { _writeVideo(data); }) - client.getVideoStream().pipe(parser); + var video = client.getVideoStream(); + video.pipe(parser); + video.on('close', function() { + video = client.getVideoStream(); + video.pipe(parser); + }); };
The video stream can sometimes break during flight. We have to try to reconnect it so the blackbox keeps recording.
eschnou_ardrone-webflight
train
js
413c5a16c9f9f74bab9228f8bf1532d32676f628
diff --git a/html2asketch/nodeToSketchLayers.js b/html2asketch/nodeToSketchLayers.js index <HASH>..<HASH> 100644 --- a/html2asketch/nodeToSketchLayers.js +++ b/html2asketch/nodeToSketchLayers.js @@ -113,7 +113,8 @@ export default async function nodeToSketchLayers(node) { opacity, overflowX, overflowY, - position + position, + clip } = styles; // Skip node when display is set to none for itself or an ancestor @@ -130,6 +131,10 @@ export default async function nodeToSketchLayers(node) { return layers; } + if (clip === 'rect(0px 0px 0px 0px)' && position === 'absolute') { + return layers; + } + const leaf = new ShapeGroup({x, y, width, height}); const isImage = node.nodeName === 'IMG' && node.attributes.src;
Skip node that has 'rect (0 0 0 0)' on clip and 'absolute' on positon (#<I>)
brainly_html-sketchapp
train
js
03a5f607cf72b067b72cc2ff48caad9221b6230a
diff --git a/lib/acts_as_enum.rb b/lib/acts_as_enum.rb index <HASH>..<HASH> 100644 --- a/lib/acts_as_enum.rb +++ b/lib/acts_as_enum.rb @@ -80,7 +80,7 @@ module ActsAsEnum const_set(method_name.upcase, attr_value) - if Rails.version =~ /^[34]/ + if Rails.version =~ /^[345]/ scope method_name.to_sym, -> { where(attr => attr_value) } else named_scope method_name.to_sym, :conditions => { attr.to_sym => attr_value }
rails 5 support it does not work in rails 5, adding 5 support
liangwenke_acts_as_enum
train
rb
2b97efefb4292e40342763c63bf0db84c93c818c
diff --git a/src/Entity/Ranking.php b/src/Entity/Ranking.php index <HASH>..<HASH> 100644 --- a/src/Entity/Ranking.php +++ b/src/Entity/Ranking.php @@ -9,7 +9,7 @@ use Drupal\mespronos\RankingInterface; use Drupal\mespronos\MPNEntityInterface; use Drupal\mespronos_group\Entity\Group; -abstract class Ranking extends MPNContentEntityBase implements MPNEntityInterface,RankingInterface { +abstract class Ranking extends MPNContentEntityBase implements MPNEntityInterface, RankingInterface { public static function preCreate(EntityStorageInterface $storage_controller, array &$values) { parent::preCreate($storage_controller, $values);
refactoring - clean Ranking
mespronos_mespronos
train
php
602020879bb456695204d40b01bab5816800a724
diff --git a/lib/chef/knife/azure_server_create.rb b/lib/chef/knife/azure_server_create.rb index <HASH>..<HASH> 100755 --- a/lib/chef/knife/azure_server_create.rb +++ b/lib/chef/knife/azure_server_create.rb @@ -1090,4 +1090,4 @@ class Chef end end end -end +end \ No newline at end of file
Removed extra line for travis pass
chef_knife-azure
train
rb
c9c357d6b774083a660424226ceff143cbde9579
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -558,6 +558,9 @@ async function activate() { let CHANGELOG = await askForChangelog( VERSION_TYPE, NEXT_VERSION ); + if ( CHANGELOG ) + fs.writeFileSync( 'CHANGELOG.md.draft', CHANGELOG, 'UTF-8' ); + // // ---------------------------------------------------- // Confirm section @@ -608,6 +611,7 @@ async function activate() { await execute( `git checkout -b ${ RELEASE_BRANCH }` ); await execute( `git add CHANGELOG.md` ); await execute( `git commit -m "Updated changelog for v${ NEXT_VERSION }"` ); + await execute( `rm CHANGELOG.md.draft` ); } else { await execute( `git checkout -b ${ RELEASE_BRANCH }` ); }
A draft changelog will be saved for future use when the user writes an entry and then aborts the update
Zelgadis87_npm-versionator
train
js
102f8f5081a6f6e156266a1499223a45f782b737
diff --git a/php/Element.php b/php/Element.php index <HASH>..<HASH> 100644 --- a/php/Element.php +++ b/php/Element.php @@ -247,7 +247,8 @@ class Element extends Tag { }; array_walk_recursive( $config, $replaceElements ); // Set '_' last to ensure that subclasses can't accidentally step on it. - $config['_'] = preg_replace( '/^OOUI\\\\/', '', get_class( $this ) ); + // Strip all namespaces from the class name + $config['_'] = end( explode( '\\', get_class( $this ) ) ); return $config; } diff --git a/tests/phpunit/ElementTest.php b/tests/phpunit/ElementTest.php index <HASH>..<HASH> 100644 --- a/tests/phpunit/ElementTest.php +++ b/tests/phpunit/ElementTest.php @@ -14,7 +14,7 @@ class ElementTest extends TestCase { ), array( new \FooBarBaz\MockWidget( array( 'infusable' => true ) ), - '"_":"FooBarBaz\\\\MockWidget"' + '"_":"MockWidget"' ), ); }
Strip all namespaces from infused PHP widgets This will allow us to put custom MediaWiki specific widgets in their own namespace, but still be able to infuse them. Change-Id: I5d<I>e<I>efc<I>ad<I>c<I>e2b<I>dc
wikimedia_oojs-ui
train
php,php
83f3f3e8baac7cce18da75b187a479744e419700
diff --git a/examples/notifications.rb b/examples/notifications.rb index <HASH>..<HASH> 100644 --- a/examples/notifications.rb +++ b/examples/notifications.rb @@ -13,3 +13,6 @@ client.category_set_user_notification_level(1, notification_level: 3) # mute a topic client.topic_set_user_notification_level(1, notification_level: 0) + +# get user notifications +client.notifications(username: 'discourse') diff --git a/lib/discourse_api/api/notifications.rb b/lib/discourse_api/api/notifications.rb index <HASH>..<HASH> 100644 --- a/lib/discourse_api/api/notifications.rb +++ b/lib/discourse_api/api/notifications.rb @@ -2,8 +2,11 @@ module DiscourseApi module API module Notifications - def notifications - response = get('/notifications.json') + def notifications(params = {}) + params = API.params(params) + .optional(:username, :recent, :limit, :offset, :filter) + + response = get('/notifications.json', params) response[:body] end end
Pass params to get notifications API (#<I>)
discourse_discourse_api
train
rb,rb
f993a24158c832d8c0fc76b63b3bc34074a40e5f
diff --git a/src/Ukey1/ApiClient/Request.php b/src/Ukey1/ApiClient/Request.php index <HASH>..<HASH> 100644 --- a/src/Ukey1/ApiClient/Request.php +++ b/src/Ukey1/ApiClient/Request.php @@ -222,8 +222,7 @@ class Request $this->httpClient = new Client( [ "base_uri" => $this->host, - "timeout" => self::TIMEOUT, - "allow_redirects" => false + "timeout" => self::TIMEOUT ] ); @@ -316,4 +315,4 @@ class Request { return self::USER_AGENT . App::SDK_VERSION . " " . GuzzleHttp\default_user_agent(); } -} \ No newline at end of file +}
Redirects allowed In near future we may change API URL, so it's necessary to allow redirects by default.
asaritech_ukey1-php-sdk
train
php
1822b2a298ac977a52938c57f9607020c56f6d4d
diff --git a/src/host/browser.js b/src/host/browser.js index <HASH>..<HASH> 100644 --- a/src/host/browser.js +++ b/src/host/browser.js @@ -5,8 +5,8 @@ /*#ifndef(UMD)*/ "use strict"; /*global _GPF_HOST*/ // Host types +/*global _gpfBootImplByHost*/ // Boot host specific implementation per host /*global _gpfExit:true*/ // Exit function -/*global _gpfHost*/ // Host type /*global _gpfWebDocument:true*/ // Browser document object /*global _gpfWebWindow:true*/ // Browser window object /*#endif*/ @@ -14,9 +14,9 @@ /*jshint browser: true*/ /*eslint-env browser*/ -/* istanbul ignore next */ // Tested with NodeJS -if (_GPF_HOST.BROWSER === _gpfHost) { +_gpfBootImplByHost[_GPF_HOST.BROWSER] = function () { + /* istanbul ignore next */ // Not testable _gpfExit = function (code) { window.location = "https://arnaudbuchholz.github.io/gpf/exit.html?" + (code || 0); }; @@ -24,4 +24,4 @@ if (_GPF_HOST.BROWSER === _gpfHost) { _gpfWebWindow = window; _gpfWebDocument = document; -} +};
Uses switch pattern to improve coverage / simplify code
ArnaudBuchholz_gpf-js
train
js
11fecafd4bd4eb522ed3f972f9aed20bc4d8a5bc
diff --git a/src/scripts/hubot-phrases.js b/src/scripts/hubot-phrases.js index <HASH>..<HASH> 100644 --- a/src/scripts/hubot-phrases.js +++ b/src/scripts/hubot-phrases.js @@ -38,9 +38,9 @@ module.exports = function Plugin (robot) { this.name = name; this.tidbits = []; this.alias = false; - this.readonly = true; - if ((data.readonly != null) && data.readonly === false) { - this.readonly = false; + this.readonly = false; + if (data.readonly === true) { + this.readonly = data.readonly; } if (data.alias) { this.alias = data.alias;
fix(*): make new facts open by default Since the canEdit stuff doesn't really work without user roles, figured locking down by default doesn't make much sense
halkeye_hubot-phrases
train
js
56f724df3c9f515a1688879298a678f41f38e93c
diff --git a/pybar/daq/fifo_readout.py b/pybar/daq/fifo_readout.py index <HASH>..<HASH> 100644 --- a/pybar/daq/fifo_readout.py +++ b/pybar/daq/fifo_readout.py @@ -100,9 +100,8 @@ class FifoReadout(object): else: fifo_size = self.dut['SRAM']['FIFO_SIZE'] data = self.read_data() - event_selector = logical_or(is_data_record, is_data_header) - events = data[event_selector(data)] - if events.shape[0] != 0: + dh_sr_select = logical_and(is_fe_word, logical_or(is_data_record, is_data_header)) + if np.count_nonzero(dh_sr_select) != 0: logging.warning('SRAM FIFO containing events when starting FIFO readout: FIFO_SIZE = %i', fifo_size) self._words_per_read.clear() if clear_buffer:
ENH: optimize check, reduce memory, check for FE data word
SiLab-Bonn_pyBAR
train
py
d55def28016ecb7ec834ca152a254fb35700193e
diff --git a/bingo/image.py b/bingo/image.py index <HASH>..<HASH> 100644 --- a/bingo/image.py +++ b/bingo/image.py @@ -66,7 +66,7 @@ def get_texts(bingo_fields, font): if bingo_field.is_middle(): text += _("\n{time}\nBingo #{board_id}").format( time=bingo_field.board.get_created(), - board_id=bingo_field.board.id) + board_id=bingo_field.board.board_id) texts.append(Text(draw, font, text)) return texts
fix: show the correct board_id on the images. The correct id is board.board_id and not board.id, as "id" is the internal id assigned by django, and "board_id" is the board number on the current site.
allo-_django-bingo
train
py
9c4dc2ab9ec2fb58c6a2e2fe845e7b25a5496bd6
diff --git a/moco-core/src/main/java/com/github/dreamhead/moco/UnexpectedRequestMatcher.java b/moco-core/src/main/java/com/github/dreamhead/moco/UnexpectedRequestMatcher.java index <HASH>..<HASH> 100644 --- a/moco-core/src/main/java/com/github/dreamhead/moco/UnexpectedRequestMatcher.java +++ b/moco-core/src/main/java/com/github/dreamhead/moco/UnexpectedRequestMatcher.java @@ -1,6 +1,6 @@ package com.github.dreamhead.moco; -public class UnexpectedRequestMatcher implements RequestMatcher { +public final class UnexpectedRequestMatcher implements RequestMatcher { @Override public boolean match(final Request request) { return true;
added missing final to unexpected request matcher
dreamhead_moco
train
java
e5943e6c9021aec91ce8dcad631f7aa382e60a2f
diff --git a/src/Sculpin/Core/Permalink/SourcePermalinkFactory.php b/src/Sculpin/Core/Permalink/SourcePermalinkFactory.php index <HASH>..<HASH> 100644 --- a/src/Sculpin/Core/Permalink/SourcePermalinkFactory.php +++ b/src/Sculpin/Core/Permalink/SourcePermalinkFactory.php @@ -116,7 +116,11 @@ class SourcePermalinkFactory } $permalink = preg_replace('/:filename/', $filename, $permalink); $permalink = preg_replace('/:slug_filename/', $this->normalize($slug ?: $filename), $permalink); - $basename = substr($filename, strrpos($filename, '/')+1); + if (strrpos($filename, '/') !== -1) { + $basename = substr($filename, strrpos($filename, '/')+1); + } else { + $basename = $filename; + } $prettyBasename = substr($basename, 0, strrpos($basename, '.')); $permalink = preg_replace('/:basename/', $basename, $permalink); $permalink = preg_replace('/:pretty_basename/', $prettyBasename, $permalink);
Fixes bug with :basename tag in permalinks When :basename was used for files in the root source directory, one character was removed from the beginning. This fixes this.
sculpin_sculpin
train
php
f9b010a418a9a91d38ecc4c70a741cd5f6c7c455
diff --git a/app/patients/edit/controller.js b/app/patients/edit/controller.js index <HASH>..<HASH> 100644 --- a/app/patients/edit/controller.js +++ b/app/patients/edit/controller.js @@ -520,7 +520,13 @@ export default AbstractEditController.extend(BloodTypes, DOBDays, GenderList, Po }, afterUpdate: function(record) { - this.transitionToRoute('/patients/search/'+record.get('id')); + this.send('openModal', 'dialog', Ember.Object.create({ + title: 'Patient Saved', + message: 'The patient record for %@ has been saved.'.fmt(record.get('displayName')), + hideCancelButton: true, + updateButtonAction: 'ok', + updateButtonText: 'Ok' + })); } }); diff --git a/app/patients/route.js b/app/patients/route.js index <HASH>..<HASH> 100644 --- a/app/patients/route.js +++ b/app/patients/route.js @@ -15,6 +15,9 @@ export default AbstractModuleRoute.extend(PatientId, { modelName: 'patient', moduleName: 'patients', newButtonText: '+ new patient', - sectionTitle: 'Patients' - + sectionTitle: 'Patients', + subActions: [{ + text: 'Patient listing', + linkTo: 'patients.index' + }] }); \ No newline at end of file
Changed patient save workflow Changed to display modal on save instead of redirect to search.
HospitalRun_hospitalrun-frontend
train
js,js
f0eb53a8042f821c22cabc403110772667a690e8
diff --git a/src/mouse.support.js b/src/mouse.support.js index <HASH>..<HASH> 100644 --- a/src/mouse.support.js +++ b/src/mouse.support.js @@ -1,8 +1,8 @@ steal('src/synthetic.js', 'src/mouse.js', function checkSupport(Syn) { if (!document.body) { - Syn.schedule(function() { - checkSupport(Syn); + Syn.schedule(function () { + checkSupport(Syn); }, 1); return; }
Remove extra trailing spaces in mouse.support.js
bitovi_syn
train
js
fa3b90fea03cea88a3f36c9f8d1b974641f46023
diff --git a/src/pubsub.js b/src/pubsub.js index <HASH>..<HASH> 100644 --- a/src/pubsub.js +++ b/src/pubsub.js @@ -63,7 +63,9 @@ module.exports = (common) => { const getTopic = () => 'pubsub-tests-' + Math.random() - describe('callback API', () => { + describe('callback API', function () { + this.timeout(80 * 1000) + let ipfs1 let ipfs2 let ipfs3 @@ -599,7 +601,9 @@ module.exports = (common) => { }) }) - describe('promise API', () => { + describe('promise API', function () { + this.timeout(80 * 1000) + let ipfs1 before((done) => {
chore: increase timeout for CI
ipfs_interface-js-ipfs-core
train
js
0af2127fc345ffc55dc30c40df6c5daf57703383
diff --git a/haversine/__init__.py b/haversine/__init__.py index <HASH>..<HASH> 100644 --- a/haversine/__init__.py +++ b/haversine/__init__.py @@ -21,7 +21,7 @@ def haversine(point1, point2, miles=False): lat2, lng2 = point2 # convert all latitudes/longitudes from decimal degrees to radians - lat1, lng1, lat2, lng2 = list(map(radians, [lat1, lng1, lat2, lng2])) + lat1, lng1, lat2, lng2 = map(radians, (lat1, lng1, lat2, lng2)) # calculate haversine lat = lat2 - lat1
unpack coordinates without building a list
mapado_haversine
train
py
9891e57d084b9b39b4dfb058ff6dd67943c3da3a
diff --git a/routes/index.js b/routes/index.js index <HASH>..<HASH> 100644 --- a/routes/index.js +++ b/routes/index.js @@ -32,6 +32,10 @@ var TEST_AND_DEPLOY = "TEST_AND_DEPLOY"; */ exports.index = function(req, res){ + // Work-around for Safari/Express etags bug on cookie logout. + // Without it, Safari will cache the logged-in version despite logout! + // See https://github.com/Strider-CD/strider/issues/284 + req.headers['if-none-match'] = 'no-match-for-this'; if (req.session.return_to) { var return_to = req.session.return_to req.session.return_to=null
work-around Safari caching logged-in page after logout. this is due to etag weirdness. fixes #<I>.
Strider-CD_strider
train
js
02a175f6d9dbed64a8018fc12c8011270946df4d
diff --git a/src/utils/mixins.js b/src/utils/mixins.js index <HASH>..<HASH> 100644 --- a/src/utils/mixins.js +++ b/src/utils/mixins.js @@ -83,7 +83,7 @@ const on = (el, ev, fn, opts) => { el = el instanceof Array ? el : [el]; for (let i = 0; i < ev.length; ++i) { - el.forEach(elem => elem.addEventListener(ev[i], fn, opts)); + el.forEach(elem => elem && elem.addEventListener(ev[i], fn, opts)); } }; @@ -92,7 +92,7 @@ const off = (el, ev, fn, opts) => { el = el instanceof Array ? el : [el]; for (let i = 0; i < ev.length; ++i) { - el.forEach(elem => elem.removeEventListener(ev[i], fn, opts)); + el.forEach(elem => elem && elem.removeEventListener(ev[i], fn, opts)); } };
Add checks in on/off mixins
artf_grapesjs
train
js
ab20785210eeb07dbdc550d0aceccfeabfcb9892
diff --git a/website/config.rb b/website/config.rb index <HASH>..<HASH> 100644 --- a/website/config.rb +++ b/website/config.rb @@ -2,7 +2,7 @@ set :base_url, "https://www.consul.io/" activate :hashicorp do |h| h.name = "consul" - h.version = "1.7.0" + h.version = "1.7.1" h.github_slug = "hashicorp/consul" end
Update Consul version on website to <I>
hashicorp_consul
train
rb