Skip to content

Commit 9d889c9

Browse files
committed
Merge branch 'develop' of github.com:matestack/matestack-ui-core into develop
2 parents 8e1580c + 522b4f8 commit 9d889c9

File tree

3 files changed

+54
-46
lines changed

3 files changed

+54
-46
lines changed

Gemfile.lock

Lines changed: 39 additions & 39 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.4.1)
17-
actionpack (= 5.2.4.1)
16+
actioncable (5.2.4.2)
17+
actionpack (= 5.2.4.2)
1818
nio4r (~> 2.0)
1919
websocket-driver (>= 0.6.1)
20-
actionmailer (5.2.4.1)
21-
actionpack (= 5.2.4.1)
22-
actionview (= 5.2.4.1)
23-
activejob (= 5.2.4.1)
20+
actionmailer (5.2.4.2)
21+
actionpack (= 5.2.4.2)
22+
actionview (= 5.2.4.2)
23+
activejob (= 5.2.4.2)
2424
mail (~> 2.5, >= 2.5.4)
2525
rails-dom-testing (~> 2.0)
26-
actionpack (5.2.4.1)
27-
actionview (= 5.2.4.1)
28-
activesupport (= 5.2.4.1)
26+
actionpack (5.2.4.2)
27+
actionview (= 5.2.4.2)
28+
activesupport (= 5.2.4.2)
2929
rack (~> 2.0, >= 2.0.8)
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.4.1)
34-
activesupport (= 5.2.4.1)
33+
actionview (5.2.4.2)
34+
activesupport (= 5.2.4.2)
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.4.1)
40-
activesupport (= 5.2.4.1)
39+
activejob (5.2.4.2)
40+
activesupport (= 5.2.4.2)
4141
globalid (>= 0.3.6)
42-
activemodel (5.2.4.1)
43-
activesupport (= 5.2.4.1)
44-
activerecord (5.2.4.1)
45-
activemodel (= 5.2.4.1)
46-
activesupport (= 5.2.4.1)
42+
activemodel (5.2.4.2)
43+
activesupport (= 5.2.4.2)
44+
activerecord (5.2.4.2)
45+
activemodel (= 5.2.4.2)
46+
activesupport (= 5.2.4.2)
4747
arel (>= 9.0)
48-
activestorage (5.2.4.1)
49-
actionpack (= 5.2.4.1)
50-
activerecord (= 5.2.4.1)
48+
activestorage (5.2.4.2)
49+
actionpack (= 5.2.4.2)
50+
activerecord (= 5.2.4.2)
5151
marcel (~> 0.3.1)
52-
activesupport (5.2.4.1)
52+
activesupport (5.2.4.2)
5353
concurrent-ruby (~> 1.0, >= 1.0.2)
5454
i18n (>= 0.7, < 2)
5555
minitest (~> 5.1)
@@ -80,7 +80,7 @@ GEM
8080
cells (>= 4.1.6, < 5.0.0)
8181
childprocess (3.0.0)
8282
coderay (1.1.2)
83-
concurrent-ruby (1.1.5)
83+
concurrent-ruby (1.1.6)
8484
crack (0.4.3)
8585
safe_yaml (~> 1.0.0)
8686
crass (1.0.6)
@@ -121,7 +121,7 @@ GEM
121121
mini_portile2 (2.4.0)
122122
minitest (5.14.0)
123123
nio4r (2.5.2)
124-
nokogiri (1.10.8)
124+
nokogiri (1.10.9)
125125
mini_portile2 (~> 2.4.0)
126126
pipetree (0.1.1)
127127
pry (0.12.2)
@@ -135,32 +135,32 @@ GEM
135135
public_suffix (4.0.3)
136136
puma (4.3.3)
137137
nio4r (~> 2.0)
138-
rack (2.2.1)
138+
rack (2.2.2)
139139
rack-proxy (0.6.5)
140140
rack
141141
rack-test (1.1.0)
142142
rack (>= 1.0, < 3)
143-
rails (5.2.4.1)
144-
actioncable (= 5.2.4.1)
145-
actionmailer (= 5.2.4.1)
146-
actionpack (= 5.2.4.1)
147-
actionview (= 5.2.4.1)
148-
activejob (= 5.2.4.1)
149-
activemodel (= 5.2.4.1)
150-
activerecord (= 5.2.4.1)
151-
activestorage (= 5.2.4.1)
152-
activesupport (= 5.2.4.1)
143+
rails (5.2.4.2)
144+
actioncable (= 5.2.4.2)
145+
actionmailer (= 5.2.4.2)
146+
actionpack (= 5.2.4.2)
147+
actionview (= 5.2.4.2)
148+
activejob (= 5.2.4.2)
149+
activemodel (= 5.2.4.2)
150+
activerecord (= 5.2.4.2)
151+
activestorage (= 5.2.4.2)
152+
activesupport (= 5.2.4.2)
153153
bundler (>= 1.3.0)
154-
railties (= 5.2.4.1)
154+
railties (= 5.2.4.2)
155155
sprockets-rails (>= 2.0.0)
156156
rails-dom-testing (2.0.3)
157157
activesupport (>= 4.2.0)
158158
nokogiri (>= 1.6)
159159
rails-html-sanitizer (1.3.0)
160160
loofah (~> 2.3)
161-
railties (5.2.4.1)
162-
actionpack (= 5.2.4.1)
163-
activesupport (= 5.2.4.1)
161+
railties (5.2.4.2)
162+
actionpack (= 5.2.4.2)
163+
activesupport (= 5.2.4.2)
164164
method_source
165165
rake (>= 0.8.7)
166166
thor (>= 0.19.0, < 2.0)

builder/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -998,9 +998,9 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
998998
negotiator "0.6.2"
999999

10001000
acorn@^6.2.1:
1001-
version "6.4.0"
1002-
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
1003-
integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
1001+
version "6.4.1"
1002+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
1003+
integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
10041004

10051005
aggregate-error@^3.0.0:
10061006
version "3.0.1"

spec/dummy/yarn.lock

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,9 +1006,9 @@ accepts@~1.3.7:
10061006
negotiator "0.6.2"
10071007

10081008
acorn@^6.2.1:
1009-
version "6.4.0"
1010-
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
1011-
integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
1009+
version "6.4.1"
1010+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
1011+
integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
10121012

10131013
aggregate-error@^3.0.0:
10141014
version "3.0.1"
@@ -4370,6 +4370,7 @@ matestack-ui-core@../../:
43704370
link-module-alias "^1.2.0"
43714371
v-runtime-template "^1.5.2"
43724372
vue "^2.5.17"
4373+
vue-turbolinks "^2.1.0"
43734374
vuex "^3.0.1"
43744375
yarn "^1.22.0"
43754376

@@ -7524,7 +7525,14 @@ vm-browserify@^1.0.1:
75247525
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
75257526
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
75267527

7527-
vue@^2.5.17:
7528+
vue-turbolinks@^2.1.0:
7529+
version "2.1.0"
7530+
resolved "https://registry.yarnpkg.com/vue-turbolinks/-/vue-turbolinks-2.1.0.tgz#fc7372d06d624aa3fb68231dc0b509719edc778f"
7531+
integrity sha512-Rgq9eUS2LgHVoSR58S0utW7g/aqLlVZ6uM7S1e02+xEUGKW1fqhUHQXea3p+cE59ldf+f3nz3Cc3HVO4MlrTFA==
7532+
dependencies:
7533+
vue "^2.2.4"
7534+
7535+
vue@^2.2.4, vue@^2.5.17:
75287536
version "2.6.11"
75297537
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
75307538
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==

0 commit comments

Comments
 (0)