Commit Graph

4221 Commits

Author SHA1 Message Date
Andrew Brown
57187eb916 almost had it 2019-06-03 18:44:31 -05:00
Andrew Brown
eba71ae424 cross fingers on this dope merge hell 2019-06-03 18:42:42 -05:00
Andrew Brown
f96dd0cb84 db migrate 2019-06-03 18:36:53 -05:00
Andrew Brown
0267272dad show scope notice on content#index pages 2019-06-03 18:29:36 -05:00
Andrew Brown
43ffa14afe
Merge pull request #397 from indentlabs/dependabot/bundler/aws-sdk-s3-1.41.0
Bump aws-sdk-s3 from 1.30.1 to 1.41.0
2019-06-03 15:51:21 -07:00
Andrew Brown
5f4025b857
Merge pull request #391 from indentlabs/dependabot/bundler/rmagick-3.1.0
Bump rmagick from 2.16.0 to 3.1.0
2019-06-03 15:50:57 -07:00
Andrew Brown
2496f1e30c
Merge pull request #394 from indentlabs/dependabot/bundler/factory_bot_rails-5.0.2
Bump factory_bot_rails from 4.11.1 to 5.0.2
2019-06-03 15:42:35 -07:00
Andrew Brown
1ed79dae06
Merge pull request #395 from indentlabs/dependabot/bundler/tzinfo-data-1.2019.1
Bump tzinfo-data from 1.2018.9 to 1.2019.1
2019-06-03 15:41:59 -07:00
Andrew Brown
ebe0ac16fd
Merge pull request #396 from indentlabs/dependabot/bundler/shoulda-matchers-4.0.1
Bump shoulda-matchers from 3.1.2 to 4.0.1
2019-06-03 15:41:33 -07:00
dependabot-preview[bot]
2961560dac
Bump shoulda-matchers from 3.1.2 to 4.0.1
Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 3.1.2 to 4.0.1.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/master/NEWS.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v3.1.2...v4.0.1)
2019-06-03 22:40:58 +00:00
Andrew Brown
743b372251
Merge pull request #398 from indentlabs/dependabot/bundler/sidekiq-5.2.7
Bump sidekiq from 5.2.5 to 5.2.7
2019-06-03 15:39:22 -07:00
Andrew Brown
639b6fb4a6
Merge pull request #399 from indentlabs/dependabot/bundler/acts_as_list-0.9.19
Bump acts_as_list from 0.9.17 to 0.9.19
2019-06-03 15:38:56 -07:00
Andrew Brown
9051101856
Merge pull request #400 from indentlabs/dependabot/bundler/puma-3.12.1
Bump puma from 3.12.0 to 3.12.1
2019-06-03 15:38:23 -07:00
Andrew Brown
bab4deb75e shorten notice just a tiny bit 2019-06-03 17:37:25 -05:00
Andrew Brown
89aff37ffb
Merge pull request #401 from indentlabs/dependabot/bundler/font-awesome-rails-4.7.0.5
Bump font-awesome-rails from 4.7.0.4 to 4.7.0.5
2019-06-03 15:33:46 -07:00
Andrew Brown
c152946981
Merge pull request #385 from indentlabs/dependabot/bundler/newrelic_rpm-6.4.0.356
Bump newrelic_rpm from 5.7.0.350 to 6.4.0.356
2019-06-03 14:06:28 -07:00
dependabot-preview[bot]
09acd6c73f
Bump font-awesome-rails from 4.7.0.4 to 4.7.0.5
Bumps [font-awesome-rails](https://github.com/bokmann/font-awesome-rails) from 4.7.0.4 to 4.7.0.5.
- [Release notes](https://github.com/bokmann/font-awesome-rails/releases)
- [Changelog](https://github.com/bokmann/font-awesome-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bokmann/font-awesome-rails/compare/v4.7.0.4...v4.7.0.5)
2019-06-03 11:02:47 +00:00
dependabot-preview[bot]
a19a037025
Bump puma from 3.12.0 to 3.12.1
Bumps [puma](https://github.com/puma/puma) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.12.0...v3.12.1)
2019-06-03 11:02:14 +00:00
dependabot-preview[bot]
ab1263b010
Bump acts_as_list from 0.9.17 to 0.9.19
Bumps [acts_as_list](https://github.com/swanandp/acts_as_list) from 0.9.17 to 0.9.19.
- [Release notes](https://github.com/swanandp/acts_as_list/releases)
- [Changelog](https://github.com/swanandp/acts_as_list/blob/master/CHANGELOG.md)
- [Commits](https://github.com/swanandp/acts_as_list/compare/v0.9.17...v0.9.19)
2019-06-03 11:01:41 +00:00
dependabot-preview[bot]
45e874bd44
Bump sidekiq from 5.2.5 to 5.2.7
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.5 to 5.2.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.5...v5.2.7)
2019-06-03 11:01:04 +00:00
dependabot-preview[bot]
da0dfb1648
Bump aws-sdk-s3 from 1.30.1 to 1.41.0
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.30.1 to 1.41.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.30.1...v1.41.0)
2019-06-03 11:00:35 +00:00
dependabot-preview[bot]
73b2b2b7b6
Bump tzinfo-data from 1.2018.9 to 1.2019.1
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1)
2019-06-03 10:59:16 +00:00
dependabot-preview[bot]
66da981b22
Bump factory_bot_rails from 4.11.1 to 5.0.2
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 4.11.1 to 5.0.2.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.11.1...v5.0.2)
2019-06-03 10:58:41 +00:00
Andrew Brown
d510682dd3 fix food color 2019-06-01 01:11:02 -05:00
Andrew Brown
fae8a75599 add links to new forums 2019-06-01 01:06:46 -05:00
Andrew Brown
d7bf8de903 default values for aws in dev 2019-06-01 00:56:52 -05:00
Andrew Brown
029b9f9126
Merge pull request #383 from indentlabs/dependabot/bundler/sqlite3-1.4.1
Bump sqlite3 from 1.3.13 to 1.4.1
2019-05-31 22:52:01 -07:00
dependabot-preview[bot]
93c060f748
Bump sqlite3 from 1.3.13 to 1.4.1
Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.3.13 to 1.4.1.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.rdoc)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.3.13...v1.4.1)
2019-06-01 05:50:06 +00:00
Andrew Brown
3aad969b9b
Merge pull request #386 from indentlabs/dependabot/bundler/redis-4.1.2
Bump redis from 4.1.1 to 4.1.2
2019-05-31 22:48:53 -07:00
Andrew Brown
782392bd7b
Merge pull request #384 from indentlabs/dependabot/bundler/stripe-4.18.1
Bump stripe from 4.18.0 to 4.18.1
2019-05-31 22:48:40 -07:00
dependabot-preview[bot]
19758cdefd
Bump redis from 4.1.1 to 4.1.2
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.1...v4.1.2)
2019-06-01 05:48:02 +00:00
Andrew Brown
4230584cd2
Merge pull request #387 from indentlabs/dependabot/bundler/meta-tags-2.11.1
Bump meta-tags from 2.11.0 to 2.11.1
2019-05-31 22:47:45 -07:00
Andrew Brown
5a34db5395
Merge pull request #388 from indentlabs/dependabot/bundler/selenium-webdriver-3.142.3
Bump selenium-webdriver from 3.141.0 to 3.142.3
2019-05-31 22:46:54 -07:00
Andrew Brown
808c6c1e9e
Merge pull request #389 from indentlabs/dependabot/bundler/capybara-3.22.0
Bump capybara from 3.12.0 to 3.22.0
2019-05-31 22:46:43 -07:00
dependabot-preview[bot]
4b8654e079
Bump selenium-webdriver from 3.141.0 to 3.142.3
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.141.0 to 3.142.3.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)
2019-06-01 05:45:44 +00:00
Andrew Brown
21c2f5db9c
Merge pull request #390 from indentlabs/dependabot/bundler/csv-3.1.1
Bump csv from 3.0.3 to 3.1.1
2019-05-31 22:44:50 -07:00
Andrew Brown
226ee34f62
Merge pull request #392 from indentlabs/dependabot/bundler/chartkick-3.1.0
Bump chartkick from 3.0.2 to 3.1.0
2019-05-31 22:44:10 -07:00
Andrew Brown
ba43d9b583 allow premium users to contribute premium pages to non-premium universes 2019-06-01 00:40:20 -05:00
Andrew Brown
70684c51a7
Merge pull request #381 from indentlabs/image-audits
fix viewing image uploads in dev environments
2019-05-31 22:32:41 -07:00
Andrew Brown
6989b041a9 fix 500 on user delete 2019-06-01 00:13:04 -05:00
Andrew Brown
b74907ab69 include link 2019-06-01 00:10:17 -05:00
Andrew Brown
b9c4037734
Merge pull request #393 from indentlabs/new-pages
New pages: Foods, Sports, Schools
2019-05-31 22:06:29 -07:00
Andrew Brown
54f19759da back to our fork 2019-05-31 23:39:35 -05:00
dependabot-preview[bot]
bd7ecbb2ae
Bump chartkick from 3.0.2 to 3.1.0
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v3.0.2...v3.1.0)
2019-05-31 10:45:23 +00:00
dependabot-preview[bot]
9133dac9b0
Bump rmagick from 2.16.0 to 3.1.0
Bumps [rmagick](https://github.com/rmagick/rmagick) from 2.16.0 to 3.1.0.
- [Release notes](https://github.com/rmagick/rmagick/releases)
- [Changelog](https://github.com/rmagick/rmagick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rmagick/rmagick/commits)
2019-05-31 10:44:35 +00:00
dependabot-preview[bot]
5da235dd07
Bump csv from 3.0.3 to 3.1.1
Bumps [csv](https://github.com/ruby/csv) from 3.0.3 to 3.1.1.
- [Release notes](https://github.com/ruby/csv/releases)
- [Changelog](https://github.com/ruby/csv/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/csv/compare/v3.0.3...v3.1.1)
2019-05-31 10:43:24 +00:00
dependabot-preview[bot]
6a6d6919c2
Bump capybara from 3.12.0 to 3.22.0
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.22.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.12.0...3.22.0)
2019-05-31 10:42:48 +00:00
dependabot-preview[bot]
54c714d6cd
Bump meta-tags from 2.11.0 to 2.11.1
Bumps [meta-tags](https://github.com/kpumuk/meta-tags) from 2.11.0 to 2.11.1.
- [Release notes](https://github.com/kpumuk/meta-tags/releases)
- [Changelog](https://github.com/kpumuk/meta-tags/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kpumuk/meta-tags/compare/v2.11.0...v2.11.1)
2019-05-31 10:41:31 +00:00
dependabot-preview[bot]
af9d71f6bc
Bump newrelic_rpm from 5.7.0.350 to 6.4.0.356
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.7.0.350 to 6.4.0.356.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/compare/5.7.0.350...6.4.0.356)
2019-05-31 10:40:22 +00:00
dependabot-preview[bot]
36859de662
Bump stripe from 4.18.0 to 4.18.1
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.18.0 to 4.18.1.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.18.0...v4.18.1)
2019-05-31 10:39:45 +00:00