summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixes for 1.9 and 2.0lcg/fix-force-encodingLamont Granquist2016-01-051-2/+2
| | | | | this is kind of shitty code, but once 2.0 and 1.9 are dropped and we can use #scrub then all the shitty code can go away...
* trying to fix 1.9/2.0Lamont Granquist2016-01-051-2/+2
|
* use new ruby #scrub method where availableLamont Granquist2016-01-052-3/+16
|
* make sure utf-8 cleaning doesn't grow without boundsLamont Granquist2016-01-051-0/+7
| | | | | | we had a bug where we'd inject utf-8 characters that we'd mangle and then replace with even more utf-8 characters so that any normal attrs would grow without bounds with lots of utf-8 '?' characters.
* fix validate_utf8: false encoding coercionLamont Granquist2016-01-052-2/+8
| | | | | | | | | the string we get back from ffi is tagged as ascii encoded by default, so we must force encode it first. then we don't want to convert from binary to utf-8 since that will wind up mangling all the utf-8 characters, we want to convert from utf-8 to utf-8 while replacing invalid characters.
* add CHANGELOG.md updatesLamont Granquist2015-09-221-0/+9
|
* Merge pull request #73 from chef/lcg/drop-193Lamont Granquist2015-09-222-6/+1
|\ | | | | Remove ruby 1.9.2 support
| * Remove ruby 1.9.2 supportLamont Granquist2015-09-222-6/+1
| |
* | Merge pull request #72 from chef/lcg/auto-changelogLamont Granquist2015-09-223-89/+107
|\ \ | |/ |/| Use github-changelog-generator to generate CHANGELOG.md file
| * add Rake tasklcg/auto-changelogLamont Granquist2015-09-223-50/+11
| |
| * fixing some old entriesLamont Granquist2015-09-221-31/+10
| |
| * autogenerated changelogLamont Granquist2015-09-221-85/+163
|/
* bumping to 2.2.2 for release2.2.2Lamont Granquist2015-07-151-1/+1
|
* update CHANGELOG for 2.2.2Lamont Granquist2015-07-151-1/+11
|
* Merge pull request #69 from chef/lcg/fix-uninit-constantLamont Granquist2015-07-151-0/+4
|\ | | | | fix uninitialized constant errors
| * fix uninitialized constant errorslcg/fix-uninit-constantLamont Granquist2015-07-151-0/+4
|/ | | | | c extension needs stringio and date required first in order to find those constants.
* bump version for release2.2.1Lamont Granquist2015-07-131-1/+1
|
* add CHANGELOG entries for releasLamont Granquist2015-07-131-1/+11
|
* Merge pull request #68 from chef/lcg/more-copsLamont Granquist2015-07-1021-399/+287
|\ | | | | Lcg/more cops
| * rubocop on 2.2 needs to ignore this lineLamont Granquist2015-07-101-1/+1
| | | | | | | | it breaks 1.9 through 2.1 when rubocop fixes it.
| * ruby 1.9/2.0/2.1 have unicode symbol issuesLamont Granquist2015-07-101-1/+1
| |
| * down to zero offensesLamont Granquist2015-07-1014-316/+204
| | | | | | | | but 30 cops disabled, lol...
| * yet more copslcg/more-copsLamont Granquist2015-07-0914-60/+62
| |
| * some more cop fixesLamont Granquist2015-07-097-17/+22
| |
| * eliminate Rescue ExceptionLamont Granquist2015-07-096-23/+16
|/
* Merge pull request #67 from chef/lcg/fix-superclass-in-extLamont Granquist2015-07-092-6/+9
|\ | | | | fix superclass mismatch on rbx in c ext
| * stop ignoring rbx failuresLamont Granquist2015-07-091-2/+0
| |
| * fix other possible superclass mismatchesLamont Granquist2015-07-091-4/+7
| |
| * fix superclass mismatch on rbx in c extLamont Granquist2015-07-091-1/+3
|/
* Merge pull request #66 from chef/lcg/rubocopLamont Granquist2015-07-0928-202/+191
|\ | | | | Lcg/rubocop
| * fix rubocop symbolLamont Granquist2015-07-091-1/+1
| |
| * remaining autofixable copsLamont Granquist2015-07-0913-73/+72
| |
| * fix lots of copsLamont Granquist2015-07-0925-131/+121
|/ | | | and add a few more to be ignored
* Merge pull request #65 from chef/fix_requireLamont Granquist2015-07-021-1/+1
|\ | | | | Fix require in readme
| * Fix require in readmefix_requireThom May2015-07-021-1/+1
|/ | | closes #63
* Merge pull request #59 from kou/suppress-method-redefined-warningsLamont Granquist2015-06-221-1/+2
|\ | | | | Suppress method redefined warnings
| * Suppress method redefined warningsKouhei Sutou2015-05-211-1/+2
| | | | | | | | | | | | | | % FORCE_FFI_YAJL=ffi ruby -w -I lib -e 'require "ffi_yajl"' lib/ffi_yajl/parser.rb:33: warning: method redefined; discarding old stack lib/ffi_yajl/parser.rb:40: warning: method redefined; discarding old key_stack ...
* | Merge pull request #64 from chef/uninitialized-variable-in-extLamont Granquist2015-06-221-0/+1
|\ \ | | | | | | Fix uninitialized instance variable when using ext
| * | Fix uninitialized instance variable when using extuninitialized-variable-in-extdanielsdeleo2015-06-191-0/+1
|/ /
* | Merge pull request #62 from kou/fix-superclass-mismatch-for-stringioLamont Granquist2015-05-271-1/+4
|\ \ | | | | | | Fix superclass mismatch for class StringIO
| * | Ensure DateTime defined instead of specifying super classKouhei Sutou2015-05-271-1/+2
| | |
| * | Fix superclass mismatch for class StringIOKouhei Sutou2015-05-271-0/+2
|/ / | | | | | | | | | | % ruby -I lib -r ffi_yajl/ffi -r stringio -e '' /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require': superclass mismatch for class StringIO (TypeError) from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
* | Merge pull request #61 from kou/suppress-asigned-but-unused-variable-warningsLamont Granquist2015-05-241-1/+0
|\ \ | | | | | | Suppress assigned but unused variable warning
| * | Suppress assigned but unused variable warningKouhei Sutou2015-05-211-1/+0
| |/ | | | | | | | | | | % FORCE_FFI_YAJL=ffi ruby -w -I lib -e 'require "ffi_yajl"' ... lib/ffi_yajl/ffi/encoder.rb:56: warning: assigned but unused variable - length
* | Merge pull request #60 from kou/suppress-circular-require-warningsLamont Granquist2015-05-242-4/+0
|\ \ | |/ |/| Suppress circular require warnings
| * Suppress circular require warningsKouhei Sutou2015-05-212-4/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | % FORCE_FFI_YAJL=ffi ruby -w -I lib -e 'require "ffi_yajl"' ... /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55: warning: loading in progress, circular require considered harmful - lib/ffi_yajl/ffi.rb from -e:1:in `<main>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl.rb:40:in `<top (required)>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl/ffi.rb:144:in `<top (required)>' from lib/ffi_yajl/ffi.rb:145:in `<module:FFI_Yajl>' from lib/ffi_yajl/ffi.rb:146:in `<class:Parser>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl/ffi/parser.rb:23:in `<top (required)>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' lib/ffi_yajl/ffi/encoder.rb:56: warning: assigned but unused variable - length /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55: warning: loading in progress, circular require considered harmful - lib/ffi_yajl/ffi.rb from -e:1:in `<main>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl.rb:40:in `<top (required)>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl/ffi.rb:144:in `<top (required)>' from lib/ffi_yajl/ffi.rb:150:in `<module:FFI_Yajl>' from lib/ffi_yajl/ffi.rb:151:in `<class:Encoder>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl/ffi/encoder.rb:23:in `<top (required)>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' ...
* Merge pull request #58 from AaronLasseigne/patch-1Thom May2015-05-111-3/+3
|\ | | | | fix parse error in travis.yml
| * fix parse error in travis.ymlAaron Lasseigne2015-05-091-3/+3
|/ | | Having one space before "branches:" causes `YAML.load` to throw a syntax parse error.
* removing whitespace, testing travisLamont Granquist2015-05-051-1/+0
|
* add master to whitelistLamont Granquist2015-05-051-0/+3
|
View Lorry Controller Status