Commit decdb130 authored by Stan Hu's avatar Stan Hu

Merge branch 'sh-update-hamlit-for-gc' into 'master'

Update hamlit to v2.14.2

See merge request gitlab-org/gitlab!52177
parents c32f7d04 2e7c0c68
...@@ -103,7 +103,7 @@ gem 'hashie-forbidden_attributes' ...@@ -103,7 +103,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
gem 'hamlit', '~> 2.11.0' gem 'hamlit', '~> 2.14.2'
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
......
...@@ -557,7 +557,7 @@ GEM ...@@ -557,7 +557,7 @@ GEM
rainbow rainbow
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.11.0) hamlit (2.14.2)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
tilt tilt
...@@ -1388,7 +1388,7 @@ DEPENDENCIES ...@@ -1388,7 +1388,7 @@ DEPENDENCIES
gssapi gssapi
guard-rspec guard-rspec
haml_lint (~> 0.36.0) haml_lint (~> 0.36.0)
hamlit (~> 2.11.0) hamlit (~> 2.14.2)
hangouts-chat (~> 0.0.5) hangouts-chat (~> 0.0.5)
hashie hashie
hashie-forbidden_attributes hashie-forbidden_attributes
......
---
title: Update hamlit to v2.14.2
merge_request: 52177
author:
type: fixed
...@@ -214,7 +214,7 @@ RSpec.describe 'New project', :js do ...@@ -214,7 +214,7 @@ RSpec.describe 'New project', :js do
it 'the tab shows the list of templates available' do it 'the tab shows the list of templates available' do
page.within('#custom-group-project-templates') do page.within('#custom-group-project-templates') do
# Show templates in case they're collapsed # Show templates in case they're collapsed
page.all(:xpath, "//div[@class='js-template-group-options template-group-options']", wait: false).each(&:click) page.find_all('div', class: ['js-template-group-options', 'template-group-options', '!expanded'], wait: false).each(&:click)
expect(page).to have_selector('.template-option', count: template_number) expect(page).to have_selector('.template-option', count: template_number)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment