diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-17 12:52:04 +0200 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-04 20:45:35 +0200 |
| commit | cb7e8ab6010adf0d375f719d26fc1195f37801a7 (patch) | |
| tree | 36746f97236a721f84dfcff8a0273626fd6f3e7e | |
| parent | 116955c4533497e68abbddbace2eae0a07c98569 (diff) | |
| download | gitlab-ce-make-it-work-with-ruby25.tar.gz | |
Update hamlit to 2.8.8 to fix Ruby 2.5 issuemake-it-work-with-ruby25
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/make-it-work-with-ruby25.yml | 5 |
3 files changed, 10 insertions, 5 deletions
@@ -104,7 +104,7 @@ gem 'hashie-forbidden_attributes' gem 'kaminari', '~> 1.0' # HAML -gem 'hamlit', '~> 2.6.1' +gem 'hamlit', '~> 2.8.8' # Files attachments gem 'carrierwave', '~> 1.2' diff --git a/Gemfile.lock b/Gemfile.lock index d8fa52a0e55..fd35f9261d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -381,8 +381,8 @@ GEM rake (>= 10, < 13) rubocop (>= 0.49.0) sysexits (~> 1.1) - hamlit (2.6.1) - temple (~> 0.7.6) + hamlit (2.8.8) + temple (>= 0.8.0) thor tilt hashdiff (0.3.4) @@ -889,7 +889,7 @@ GEM sys-filesystem (1.1.6) ffi sysexits (1.2.0) - temple (0.7.7) + temple (0.8.0) test-prof (0.2.5) test_after_commit (1.1.0) activerecord (>= 3.2) @@ -1057,7 +1057,7 @@ DEPENDENCIES graphql (~> 1.8.0) grpc (~> 1.11.0) haml_lint (~> 0.26.0) - hamlit (~> 2.6.1) + hamlit (~> 2.8.8) hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) diff --git a/changelogs/unreleased/make-it-work-with-ruby25.yml b/changelogs/unreleased/make-it-work-with-ruby25.yml new file mode 100644 index 00000000000..82aa52dd628 --- /dev/null +++ b/changelogs/unreleased/make-it-work-with-ruby25.yml @@ -0,0 +1,5 @@ +--- +title: Update hamlit to 2.8.8 +merge_request: +author: +type: fixed |