Update the OTF branch with latest master #65
Closed
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
This also changes the Travis CI config to include the same JRuby versions as pdf-core and prawn.
Ruby 2.3 is not supported any more upstream. We can use a few new features now.
Merged
|
I had a different approach in mind. Once all work on the OTF branch is done I'll rebase it on master and merge that. It should produce a bit cleaner history. Also bunch up all the change in master if there are going to be any more in one work unit. So let's focus on getting OTF finished first and think about merging later. |
|
@pointlessone ah ok, I'll revert the merge into |
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.
I merged the latest TTFunk master into this working OTF branch and fixed all the tests and rubocop issues. I also updated the
cff_restbranch which is going to have a larger diff until this is merged.