Updates to customize rails / ruby and mySQL version compatibility #323

sashadev-sky · 2019-02-06T18:18:35Z

Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!

tests pass -- rake test
code has been rebased on top of latest master (check if another pull request was added recently, and please rebase)
pull request is descriptively named and, if possible, multiple commits squashed if they're smaller changes

Thanks!

welcome · 2019-02-06T18:18:38Z

Thanks for opening this pull request! Dangerbot will test out your code and reply in a bit with some pointers and requests.
There may be some errors, but don't worry! We're here to help! 👍🎉😄

sashadev-sky · 2019-02-06T18:32:20Z

@jywarren Sorry, I ended up squishing two requests in this one merge. I had made the other change when I first was setting up the DB and none of the tests would run unless I added it.

Apparently MySQL 5.7 no longer supports null default values for the primary key, but you can override it. see here

If you feel they need to be reviewed separately I would be happy to redo the PRs

jywarren · 2019-02-06T20:00:07Z

config/initializers/column_definition.rb

@@ -0,0 +1,5 @@
+class ActiveRecord::ConnectionAdapters::ColumnDefinition


Could we leave a comment here for future folks to explain why we're providing this customization? Perhaps at some point it could be removed, so we want some kind of trace back. Thanks!

So far made comments for this one, next two will be done today. Feel free to commit any changes to it.

Let's just also be sure it's clear if we need to remove any of this code in future versions of Rails, Ruby... thanks!

@jywarren for this one I would consider just updating your sql. The error happens when using MySQL5.7 and MapKnitter still uses 5.6. The only reason I discovered this error is bc for macOS installation (either with homebrew or MySQL community server) the default version is 8 and I had not downgraded it yet. So this file will have to be here always in case you ever update the MySQL version

It could be worth it to just fix. If I remember correctly it was the annotations table and there were only 3 errors thrown. And the errors were caused by using DEFAULT NULL which throws error starting from MySQL5.7

I left the file here anyway because likely other people might use a later version by accident and would get the error

OK great, so we might leave a comment by the mysql version as configured in MapKnitter, so that if we upgrade it (and seems likely that we will soon) we can know.

OR, we could just change the default to something other than NULL...

OK, so let's:

change DEFAULT NULL

leave comment here with a copy of the error that it solves (and a link back to this PR)

look at upgrading mysql version

Once the comment is added (2) would this be ready to merge? Thanks Sasha, great work!

Actually just added:

# This can also be removed if DEFAULT NULL is removed from all columns; # Read more at https://github.com/publiclab/mapknitter/pull/323

I think we're good although we can open an issue for "changing DEFAULT NULL in a new migration" and also for upgrading mysql!

It's not in the migration its in the actual SQL code. Would it be easier to just update it directly there then in a migration?

Sure, once we merge this, I can open a separate issue about updating DEFAULT NULL and upgrading mysql. If we're going to upgrade we should maybe try to do it before more people start contributing because having multiple versions of MySQL on your computer can create issues and then they are difficult to get rid of. At least that was the experience for me.

Just need to add the comments for the other 2 and then were good to go!

Agreed re upgrading soon!

grvsachdeva · 2019-02-07T23:38:38Z

I tried your PR locally and all the mysql errors gone-

Tests passed
I faced error while performing bundle exec rake db:setup on main branch, but those errors are not visible while doing setup on your branch

Great work @sashadev-sky !!!

I guess others can also start on this repo after this PR gets merge.

sashadev-sky · 2019-02-08T15:10:03Z

@gauravano Yes I think once we merge this and also I think we need to upload specific setup instructions for macOS users. Because the core dependencies - both client and server- aren't available for macOS. and there are 2 alternatives we can use and the setup for both is a little complicated

grvsachdeva · 2019-02-08T22:50:01Z

@sashadev-sky, updating setup instructions sounds good. I use Ubuntu so I can update that section, I also want to add some links related to MySQL installation in readme which helped me and in installation issue I see some users are also facing the similar issues.

Thanks!

sashadev-sky · 2019-02-08T23:59:54Z

@gauravano Yeah I can contribute to the macOS instructions but it was my first time downloading MySQL so i'm trying to sort out the "trial" from the "error" in my initial attempts. Then I will find another user with macOS to do a test run

sashadev-sky · 2019-02-09T06:38:11Z

@jywarren please see if you are ok with the new comments!

welcome · 2019-02-09T13:52:38Z

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to https://mapknitter.org in the next few days.
In the meantime, can you tell us your Twitter handle so we can thank you properly?
Now that you've completed this, you can help someone else take their first step!
See: Public Lab's coding community!

jywarren · 2019-02-09T13:53:15Z

🙌🏽

* ruby version update * change in dockerfile * version change to 2.4.4 * dockerfile fix * Update Dockerfile * Update Dockerfile * Update Dockerfile * [Security] Bump i18n from 0.7.0 to 0.9.5 (#289) Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump rdiscount from 2.1.7.1 to 2.2.0.1 (#321) Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Unit test warpable code (#331) * tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions * Bump recaptcha from 4.6.3 to 4.9.0 (#332) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Show only maps with at least one image in main listing * Update Leaflet.DistortableImage version * basic map unit tests (#334) * basic map unit tests * try to run entire map.run_export * parameter consolidation * Updates to customize rails / ruby and mySQL version compatibility (#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word * update readme.md (#335) solve the beginner issue of database * ruby version update * change in dockerfile * version change to 2.4.4 * dockerfile fix * Update Dockerfile * Update Dockerfile * Update Dockerfile * gemfile.lock update * gemfile.lock update

* Show only maps with at least one image in main listing * Update Leaflet.DistortableImage version * Create first timers issue template.md * Create config.yml * spam links in moderation feeds * Add mapknitter to the help wanted link Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Replace the community link with the code.public link Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Update the first time only link to code.public Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Use the correct link to indicate where the code will be published Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Update index.html.erb * Update bower.json * Update bower.json * Update bower.json * Peg GoogleMutant layer to v0.7.0 see https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant/issues/90 for the issue we encountered with `v0.7.1` * [Security] Bump nokogiri from 1.8.1 to 1.9.1 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.1 to 1.9.1. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.8.1...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump will_paginate from 3.0.7 to 3.1.6 Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.0.7 to 3.1.6. - [Release notes](https://github.com/mislav/will_paginate/releases) - [Commits](mislav/will_paginate@v3.0.7...v3.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com> * Cleanup (#313) * initial cleanup * export unit tests, basic * map tests * basic comment tests * cleanup * export functional tests * fixes * Update export.rb * test fixes and further cleanup * extra test * trying again * another unit test * output errors? * Update map_test.rb * Update maps.yml * Update tag_test.rb * Bump rake from 10.5.0 to 12.3.2 (#286) Bumps [rake](https://github.com/ruby/rake) from 10.5.0 to 12.3.2. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](ruby/rake@v10.5.0...v12.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com> * [Security] Bump i18n from 0.7.0 to 0.9.5 (#289) Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump rdiscount from 2.1.7.1 to 2.2.0.1 (#321) Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Unit test warpable code (#331) * tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions * Bump recaptcha from 4.6.3 to 4.9.0 (#332) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * basic map unit tests (#334) * basic map unit tests * try to run entire map.run_export * parameter consolidation * Updates to customize rails / ruby and mySQL version compatibility (#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word * Change navbar to use the same layout as Public Lab MapKnitter is currently using a totally diferent navbar from Public Lab. Making both using the same makes it easier to follow the pattern in future projects * Add Bootstrap 4 to project * Redo navbar for Bootstrap 3.2.0 version

* Contribute Dockerfile for working within a container * Initial change made. * .travis.yml schema example docker compose more adjustmentes new docker-compose * slight adjustment to docker-compose.yml * path fix * bower.json * bower.json openlayers * bower.json openlayers tweak 2 * added rake * Gemfile version tweak * updated gemfile and Gemfile.lock * bundle exec * testing map map for only non-anonymous * echoing gem list to debug * rvm * additional travis.yml tweaks * Update .travis.yml * Allow bundler to use system gems. * Added mysql2 adapter dependency, tweaked database.yml and travis.yml * Added mysql2 adapter, longer wait for db * Update _list.html.erb * Update _list.html.erb * Update maps_controller.rb * Update feeds_controller.rb * Update Gemfile * Update Gemfile * Update .travis.yml * Update database.yml.example * recaptcha tweaks * Update _list.html.erb * Update routes.rb * Update maps_controller.rb * Update clean.builder * Update clean.builder * leaflet v1.0 * dockerfile fix * updating to Leaflet 1.0, GoogleMutant tile layer, other tweaks * js tweaks * update gemfile recaptcha version * Gemfile.lock * unrelated tweaks * Update Readme.md Just a space for identifying syntax * recaptcha fixes * fixes * Upgrade dependencies. * updated paperclip * issue publiclab#253 flag as spam * integrate image-sequencer * Update knitter2.html.erb * Update bower.json * Update show.html.erb * Update show.html.erb * Update show.html.erb * Update bower.json * modded button and prompt * Update _list.html.erb * API request handled for region-action * more efficient spam redirect URL * Update Map.js * Update _login_form.html.erb * Add files via upload * Update README.md * bower updated * Map added * Update index.html.erb * Update _list.html.erb * Update index.html.erb * Update index.html.erb * Changed width to full width . * Added all layers from leaflet-environmental-layers * Update bower.json * Default Mapknitter Markers added * Version updated for LEL . * Full screen support added * Update bower.json * Create first timers issue template.md * Create config.yml * spam links in moderation feeds * Add mapknitter to the help wanted link Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Replace the community link with the code.public link Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Update the first time only link to code.public Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Use the correct link to indicate where the code will be published Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Update index.html.erb * Update bower.json * Update bower.json * Update bower.json * Peg GoogleMutant layer to v0.7.0 see https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant/issues/90 for the issue we encountered with `v0.7.1` * [Security] Bump nokogiri from 1.8.1 to 1.9.1 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.1 to 1.9.1. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.8.1...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump will_paginate from 3.0.7 to 3.1.6 Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.0.7 to 3.1.6. - [Release notes](https://github.com/mislav/will_paginate/releases) - [Commits](mislav/will_paginate@v3.0.7...v3.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com> * Cleanup (publiclab#313) * initial cleanup * export unit tests, basic * map tests * basic comment tests * cleanup * export functional tests * fixes * Update export.rb * test fixes and further cleanup * extra test * trying again * another unit test * output errors? * Update map_test.rb * Update maps.yml * Update tag_test.rb * Bump rake from 10.5.0 to 12.3.2 (publiclab#286) Bumps [rake](https://github.com/ruby/rake) from 10.5.0 to 12.3.2. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](ruby/rake@v10.5.0...v12.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com> * [Security] Bump i18n from 0.7.0 to 0.9.5 (publiclab#289) Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump rdiscount from 2.1.7.1 to 2.2.0.1 (publiclab#321) Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Unit test warpable code (publiclab#331) * tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions * Bump recaptcha from 4.6.3 to 4.9.0 (publiclab#332) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Show only maps with at least one image in main listing * Update Leaflet.DistortableImage version * basic map unit tests (publiclab#334) * basic map unit tests * try to run entire map.run_export * parameter consolidation * Updates to customize rails / ruby and mySQL version compatibility (publiclab#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word * update readme.md (publiclab#335) solve the beginner issue of database * Ruby upgrade to 2.4.4 (publiclab#320) * ruby version update * change in dockerfile * version change to 2.4.4 * dockerfile fix * Update Dockerfile * Update Dockerfile * Update Dockerfile * [Security] Bump i18n from 0.7.0 to 0.9.5 (publiclab#289) Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump rdiscount from 2.1.7.1 to 2.2.0.1 (publiclab#321) Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Unit test warpable code (publiclab#331) * tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions * Bump recaptcha from 4.6.3 to 4.9.0 (publiclab#332) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Show only maps with at least one image in main listing * Update Leaflet.DistortableImage version * basic map unit tests (publiclab#334) * basic map unit tests * try to run entire map.run_export * parameter consolidation * Updates to customize rails / ruby and mySQL version compatibility (publiclab#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word * update readme.md (publiclab#335) solve the beginner issue of database * ruby version update * change in dockerfile * version change to 2.4.4 * dockerfile fix * Update Dockerfile * Update Dockerfile * Update Dockerfile * gemfile.lock update * gemfile.lock update * Fix map of maps (publiclab#354) * add image urls to maps json (publiclab#352) * add image urls to maps json * Add tests for image urls * Shortening docker image in ~30% * Caching bundle, gathering env variables and using newer sintax * Creating startup script and env file * Improving travis CI configuration * Switch to Yarn from Bower Ref: publiclab#357 Co-authored-by: kaunair <kaustubh.nair108@gmail.com> * Loading assets in production env * Allow uglifier to interpret ES6, removing yarn-error.log * updating to rails4.2.8

…bliclab#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word

* ruby version update * change in dockerfile * version change to 2.4.4 * dockerfile fix * Update Dockerfile * Update Dockerfile * Update Dockerfile * [Security] Bump i18n from 0.7.0 to 0.9.5 (publiclab#289) Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump rdiscount from 2.1.7.1 to 2.2.0.1 (publiclab#321) Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Unit test warpable code (publiclab#331) * tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions * Bump recaptcha from 4.6.3 to 4.9.0 (publiclab#332) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Show only maps with at least one image in main listing * Update Leaflet.DistortableImage version * basic map unit tests (publiclab#334) * basic map unit tests * try to run entire map.run_export * parameter consolidation * Updates to customize rails / ruby and mySQL version compatibility (publiclab#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word * update readme.md (publiclab#335) solve the beginner issue of database * ruby version update * change in dockerfile * version change to 2.4.4 * dockerfile fix * Update Dockerfile * Update Dockerfile * Update Dockerfile * gemfile.lock update * gemfile.lock update

* Show only maps with at least one image in main listing * Update Leaflet.DistortableImage version * Create first timers issue template.md * Create config.yml * spam links in moderation feeds * Add mapknitter to the help wanted link Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Replace the community link with the code.public link Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Update the first time only link to code.public Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Use the correct link to indicate where the code will be published Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Update index.html.erb * Update bower.json * Update bower.json * Update bower.json * Peg GoogleMutant layer to v0.7.0 see https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant/issues/90 for the issue we encountered with `v0.7.1` * [Security] Bump nokogiri from 1.8.1 to 1.9.1 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.1 to 1.9.1. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.8.1...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump will_paginate from 3.0.7 to 3.1.6 Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.0.7 to 3.1.6. - [Release notes](https://github.com/mislav/will_paginate/releases) - [Commits](mislav/will_paginate@v3.0.7...v3.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com> * Cleanup (publiclab#313) * initial cleanup * export unit tests, basic * map tests * basic comment tests * cleanup * export functional tests * fixes * Update export.rb * test fixes and further cleanup * extra test * trying again * another unit test * output errors? * Update map_test.rb * Update maps.yml * Update tag_test.rb * Bump rake from 10.5.0 to 12.3.2 (publiclab#286) Bumps [rake](https://github.com/ruby/rake) from 10.5.0 to 12.3.2. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](ruby/rake@v10.5.0...v12.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com> * [Security] Bump i18n from 0.7.0 to 0.9.5 (publiclab#289) Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump rdiscount from 2.1.7.1 to 2.2.0.1 (publiclab#321) Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Unit test warpable code (publiclab#331) * tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions * Bump recaptcha from 4.6.3 to 4.9.0 (publiclab#332) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * basic map unit tests (publiclab#334) * basic map unit tests * try to run entire map.run_export * parameter consolidation * Updates to customize rails / ruby and mySQL version compatibility (publiclab#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word * Change navbar to use the same layout as Public Lab MapKnitter is currently using a totally diferent navbar from Public Lab. Making both using the same makes it easier to follow the pattern in future projects * Add Bootstrap 4 to project * Redo navbar for Bootstrap 3.2.0 version

jywarren reviewed Feb 6, 2019

View reviewed changes

jywarren mentioned this pull request Feb 6, 2019

Ruby upgrade to 2.4.4 #320

Merged

3 tasks

sashadev-sky changed the title ~~update time fixtures and override sql primary default keys~~ Updates to customize rails / ruby version compatibility Feb 7, 2019

sashadev-sky changed the title ~~Updates to customize rails / ruby version compatibility~~ Updates to customize rails / ruby and mySQL version compatibility Feb 7, 2019

sashadev-sky force-pushed the fix-timestamp branch from daf99ca to 174266f Compare February 9, 2019 00:27

update time fixtures and override sql primary default keys

e6f66b0

sashadev-sky force-pushed the fix-timestamp branch from 2fafe71 to d1ae68a Compare February 9, 2019 02:58

Reset HEAD to first commit and reapply changes

29e50a0

sashadev-sky force-pushed the fix-timestamp branch from d1ae68a to 29e50a0 Compare February 9, 2019 03:14

Finalize comments for customizations

cfed1cd

Changed a word

08b6b6f

jywarren approved these changes Feb 9, 2019

View reviewed changes

jywarren merged commit de15628 into publiclab:main Feb 9, 2019

sashadev-sky deleted the fix-timestamp branch June 13, 2019 04:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates to customize rails / ruby and mySQL version compatibility #323

Updates to customize rails / ruby and mySQL version compatibility #323

sashadev-sky commented Feb 6, 2019 •

edited

Loading

welcome bot commented Feb 6, 2019

sashadev-sky commented Feb 6, 2019

jywarren Feb 6, 2019

sashadev-sky Feb 7, 2019

jywarren Feb 7, 2019

sashadev-sky Feb 8, 2019

jywarren Feb 8, 2019

jywarren Feb 8, 2019

sashadev-sky Feb 9, 2019 •

edited

Loading

jywarren Feb 9, 2019

grvsachdeva commented Feb 7, 2019

sashadev-sky commented Feb 8, 2019

grvsachdeva commented Feb 8, 2019

sashadev-sky commented Feb 8, 2019

sashadev-sky commented Feb 9, 2019

welcome bot commented Feb 9, 2019

jywarren commented Feb 9, 2019

		@@ -0,0 +1,5 @@
		class ActiveRecord::ConnectionAdapters::ColumnDefinition

Updates to customize rails / ruby and mySQL version compatibility #323

Updates to customize rails / ruby and mySQL version compatibility #323

Conversation

sashadev-sky commented Feb 6, 2019 • edited Loading

welcome bot commented Feb 6, 2019

sashadev-sky commented Feb 6, 2019

jywarren Feb 6, 2019

Choose a reason for hiding this comment

sashadev-sky Feb 7, 2019

Choose a reason for hiding this comment

jywarren Feb 7, 2019

Choose a reason for hiding this comment

sashadev-sky Feb 8, 2019

Choose a reason for hiding this comment

jywarren Feb 8, 2019

Choose a reason for hiding this comment

jywarren Feb 8, 2019

Choose a reason for hiding this comment

sashadev-sky Feb 9, 2019 • edited Loading

Choose a reason for hiding this comment

jywarren Feb 9, 2019

Choose a reason for hiding this comment

grvsachdeva commented Feb 7, 2019

sashadev-sky commented Feb 8, 2019

grvsachdeva commented Feb 8, 2019

sashadev-sky commented Feb 8, 2019

sashadev-sky commented Feb 9, 2019

welcome bot commented Feb 9, 2019

jywarren commented Feb 9, 2019

sashadev-sky commented Feb 6, 2019 •

edited

Loading

sashadev-sky Feb 9, 2019 •

edited

Loading