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.

Sign up for GitHub

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

Jump to bottom

Sync master to develop #1285

Merged
merged 36 commits into from
Jan 27, 2021
Merged

Sync master to develop #1285

merged 36 commits into from
Jan 27, 2021

Conversation

josh-hadley
Copy link
Collaborator

@josh-hadley josh-hadley commented Jan 27, 2021 •
edited
Loading

Syncing up a backlog of commits to master that did not ever get added to develop, leaving them out of sync. This will also ensure that release tags are present on develop.

pyup-bot and others added 30 commits May 9, 2018 17:51
@pyup-bot @miguelsousa
Config file for pyup.io (#362)
57329ba
@miguelsousa
[NEWS] Update date for v2.7.1
0aa3ce2
@miguelsousa
Merge pull request #447 from adobe-type-tools/release
174feaa 
Release 2.7.1
@miguelsousa
Bump version to 2.7.2
c3bbe0f 
Release 2.7.1 got botched because of a configuration problem.
Re-issuing the same files as 2.7.2
@miguelsousa
Fix release date
ef50acf 
Making fix in 'master' to avoid conflict when trying to merge 'release'.
This change was originally made in 4590c75
@miguelsousa
A few more fixes to NEWS
4b41e08
@miguelsousa
Merge release into master
c2ef995
@miguelsousa
Merge branch 'release'
f0a340a
@miguelsousa
Merge pull request #601 from adobe-type-tools/release
8dfa984 
Release 2.8.1
@miguelsousa
Merge pull request #616 from adobe-type-tools/release
417f530 
Release 2.8.2
@miguelsousa
Merge branch 'release'
d324a1a
@miguelsousa
Merge branch 'release'
ec144b0
@miguelsousa
Merge branch 'release'
fbda466
@miguelsousa
Merge branch 'release'
a8bc391
@miguelsousa
Merge branch 'release'
c8e2ae7
@miguelsousa
Merge branch 'release'
0a3585d
@miguelsousa
Merge branch 'documentation'
740231a
@miguelsousa
Merge branch 'documentation'
b9ea72e
@miguelsousa
Jekyll configuration tweaks [skip ci]
eb9966a 
Documentation
* https://help.github.com/en/articles/configuring-jekyll
* https://help.github.com/en/articles/using-syntax-highlighting-on-github-pages
* https://help.github.com/en/articles/page-build-failed-config-file-error#fixing-highlighting-errors
@miguelsousa
Merge branch 'release'
5e01571
@miguelsousa
Merge branch 'release'
417dfc1
@miguelsousa
Merge branch 'release'
49202c4
@miguelsousa
Merge branch 'release'
fabfd19
@josh-hadley
Merge branch 'release'
be1e5d3
@miguelsousa
Merge branch 'release'
d38eb3c
@josh-hadley
Merge branch 'release'
9289262
@josh-hadley
Merge branch 'release'
3e5a4aa
@josh-hadley
Update .pyup.yml [skip ci]
af7e5d0 
sync with changes in `develop`
@josh-hadley
Merge branch 'release'
1980573
@josh-hadley
Merge branch 'release'
c2378c5
cjchapman
cjchapman reviewed Jan 27, 2021
View reviewed changes
Copy link
Contributor

@cjchapman cjchapman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good. I confirmed local experiments that this will get the release tags on the develop branch.

This is the command I used to check the tags on the current branch:

git log --decorate --pretty=oneline | grep "(tag:"

@cjchapman cjchapman merged commit 4db869e into develop Jan 27, 2021
@cjchapman cjchapman mentioned this pull request Jan 27, 2021
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjchapman cjchapman cjchapman left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@josh-hadley @cjchapman @pyup-bot @miguelsousa @vladdoster