Bring back #891 #905
Merged
Bring back #891 #905
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
|
Up-to-date and green status on CI now required for merging to master:
|
This was referenced Sep 11, 2018
andrew
added a commit
that referenced
this pull request
Sep 13, 2018
* master: (132 commits) Addresses #919 Allow filtering by multiple repositories with search prefix (#921) * make all svg's $body-color (#920) Revert "Ignore the docs folder when generating docker images or heroku slugs" (#918) Dark mode (#769) Ignore the docs folder when generating docker images or heroku slugs (#916) Small tweaks to github app settings section (#915) Bump uglifier from 4.1.18 to 4.1.19 (#914) Bump octokit from 4.11.0 to 4.12.0 (#912) Don't show full list of repositories with app installed in settings (#911) Sync install permissions along with notifications (#909) Show installed github apps on user settings page (#910) Add vulnerability disclosure policy (#908) Sync GitHub App installations that a user has access to manage (#907) Bring back #891 (#905) Revert "Add sorting to notifications (#891)" (#904) Add sorting to notifications (#891) Add repository_full_name index on notifications table (#902) Bump bootsnap from 1.3.1 to 1.3.2 Ensure there's always an updated_at set on notifications Add Octobox.github_app_client for making API requests as the GitHub App (#901) ...
andrew
added a commit
that referenced
this pull request
Sep 13, 2018
* master: (35 commits) Show action buttons on hover of notification row (#823) Svg & card header fixes (#922) Addresses #919 Allow filtering by multiple repositories with search prefix (#921) * make all svg's $body-color (#920) Revert "Ignore the docs folder when generating docker images or heroku slugs" (#918) Dark mode (#769) Ignore the docs folder when generating docker images or heroku slugs (#916) Small tweaks to github app settings section (#915) Bump uglifier from 4.1.18 to 4.1.19 (#914) Bump octokit from 4.11.0 to 4.12.0 (#912) Don't show full list of repositories with app installed in settings (#911) Sync install permissions along with notifications (#909) Show installed github apps on user settings page (#910) Add vulnerability disclosure policy (#908) Sync GitHub App installations that a user has access to manage (#907) Bring back #891 (#905) Revert "Add sorting to notifications (#891)" (#904) Add sorting to notifications (#891) Add repository_full_name index on notifications table (#902) Bump bootsnap from 1.3.1 to 1.3.2 ...
jonpulsifer
pushed a commit
to Shopify/octobox
that referenced
this pull request
Oct 3, 2018
* Revert "Revert "Add sorting to notifications (octobox#891)" (octobox#904)" This reverts commit 9c02f90. * Fix sort_order exception Conflict between octobox#891 and octobox@1ccfa3a
jonpulsifer
added a commit
to Shopify/octobox
that referenced
this pull request
Oct 3, 2018
This reverts commit 1633b90.
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.
A quick merge+deploy of #891 broke master and https://octobox.io
The issue was really a workflow one rather than a code one.
I merged #891 without rebasing it against master, so the tests appeared to be passing but only showed up broken once merged into master.
I'm going to enable some more branch protections on this repo to stop this happening in future.