Bump haml from 6.2.3 to 6.3.0 #551
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
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
gem compare haml 6.2.3 6.3.0Compared versions: ["6.2.3", "6.3.0"]
DIFFERENT date:
6.2.3: 2023-10-04 00:00:00 UTC
6.3.0: 2023-12-10 00:00:00 UTC
DIFFERENT rubygems_version:
6.2.3: 3.3.26
6.3.0: 3.4.10
DIFFERENT version:
6.2.3: 6.2.3
6.3.0: 6.3.0
DIFFERENT files:
6.2.3->6.3.0:
* Changed:
CHANGELOG.md +14/-0
README.md +0/-6
REFERENCE.md +19/-0
lib/haml/parser.rb +1/-1
lib/haml/rails_template.rb +0/-5
lib/haml/version.rb +1/-1 |
gem compare --diff haml 6.2.3 6.3.0Compared versions: ["6.2.3", "6.3.0"]
DIFFERENT files:
6.2.3->6.3.0:
* Changed:
CHANGELOG.md
--- /tmp/d20231211-2026-rlkhca/haml-6.2.3/CHANGELOG.md 2023-12-11 03:10:08.233244747 +0000
+++ /tmp/d20231211-2026-rlkhca/haml-6.3.0/CHANGELOG.md 2023-12-11 03:10:08.245244732 +0000
@@ -2,0 +3,14 @@
+## 6.3.0
+
+* Remove `Haml::RailsTemplate#default_format` that was added in v6.1.3 for Turbo [#1152](https://github.com/haml/haml/issues/1152), [#1154](https://github.com/haml/haml/issues/1154) ([discussion](https://github.com/haml/haml/pull/1144#issuecomment-1755088572))
+ * See [the reference](https://github.com/haml/haml/blob/v6.3.0/REFERENCE.md#turbo) for suggested alternatives.
+
+## 6.2.5
+
+* Deprecate `Haml::RailsTemplate#default_format` that was added in v6.1.3 for Turbo ([discussion](https://github.com/haml/haml/pull/1144#issuecomment-1755088572))
+ * See [the reference](https://github.com/haml/haml/blob/v6.2.5/REFERENCE.md#turbo) for suggested alternatives.
+
+## 6.2.4
+
+* Support case-in statement [#1155](https://github.com/haml/haml/issues/1155)
+
README.md
--- /tmp/d20231211-2026-rlkhca/haml-6.2.3/README.md 2023-12-11 03:10:08.233244747 +0000
+++ /tmp/d20231211-2026-rlkhca/haml-6.3.0/README.md 2023-12-11 03:10:08.245244732 +0000
@@ -149,6 +148,0 @@
-You'll get a warning that you need to install haml-spec, so run this:
-
-~~~sh
-git submodule update --init
-~~~
-
REFERENCE.md
--- /tmp/d20231211-2026-rlkhca/haml-6.2.3/REFERENCE.md 2023-12-11 03:10:08.233244747 +0000
+++ /tmp/d20231211-2026-rlkhca/haml-6.3.0/REFERENCE.md 2023-12-11 03:10:08.245244732 +0000
@@ -1297,0 +1298,19 @@
+
+## Turbo
+
+For people using Turbo-rails and Haml 6+ need to either:
+* follow the naming convention with the html format (ie. ensure any `.haml` files end `.html.haml`), or
+* add a monkey patch as follows:
+
+```rb
+# config/initializers/haml.rb
+require "haml/rails_template"
+
+module Haml
+ class RailsTemplate
+ def default_format
+ :html
+ end
+ end
+end
+```
lib/haml/parser.rb
--- /tmp/d20231211-2026-rlkhca/haml-6.2.3/lib/haml/parser.rb 2023-12-11 03:10:08.241244737 +0000
+++ /tmp/d20231211-2026-rlkhca/haml-6.3.0/lib/haml/parser.rb 2023-12-11 03:10:08.249244727 +0000
@@ -81 +81 @@
- MID_BLOCK_KEYWORDS = %w[else elsif rescue ensure end when].freeze
+ MID_BLOCK_KEYWORDS = %w[else elsif rescue ensure end when in].freeze
lib/haml/rails_template.rb
--- /tmp/d20231211-2026-rlkhca/haml-6.2.3/lib/haml/rails_template.rb 2023-12-11 03:10:08.241244737 +0000
+++ /tmp/d20231211-2026-rlkhca/haml-6.3.0/lib/haml/rails_template.rb 2023-12-11 03:10:08.249244727 +0000
@@ -51,5 +50,0 @@
- # Rails Turbo looks for this
- def default_format
- :html
- end
-
lib/haml/version.rb
--- /tmp/d20231211-2026-rlkhca/haml-6.2.3/lib/haml/version.rb 2023-12-11 03:10:08.241244737 +0000
+++ /tmp/d20231211-2026-rlkhca/haml-6.3.0/lib/haml/version.rb 2023-12-11 03:10:08.253244722 +0000
@@ -3 +3 @@
- VERSION = '6.2.3'
+ VERSION = '6.3.0' |
gem compare thor 1.2.2 1.3.0Compared versions: ["1.2.2", "1.3.0"]
DIFFERENT date:
1.2.2: 2023-05-11 00:00:00 UTC
1.3.0: 2023-10-18 00:00:00 UTC
DIFFERENT metadata:
1.2.2: {"bug_tracker_uri"=>"https://github.com/rails/thor/issues", "changelog_uri"=>"https://github.com/rails/thor/releases/tag/v1.2.2", "documentation_uri"=>"http://whatisthor.com/", "source_code_uri"=>"https://github.com/rails/thor/tree/v1.2.2", "wiki_uri"=>"https://github.com/rails/thor/wiki", "rubygems_mfa_required"=>"true"}
1.3.0: {"bug_tracker_uri"=>"https://github.com/rails/thor/issues", "changelog_uri"=>"https://github.com/rails/thor/releases/tag/v1.3.0", "documentation_uri"=>"http://whatisthor.com/", "source_code_uri"=>"https://github.com/rails/thor/tree/v1.3.0", "wiki_uri"=>"https://github.com/rails/thor/wiki", "rubygems_mfa_required"=>"true"}
DIFFERENT required_ruby_version:
1.2.2: >= 2.0.0
1.3.0: >= 2.6.0
DIFFERENT rubygems_version:
1.2.2: 3.4.10
1.3.0: 3.4.21
DIFFERENT version:
1.2.2: 1.2.2
1.3.0: 1.3.0
DIFFERENT files:
1.2.2->1.3.0:
* Added:
lib/thor/shell/column_printer.rb +29/-0
lib/thor/shell/lcs_diff.rb +49/-0
lib/thor/shell/table_printer.rb +134/-0
lib/thor/shell/terminal.rb +42/-0
lib/thor/shell/wrapped_printer.rb +38/-0
* Changed:
lib/thor.rb +154/-7
lib/thor/actions.rb +14/-15
lib/thor/actions/create_file.rb +2/-1
lib/thor/actions/directory.rb +1/-1
lib/thor/actions/empty_directory.rb +1/-1
lib/thor/actions/file_manipulation.rb +6/-8
lib/thor/actions/inject_into_file.rb +15/-4
lib/thor/base.rb +136/-9
lib/thor/command.rb +13/-4
lib/thor/core_ext/hash_with_indifferent_access.rb +4/-0
lib/thor/error.rb +18/-23
lib/thor/invocation.rb +1/-1
lib/thor/nested_context.rb +2/-2
lib/thor/parser/argument.rb +20/-1
lib/thor/parser/arguments.rb +32/-16
lib/thor/parser/option.rb +20/-5
lib/thor/parser/options.rb +42/-4
lib/thor/runner.rb +11/-11
lib/thor/shell.rb +1/-1
lib/thor/shell/basic.rb +25/-149
lib/thor/shell/color.rb +4/-46
lib/thor/shell/html.rb +3/-45
lib/thor/util.rb +4/-3
lib/thor/version.rb +1/-1
thor.gemspec +14/-10 |
|
dependabot
bot
force-pushed
the
dependabot/bundler/haml-6.3.0
branch
2 times, most recently
from
208d04a
to
8c5431b
Compare
Bumps [haml](https://github.com/haml/haml) from 6.2.3 to 6.3.0. - [Release notes](https://github.com/haml/haml/releases) - [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md) - [Commits](haml/haml@v6.2.3...v6.3.0) --- updated-dependencies: - dependency-name: haml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
dependabot
bot
force-pushed
the
dependabot/bundler/haml-6.3.0
branch
from
8c5431b
to
a7fe3b1
Compare
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.
Bumps haml from 6.2.3 to 6.3.0.
Release notes
Sourced from haml's releases.
Changelog
Sourced from haml's changelog.
Commits
8e68e37Version 6.3.0414a4fcRemove Haml::RailsTemplate#default_format721b381Version 6.2.59357721Warn the use of #default_format2269160Add a documentation about Turbo7db9665Version 6.2.41098bc1Fix running tests against Rails 7.1a55cbf6Remove advice to rungit submodule update --init616cf38Add support for case-in statementsDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)