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

Slate upgrade #4

Merged
merged 144 commits into from
Feb 15, 2023
Merged

Slate upgrade #4

merged 144 commits into from
Feb 15, 2023

Conversation

fulf
Copy link
Collaborator

@fulf fulf commented Feb 10, 2023

Bumps Slate to version 2.13.1.

⚠️ Needs an update to lib/slate_api_docs/source/stylesheets/_remotelock.scss due to #1226 (Slate upgraded to Rouge 3.x which wraps pre, in a <div class='highlight'>)

bradthurber and others added 30 commits May 11, 2020 16:25
* Slate 2.4 breaks vagrant

* Update Vagrantfile

* Update Vagrantfile
* Do not build sources when using --help

* Use variables for build/push if statements

* fix error message
Co-authored-by: Matthew Peveler <matt.peveler@gmail.com>
* add Dockerfile

add Dockerfile

* Update Dockerfile

Co-authored-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
* fix bc style breaks from rouge 3.x

Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>

* use bright_pink for Name::Label

Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
Bumps [middleman](https://github.com/middleman/middleman) from 4.3.6 to 4.3.7.
- [Release notes](https://github.com/middleman/middleman/releases)
- [Changelog](https://github.com/middleman/middleman/blob/v4.3.7/CHANGELOG.md)
- [Commits](middleman/middleman@v4.3.6...v4.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
master -> main branch
dependabot bot and others added 23 commits March 23, 2022 07:46
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Peveler <matt.peveler@gmail.com>
Copy link

@SathishAchilles SathishAchilles left a comment

Choose a reason for hiding this comment

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

would argue to open this PR directly from the forked repo.. but if we have made sure all changes are covered than good from me ..

Copy link

@felipelmota felipelmota left a comment

Choose a reason for hiding this comment

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

Could you confirm because some checks have failed? besides that, it seems ok.

@fulf
Copy link
Collaborator Author

fulf commented Feb 14, 2023

@SathishAchilles there were some conflicts that needed to be solved so I opted to do this locally.

This was done by adding the original repo as a new remote locally, and then merging the original repo's main branch to the local slate-upgrade branch, so I'm 100% certain everything's here. 😄

@felipelmota the actions were introduced by Slate somewhere along the new versions.
It is failing because it’s not finding RL specific files… and that’s to be expected, since they don’t exist in the Slate repository. They get pasted there by the API documentation rake task.

@fulf fulf merged commit 5b312b0 into master Feb 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.