hamlit 2.14.6-java → 2.15.0-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bbd4b98036dd20111bf9c090c074677b36a79e1a7475c3ffcd2dd6f5b24bdb27
4
- data.tar.gz: a91c794059370a1cb3f1d38a26a9940a050d864f734619719a091a38cebc0d49
3
+ metadata.gz: 86a728b5b4d4092dd1ba4c21e7bd306aacbc11a5386a76596ae54ff923d1fc55
4
+ data.tar.gz: 332a601582738bcee8dd7a56a23e7930af140b777453511e5e658a94a1c66c85
5
5
  SHA512:
6
- metadata.gz: 963b99f583edca5097b27eaf991be2a22796f9f298c22e3ae27b2bb1a3db4ad2ed050ae7021758222e10c21c1ff70f754113d602a478743b4c649120d53776f9
7
- data.tar.gz: 1653a1aa2aa3251f4bb89c9c7f6f57df01ee69d97fdeb482030850e0e16e69ef522cea4d2996c627e399b82d1a5d0bc4ae67e5532e79610abb473152eb0b1057
6
+ metadata.gz: 1b79fe7a6fcda0fd6cc57ed6480e728225a4ad87f44074dcd31f6606b09d253c64a469ab82a50af0aa33044268cc6a1b5e5ea3ea8f436424e969df67b7bf5d2d
7
+ data.tar.gz: 465ec7e9ae995146684103fa2a85cb2564adb7538d24ef7d75e84b020c023382c7945e0ecd788aa4896ab7625b6b775caa458a88fbfce52921f6f6de7e32e9f6
data/CHANGELOG.md CHANGED
@@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file. This
4
4
  project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
5
5
  [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
6
6
 
7
- ## [2.14.6](https://github.com/k0kubun/hamlit/compare/v2.14.4...v2.14.5) - 2021-03-23
7
+ ## [2.15.0](https://github.com/k0kubun/hamlit/compare/v2.14.6...v2.15.0) - 2021-04-12
8
+
9
+ ### Added
10
+
11
+ - Always use Hamlit when both haml.gem and hamlit.gem are installed in Rails
12
+ *Thanks to @igor-drozdov*
13
+
14
+ ## [2.14.6](https://github.com/k0kubun/hamlit/compare/v2.14.5...v2.14.6) - 2021-03-23
8
15
 
9
16
  ### Fixed
10
17
 
@@ -4,6 +4,11 @@ require 'rails'
4
4
  module Hamlit
5
5
  class Railtie < ::Rails::Railtie
6
6
  initializer :hamlit, before: :load_config_initializers do |app|
7
+ # Load haml/plugin first to override if available
8
+ begin
9
+ require 'haml/plugin'
10
+ rescue LoadError
11
+ end
7
12
  require 'hamlit/rails_template'
8
13
  end
9
14
  end
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Hamlit
3
- VERSION = '2.14.6'
3
+ VERSION = '2.15.0'
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hamlit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.14.6
4
+ version: 2.15.0
5
5
  platform: java
6
6
  authors:
7
7
  - Takashi Kokubun
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-03-24 00:00:00.000000000 Z
11
+ date: 2021-04-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement