Skip to content

Commit 6a800b9

Browse files
pascalwengerterpascalwengerter
authored
Merge branch 'develop' into dependabot/npm_and_yarn/spec/dummy/lodash.template-4.5.0
2 parents 111081d + c566cd6 commit 6a800b9

File tree

17 files changed

+1912
-1590
lines changed

17 files changed

+1912
-1590
lines changed

‎Gemfile.lock

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,43 @@ PATH
1313
GEM
1414
remote: https://rubygems.org/
1515
specs:
16-
actioncable (5.2.1)
17-
actionpack (= 5.2.1)
16+
actioncable (5.2.3)
17+
actionpack (= 5.2.3)
1818
nio4r (~> 2.0)
1919
websocket-driver (>= 0.6.1)
20-
actionmailer (5.2.1)
21-
actionpack (= 5.2.1)
22-
actionview (= 5.2.1)
23-
activejob (= 5.2.1)
20+
actionmailer (5.2.3)
21+
actionpack (= 5.2.3)
22+
actionview (= 5.2.3)
23+
activejob (= 5.2.3)
2424
mail (~> 2.5, >= 2.5.4)
2525
rails-dom-testing (~> 2.0)
26-
actionpack (5.2.1)
27-
actionview (= 5.2.1)
28-
activesupport (= 5.2.1)
26+
actionpack (5.2.3)
27+
actionview (= 5.2.3)
28+
activesupport (= 5.2.3)
2929
rack (~> 2.0)
3030
rack-test (>= 0.6.3)
3131
rails-dom-testing (~> 2.0)
3232
rails-html-sanitizer (~> 1.0, >= 1.0.2)
33-
actionview (5.2.1)
34-
activesupport (= 5.2.1)
33+
actionview (5.2.3)
34+
activesupport (= 5.2.3)
3535
builder (~> 3.1)
3636
erubi (~> 1.4)
3737
rails-dom-testing (~> 2.0)
3838
rails-html-sanitizer (~> 1.0, >= 1.0.3)
39-
activejob (5.2.1)
40-
activesupport (= 5.2.1)
39+
activejob (5.2.3)
40+
activesupport (= 5.2.3)
4141
globalid (>= 0.3.6)
42-
activemodel (5.2.1)
43-
activesupport (= 5.2.1)
44-
activerecord (5.2.1)
45-
activemodel (= 5.2.1)
46-
activesupport (= 5.2.1)
42+
activemodel (5.2.3)
43+
activesupport (= 5.2.3)
44+
activerecord (5.2.3)
45+
activemodel (= 5.2.3)
46+
activesupport (= 5.2.3)
4747
arel (>= 9.0)
48-
activestorage (5.2.1)
49-
actionpack (= 5.2.1)
50-
activerecord (= 5.2.1)
48+
activestorage (5.2.3)
49+
actionpack (= 5.2.3)
50+
activerecord (= 5.2.3)
5151
marcel (~> 0.3.1)
52-
activesupport (5.2.1)
52+
activesupport (5.2.3)
5353
concurrent-ruby (~> 1.0, >= 1.0.2)
5454
i18n (>= 0.7, < 2)
5555
minitest (~> 5.1)
@@ -81,7 +81,7 @@ GEM
8181
childprocess (0.9.0)
8282
ffi (~> 1.0, >= 1.0.11)
8383
cliver (0.3.2)
84-
concurrent-ruby (1.0.5)
84+
concurrent-ruby (1.1.5)
8585
crack (0.4.3)
8686
safe_yaml (~> 1.0.0)
8787
crass (1.0.4)
@@ -97,7 +97,7 @@ GEM
9797
representable (>= 2.4.0, <= 3.1.0)
9898
uber (< 0.2.0)
9999
docile (1.3.1)
100-
erubi (1.7.1)
100+
erubi (1.8.0)
101101
ffi (1.9.25)
102102
generator_spec (0.9.4)
103103
activesupport (>= 3.0.0)
@@ -108,61 +108,61 @@ GEM
108108
temple (>= 0.8.0)
109109
tilt
110110
hashdiff (0.3.8)
111-
i18n (1.1.0)
111+
i18n (1.6.0)
112112
concurrent-ruby (~> 1.0)
113113
json (2.1.0)
114-
loofah (2.2.2)
114+
loofah (2.2.3)
115115
crass (~> 1.0.2)
116116
nokogiri (>= 1.5.9)
117117
mail (2.7.1)
118118
mini_mime (>= 0.1.1)
119119
marcel (0.3.3)
120120
mimemagic (~> 0.3.2)
121-
method_source (0.9.0)
121+
method_source (0.9.2)
122122
mimemagic (0.3.3)
123-
mini_mime (1.0.1)
124-
mini_portile2 (2.3.0)
123+
mini_mime (1.0.2)
124+
mini_portile2 (2.4.0)
125125
minitest (5.11.3)
126-
nio4r (2.3.1)
127-
nokogiri (1.8.4)
128-
mini_portile2 (~> 2.3.0)
126+
nio4r (2.4.0)
127+
nokogiri (1.10.3)
128+
mini_portile2 (~> 2.4.0)
129129
pipetree (0.1.1)
130130
poltergeist (1.18.1)
131131
capybara (>= 2.1, < 4)
132132
cliver (~> 0.3.1)
133133
websocket-driver (>= 0.2.0)
134134
public_suffix (3.0.3)
135135
puma (3.12.0)
136-
rack (2.0.5)
136+
rack (2.0.7)
137137
rack-proxy (0.6.5)
138138
rack
139139
rack-test (1.1.0)
140140
rack (>= 1.0, < 3)
141-
rails (5.2.1)
142-
actioncable (= 5.2.1)
143-
actionmailer (= 5.2.1)
144-
actionpack (= 5.2.1)
145-
actionview (= 5.2.1)
146-
activejob (= 5.2.1)
147-
activemodel (= 5.2.1)
148-
activerecord (= 5.2.1)
149-
activestorage (= 5.2.1)
150-
activesupport (= 5.2.1)
141+
rails (5.2.3)
142+
actioncable (= 5.2.3)
143+
actionmailer (= 5.2.3)
144+
actionpack (= 5.2.3)
145+
actionview (= 5.2.3)
146+
activejob (= 5.2.3)
147+
activemodel (= 5.2.3)
148+
activerecord (= 5.2.3)
149+
activestorage (= 5.2.3)
150+
activesupport (= 5.2.3)
151151
bundler (>= 1.3.0)
152-
railties (= 5.2.1)
152+
railties (= 5.2.3)
153153
sprockets-rails (>= 2.0.0)
154154
rails-dom-testing (2.0.3)
155155
activesupport (>= 4.2.0)
156156
nokogiri (>= 1.6)
157157
rails-html-sanitizer (1.0.4)
158158
loofah (~> 2.2, >= 2.2.2)
159-
railties (5.2.1)
160-
actionpack (= 5.2.1)
161-
activesupport (= 5.2.1)
159+
railties (5.2.3)
160+
actionpack (= 5.2.3)
161+
activesupport (= 5.2.3)
162162
method_source
163163
rake (>= 0.8.7)
164164
thor (>= 0.19.0, < 2.0)
165-
rake (12.3.2)
165+
rake (12.3.3)
166166
reform (2.2.4)
167167
disposable (>= 0.4.1)
168168
representable (>= 2.4.0, < 3.1.0)
@@ -210,7 +210,7 @@ GEM
210210
sprockets (>= 3.0.0)
211211
sqlite3 (1.3.13)
212212
temple (0.8.0)
213-
thor (0.20.0)
213+
thor (0.20.3)
214214
thread_safe (0.3.6)
215215
tilt (2.0.8)
216216
trailblazer (2.0.7)
@@ -239,9 +239,9 @@ GEM
239239
activesupport (>= 4.2)
240240
rack-proxy (>= 0.6.1)
241241
railties (>= 4.2)
242-
websocket-driver (0.7.0)
242+
websocket-driver (0.7.1)
243243
websocket-extensions (>= 0.1.0)
244-
websocket-extensions (0.1.3)
244+
websocket-extensions (0.1.4)
245245
xpath (3.2.0)
246246
nokogiri (~> 1.8)
247247

‎app/concepts/matestack/ui/core/tbody/tbody.haml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
%tbody{@tag_attributes}
2+
- if block_given?
3+
= yield

‎app/concepts/matestack/ui/core/tbody/tbody.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Matestack::Ui::Core::Tbody
2+
class Tbody < Matestack::Ui::Core::Component::Static
3+
4+
end
5+
end

‎app/concepts/matestack/ui/core/tfoot/tfoot.haml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
%tfoot{@tag_attributes}
2+
- if block_given?
3+
= yield

‎app/concepts/matestack/ui/core/tfoot/tfoot.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Matestack::Ui::Core::Tfoot
2+
class Tfoot < Matestack::Ui::Core::Component::Static
3+
4+
end
5+
end

‎app/concepts/matestack/ui/core/thead/thead.haml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
%thead{@tag_attributes}
2+
- if block_given?
3+
= yield

‎app/concepts/matestack/ui/core/thead/thead.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Matestack::Ui::Core::Thead
2+
class Thead < Matestack::Ui::Core::Component::Static
3+
4+
end
5+
end

0 commit comments

Comments
 (0)