Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream #14

Merged
merged 129 commits into from Jun 4, 2019
Merged

Upstream #14

merged 129 commits into from Jun 4, 2019

Conversation

coreyja
Copy link
Owner

@coreyja coreyja commented Jun 4, 2019

No description provided.

dependabot bot and others added 30 commits April 1, 2019 11:23
Bumps [parallel](https://github.com/grosser/parallel) from 1.16.2 to 1.17.0.
- [Release notes](https://github.com/grosser/parallel/releases)
- [Commits](grosser/parallel@v1.16.2...v1.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Bumps [yard](https://github.com/lsegal/yard) from 0.9.18 to 0.9.19.
- [Release notes](https://github.com/lsegal/yard/releases)
- [Changelog](https://github.com/lsegal/yard/blob/master/CHANGELOG.md)
- [Commits](lsegal/yard@v0.9.18...v0.9.19)

Signed-off-by: dependabot[bot] <support@dependabot.com>
* Avoid using es6 syntax in javascript

* Skip intermittenly failing test
Bumps [rack](https://github.com/rack/rack) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](rack/rack@2.0.6...2.0.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.18.2 to 0.19.0.
- [Release notes](https://github.com/gjtorikian/commonmarker/releases)
- [Commits](gjtorikian/commonmarker@v0.18.2...v0.19.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
* Store draft boolean on subjects

* Change colour icon for draft pull requests

* Changes to draft field should cause updates over websocket

* Add draft sidebar filter link

* draft search prefix

* Ignore rubocop warning

* Add draft support to threadview badge

* Document search prefix

* Add test for draft search prefix
The flash message had an unclosed HTML property value, which caused
issues rendering the flash message.
Bumps [bindex](https://github.com/gsamokovarov/bindex) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/gsamokovarov/bindex/releases)
- [Commits](gsamokovarov/skiptrace@v0.6.0...v0.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.19.0 to 0.20.0.
- [Release notes](https://github.com/gjtorikian/commonmarker/releases)
- [Commits](gjtorikian/commonmarker@v0.19.0...v0.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
When clicking the status button in the upper left of a thread view it links you to the external github item, however, it uses 'blank' instead of '_blank' for the href attribute. This means that if I:

Click the status button to view something in github
Navigate away to do something else with that tab
Go back to octobox to view a thread
Click the status button again

Chrome will just activate the previously used tab instead of navigating the user to the item on github
* Swap kaminari paginator for pagy

* Swap kaminari paginator for pagy
Was only using it for one tiny form
dependabot bot and others added 28 commits May 17, 2019 22:56
Bumps [ffi](https://github.com/ffi/ffi) from 1.10.0 to 1.11.0.
- [Release notes](https://github.com/ffi/ffi/releases)
- [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md)
- [Commits](ffi/ffi@1.10.0...1.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
* remove beta banner from user settings panel
* add rake task to update user records
copy of /docs/VULNERABILITY_DISCLOSURE_POLICY.md as a starter
…tobox#1843)

Simplify logic for removing subscriptions in OC rake task
Short of adding full ordered list capability, this allows users some basic
control over the order of the search. Either by prefixing the search with a
number or careful naming.
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](rubyzip/rubyzip@v1.2.2...v1.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md)
- [Commits](jwt/ruby-jwt@v2.1.0...v2.2.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md)
- [Commits](jwt/ruby-jwt@v2.2.0...v2.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Bumps [pagy](https://github.com/ddnexus/pagy) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/ddnexus/pagy/releases)
- [Changelog](https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md)
- [Commits](ddnexus/pagy@3.2.0...3.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
* upstream/master: (128 commits)
  Bump rubocop from 0.70.0 to 0.71.0 (octobox#1867)
  Bump redis from 4.1.1 to 4.1.2 (octobox#1866)
  Bump capybara from 3.21.0 to 3.22.0 (octobox#1864)
  Bump hashdiff from 0.3.9 to 0.4.0 (octobox#1862)
  Bump ruby-progressbar from 1.10.0 to 1.10.1 (octobox#1860)
  Bump public_suffix from 3.0.3 to 3.1.0 (octobox#1857)
  Bump pg_search from 2.1.7 to 2.2.0 (octobox#1855)
  Bump capybara from 3.20.2 to 3.21.0 (octobox#1854)
  Bump pagy from 3.2.0 to 3.2.1 (octobox#1853)
  Bump jwt from 2.2.0 to 2.2.1 (octobox#1852)
  Bump regexp_parser from 1.5.0 to 1.5.1 (octobox#1851)
  Bump jwt from 2.1.0 to 2.2.0 (octobox#1850)
  Bump rubyzip from 1.2.2 to 1.2.3 (octobox#1849)
  Order pinned searches by name (octobox#1836)
  Add next_billing_date to open collective synchronous transactions (octobox#1843)
  Fix for stripping quotes from seach query when parsing. (octobox#1848)
  Don't strip quotes from seach query when parsing. (octobox#1847)
  Add security.md (octobox#1845)
  Create FUNDING.yml (octobox#1844)
  Launch 'conversations' (octobox#1645)
  ...

# Conflicts:
#	Gemfile.lock
@coreyja coreyja merged commit df5e701 into master Jun 4, 2019
@coreyja coreyja deleted the upstream branch June 4, 2019 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
9 participants