Age | Commit message (Collapse) | Author |
|
|
|
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
|
|
Fix #8889
|
|
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.3.0...v0.3.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.5 to 1.2018.6.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.5...v1.2018.6)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
* Use Ruby 2.5.2
* Specify 2.5.2p104 as RUBY VERSION
Heorku refers to RUBY VERSION in Gemfile.lock
* Use ruby-2.5.3
|
|
Bumps [oj](https://github.com/ohler55/oj) from 3.6.11 to 3.6.12.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.6.11...v3.6.12)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.2.3 to 0.3.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.3...v0.3.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [pundit](https://github.com/varvet/pundit) from 1.1.0 to 2.0.0.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/compare/v1.1.0...v2.0.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.0...v5.0.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
glitch-soc/merge-upstream
|
|
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [scss_lint](https://github.com/brigade/scss-lint) from 0.57.0 to 0.57.1.
- [Release notes](https://github.com/brigade/scss-lint/releases)
- [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
|
|
Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases)
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases)
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
|
|
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.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.8.2...3.9.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.0...v0.17.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.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/commits)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.21 to 0.9.25.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.21...v0.9.25)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
|
|
* Remove unused ruby-progressbar dependency
* Remove unused colorize dependency
|
|
|
|
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases)
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.0...v1.10.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.21.3 to 2.23.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.0.
- [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.11.4...v3.12.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Conflicts:
db/migrate/20170716191202_add_hide_notifications_to_mute.rb
spec/controllers/application_controller_spec.rb
Took our version, upstream changes were only minor style linting.
|
|
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [fog-openstack](https://github.com/fog/fog-openstack), [rspec-rails](https://github.com/rspec/rspec-rails) and [fog-core](https://github.com/fog/fog-core). These dependencies needed to be updated together.
Updates `fog-openstack` from 0.3.6 to 1.0.3
- [Release notes](https://github.com/fog/fog-openstack/releases)
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-openstack/compare/v0.3.6...v1.0.3)
Updates `rspec-rails` from 3.7.2 to 3.8.0
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0)
Updates `fog-core` from 1.45.0 to 2.1.2
- [Release notes](https://github.com/fog/fog-core/releases)
- [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md)
- [Commits](https://github.com/fog/fog-core/compare/v1.45.0...v2.1.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [webmock](https://github.com/bblimke/webmock) from 3.3.0 to 3.4.2.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.3.0...v3.4.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.1...releases/v2.3.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [http](https://github.com/httprb/http) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/httprb/http/releases)
- [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md)
- [Commits](https://github.com/httprb/http/compare/v3.2.0...v3.3.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.2.1 to 4.3.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.2.1...v4.3.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.1.25 to 0.3.6.
- [Release notes](https://github.com/fog/fog-openstack/releases)
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-openstack/compare/v0.1.25...v0.3.6)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.9.1 to 1.20.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/commits)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [capybara](https://github.com/teamcapybara/capybara) from 2.18.0 to 3.8.2.
- [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/2.18.0...3.8.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases)
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.3.4...v1.3.5)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/capistrano/rbenv/releases)
- [Changelog](https://github.com/capistrano/rbenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/rbenv/compare/v2.1.3...v2.1.4)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [pg](https://bitbucket.org/ged/ruby-pg) from 1.0.0 to 1.1.3.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc)
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.3..v1.0.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [httplog](https://github.com/trusche/httplog) from 1.0.2 to 1.1.1.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.0.2...v1.1.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.55.0 to 0.59.2.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.55.0...v0.59.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [redis](https://github.com/redis/redis-rb) from 4.0.1 to 4.0.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.0.1...v4.0.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.1...v2.1.4)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.3...v0.3.4)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.2.0 to 5.4.1.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.2.0...v5.4.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|