Ca upstream #1584
Closed
Ca upstream #1584
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update from Upstream
* 'master' of github.com:coreyja/octobox: (56 commits) Add Guard gem and config (octobox#1111) Bump xpath from 3.1.0 to 3.2.0 (octobox#1107) Bump jwt from 1.5.6 to 2.1.0 (octobox#1104) Bump autoprefixer-rails from 9.1.4 to 9.2.0 (octobox#1103) Bump i18n from 1.1.0 to 1.1.1 (octobox#1102) Bump mail from 2.7.0 to 2.7.1 (octobox#1101) Refactor user validations (octobox#1090) Bump oauth2 from 1.4.0 to 1.4.1 (octobox#1100) Tiny typo fix in notification model test (octobox#1099) Show first few lines of issue/pr body as title on notification links (octobox#1097) Fix typo for Unlabelled filter (octobox#1098) Subject syncing is now live on Octobox.io Sync subject body for issues and pull requests (octobox#1094) Ensure locked field is updated when existing subjects are updated (octobox#1096) Status webhooks should update subects with combined status result (octobox#1093) Fix dropdown svg icons colors Bump octokit from 4.12.0 to 4.13.0 (octobox#1091) Fixed sidebar colors (octobox#1079) Rubocop fixes (octobox#1075) Prompt users to log into the GitHub App (octobox#1078) ...
Upstream changes
More from Upstream
Upstream Changes
* 'master' of github.com:coreyja/octobox: (64 commits) Show free trials count in admin dashboard (octobox#1232) Fix shift-select for multiple checkboxes (octobox#1231) Confirm mute (octobox#1230) Fix deleting multiple notifications from the archive page (octobox#1229) Confirm deleting notifications (octobox#1228) Visual review (octobox#1220) Show sidekiq-unique-jobs tab in sidekiq ui (octobox#1226) Update documentation (octobox#1213) Skip visual integration tests on travis (octobox#1227) Bump guard from 2.14.2 to 2.15.0 (octobox#1225) Bump capybara from 3.10.1 to 3.11.0 (octobox#1224) Bump regexp_parser from 1.2.0 to 1.3.0 (octobox#1223) Bump popper_js from 1.14.3 to 1.14.5 (octobox#1219) Enable the GitHub Marketplace pricing option (octobox#1216) Visual fixes (octobox#1218) Tweak copy for filters in feature list (octobox#1217) Bump bugsnag from 6.8.0 to 6.9.0 (octobox#1215) Bump pry from 0.12.1 to 0.12.2 (octobox#1214) Send people to the GitHub Marketplace if MARKETPLACE_URL is present (octobox#1212) Only download status if there's a valid github client available (octobox#1211) ...
* 'master' of github.com:octobox/octobox: (21 commits) * tidy up star styles (octobox#1260) Update comments and status in Subject.sync (octobox#1257) Reduce padding in sidebar (octobox#1250) Remove padding on bottom of sidebar (octobox#1251) Align notification date to the right (octobox#1253) The header height is now 63px (octobox#1252) Fixes cut off readme feature description (octobox#1249) Fix links in header dropdown menu (octobox#1248) Bump uglifier from 4.1.19 to 4.1.20 (octobox#1246) Bump octicons_helper from 8.1.2 to 8.1.3 (octobox#1245) Update edit.html.erb (octobox#1244) Bump capybara from 3.11.0 to 3.11.1 (octobox#1243) Fix active star color (octobox#1241) * fix homepage typo (octobox#1240) Add more featured orgs to the homepage (octobox#1239) * correct pricing (octobox#1237) * move star styles to table-notifications (octobox#1238) Fix sidekiq initializer (octobox#1236) Fix table row border hover bug in chrome by making it 1px wide (octobox#1235) Cleanup unique jobs digest after death (octobox#1234) ...
feat: Upstream Changes
My dockerfil is on 2.5.3 now so 🤷 This reverts commit 84d35a1.
chore: Upstream Changes
chore: Updates from Upstream
* 'master' of github.com:coreyja/octobox: Bump oj from 3.7.4 to 3.7.5 (octobox#1396) Bump webmock from 3.4.2 to 3.5.1 (octobox#1395) Bump bootstrap from 4.1.3 to 4.2.1 (octobox#1393)
chore: Updates from Upstream
|
Sorry, was trying to update my fork for my private deploy. Apologize for the noise |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.