[pull] main from forem:main #13
Merged
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
* views/listings etc i18n * helper labels * remove ja.yml * Update edit.html.erb * Apply suggestions from code review Co-authored-by: Michael Kohl <[email protected]> * Update delete_confirm.html.erb * Update edit.html.erb * Update fr.yml * Update edit.html.erb Co-authored-by: Michael Kohl <[email protected]>
* views/comments etc i18n * comments PR fixes * PR sync with main * remove ja.yml * Update _comment_header.html.erb * Update index.html.erb * Update _comment_header.html.erb * Update en.yml * Update fr.yml * Update config/locales/views/comments/en.yml Co-authored-by: Michael Kohl <[email protected]> * Update _comment_date.erb * Update en.yml * Update fr.yml Co-authored-by: Michael Kohl <[email protected]>
* Create .lintstagedrc * Run normalize * Revert "Run normalize" This reverts commit cc1271a. * Disable i18n-tasks and sort
* views/articles (main part) etc i18n * remove ja.yml * delete a replaced core entry * Update en.yml * Update fr.yml * Update _liquid.html.erb * Update _single_story.html.erb * Update en.yml * Update fr.yml * Update _liquid.html.erb * Update discussion_lock_confirm.html.erb * Update _widget_list_item.html.erb * Update _single_story.html.erb
* views/organizations i18n * remove ja.yml * Update en.yml * Update fr.yml
* users (mostly non-settings), logo designer i18n * remove ja.yml * Update _profile.html.erb * Update _metadata.html.erb * Update _sidebar.html.erb * Update en.yml * Update fr.yml * Apply suggestions from code review Co-authored-by: Michael Kohl <[email protected]> * Update _profile.html.erb * Update en.yml * Update fr.yml * Update _logo_design.html.erb Co-authored-by: Michael Kohl <[email protected]>
Set long translation call to multiple lines to clarify body (readability)
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.22.2 to 1.22.3. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](rubocop/rubocop@v1.22.2...v1.22.3) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
The views.articles.edited template generates a <time> tag Use edited_html (like published_html) when translating this to ensure the time tag is rendered as html (and not escaped as text).
* videos ui updates * move cheese around * . * . * thumbnail yolo * thumbnail yolo * object fit * aspect ratio yolo * . * loading videos * Make Travis and asset pipeline happy with .mp4 extension * Use Cloudinary video url, testing for Travis * Try weird things * Try a real image url * Use a real image instead of 'video' string * Update views.scss Co-authored-by: Andy Z <[email protected]>
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )