Skip to content

Commit 917e828

Browse files
committed
update gemfile
1 parent debe4ee commit 917e828

File tree

1 file changed

+96
-92
lines changed

1 file changed

+96
-92
lines changed

Gemfile.lock

Lines changed: 96 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.5)
5-
actionpack (= 4.2.5)
6-
actionview (= 4.2.5)
7-
activejob (= 4.2.5)
4+
actionmailer (4.2.7.1)
5+
actionpack (= 4.2.7.1)
6+
actionview (= 4.2.7.1)
7+
activejob (= 4.2.7.1)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.5)
11-
actionview (= 4.2.5)
12-
activesupport (= 4.2.5)
10+
actionpack (4.2.7.1)
11+
actionview (= 4.2.7.1)
12+
activesupport (= 4.2.7.1)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.5)
18-
activesupport (= 4.2.5)
17+
actionview (4.2.7.1)
18+
activesupport (= 4.2.7.1)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
activejob (4.2.5)
24-
activesupport (= 4.2.5)
23+
activejob (4.2.7.1)
24+
activesupport (= 4.2.7.1)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.5)
27-
activesupport (= 4.2.5)
26+
activemodel (4.2.7.1)
27+
activesupport (= 4.2.7.1)
2828
builder (~> 3.1)
29-
activerecord (4.2.5)
30-
activemodel (= 4.2.5)
31-
activesupport (= 4.2.5)
29+
activerecord (4.2.7.1)
30+
activemodel (= 4.2.7.1)
31+
activesupport (= 4.2.7.1)
3232
arel (~> 6.0)
33-
activesupport (4.2.5)
33+
activesupport (4.2.7.1)
3434
i18n (~> 0.7)
3535
json (~> 1.7, >= 1.7.7)
3636
minitest (~> 5.1)
3737
thread_safe (~> 0.3, >= 0.3.4)
3838
tzinfo (~> 1.1)
39-
addressable (2.3.8)
39+
addressable (2.4.0)
4040
arel (6.0.3)
4141
babel-source (5.8.35)
4242
babel-transpiler (0.7.0)
@@ -49,62 +49,66 @@ GEM
4949
binding_of_caller (0.7.2)
5050
debug_inspector (>= 0.0.1)
5151
builder (3.2.2)
52-
byebug (8.2.0)
53-
capybara (2.5.0)
52+
byebug (9.0.5)
53+
capybara (2.9.1)
54+
addressable
5455
mime-types (>= 1.16)
5556
nokogiri (>= 1.3.3)
5657
rack (>= 1.0.0)
5758
rack-test (>= 0.5.4)
5859
xpath (~> 2.0)
59-
childprocess (0.5.8)
60+
childprocess (0.5.9)
6061
ffi (~> 1.0, >= 1.0.11)
61-
coderay (1.1.0)
62-
coffee-rails (4.1.0)
62+
coderay (1.1.1)
63+
coffee-rails (4.1.1)
6364
coffee-script (>= 2.2.0)
64-
railties (>= 4.0.0, < 5.0)
65+
railties (>= 4.0.0, < 5.1.x)
6566
coffee-script (2.4.1)
6667
coffee-script-source
6768
execjs
6869
coffee-script-source (1.10.0)
69-
database_cleaner (1.5.1)
70+
concurrent-ruby (1.0.2)
71+
database_cleaner (1.5.3)
7072
debug_inspector (0.0.2)
7173
diff-lcs (1.2.5)
7274
erubis (2.7.0)
73-
execjs (2.6.0)
74-
factory_girl (4.5.0)
75+
execjs (2.7.0)
76+
factory_girl (4.7.0)
7577
activesupport (>= 3.0.0)
76-
factory_girl_rails (4.5.0)
77-
factory_girl (~> 4.5.0)
78+
factory_girl_rails (4.7.0)
79+
factory_girl (~> 4.7.0)
7880
railties (>= 3.0.0)
79-
faker (1.5.0)
81+
faker (1.6.6)
8082
i18n (~> 0.5)
81-
ffi (1.9.10)
83+
ffi (1.9.14)
8284
foundation-rails (6.2.3.0)
8385
railties (>= 3.1.0)
8486
sass (>= 3.3.0, < 3.5)
8587
sprockets-es6 (>= 0.9.0)
86-
globalid (0.3.6)
88+
globalid (0.3.7)
8789
activesupport (>= 4.1.0)
88-
high_voltage (2.4.0)
90+
high_voltage (3.0.0)
8991
i18n (0.7.0)
90-
jbuilder (2.3.2)
91-
activesupport (>= 3.0.0, < 5)
92+
jbuilder (2.6.0)
93+
activesupport (>= 3.0.0, < 5.1)
9294
multi_json (~> 1.2)
93-
jquery-rails (4.0.5)
94-
rails-dom-testing (~> 1.0)
95+
jquery-rails (4.2.1)
96+
rails-dom-testing (>= 1, < 3)
9597
railties (>= 4.2.0)
9698
thor (>= 0.14, < 2.0)
9799
json (1.8.3)
98100
launchy (2.4.3)
99101
addressable (~> 2.3)
100102
loofah (2.0.3)
101103
nokogiri (>= 1.5.9)
102-
mail (2.6.3)
103-
mime-types (>= 1.16, < 3)
104-
mime-types (2.6.2)
104+
mail (2.6.4)
105+
mime-types (>= 1.16, < 4)
106+
mime-types (3.1)
107+
mime-types-data (~> 3.2015)
108+
mime-types-data (3.2016.0521)
105109
mini_portile2 (2.1.0)
106110
minitest (5.9.0)
107-
multi_json (1.11.2)
111+
multi_json (1.12.1)
108112
nokogiri (1.6.8)
109113
mini_portile2 (~> 2.1.0)
110114
pkg-config (~> 1.1.7)
@@ -114,16 +118,16 @@ GEM
114118
rack (1.6.4)
115119
rack-test (0.6.3)
116120
rack (>= 1.0)
117-
rails (4.2.5)
118-
actionmailer (= 4.2.5)
119-
actionpack (= 4.2.5)
120-
actionview (= 4.2.5)
121-
activejob (= 4.2.5)
122-
activemodel (= 4.2.5)
123-
activerecord (= 4.2.5)
124-
activesupport (= 4.2.5)
121+
rails (4.2.7.1)
122+
actionmailer (= 4.2.7.1)
123+
actionpack (= 4.2.7.1)
124+
actionview (= 4.2.7.1)
125+
activejob (= 4.2.7.1)
126+
activemodel (= 4.2.7.1)
127+
activerecord (= 4.2.7.1)
128+
activesupport (= 4.2.7.1)
125129
bundler (>= 1.3.0, < 2.0)
126-
railties (= 4.2.5)
130+
railties (= 4.2.7.1)
127131
sprockets-rails
128132
rails-deprecated_sanitizer (1.0.3)
129133
activesupport (>= 4.2.0.alpha)
@@ -133,73 +137,73 @@ GEM
133137
rails-deprecated_sanitizer (>= 1.0.1)
134138
rails-html-sanitizer (1.0.3)
135139
loofah (~> 2.0)
136-
rails_layout (1.0.28)
137-
railties (4.2.5)
138-
actionpack (= 4.2.5)
139-
activesupport (= 4.2.5)
140+
rails_layout (1.0.31)
141+
railties (4.2.7.1)
142+
actionpack (= 4.2.7.1)
143+
activesupport (= 4.2.7.1)
140144
rake (>= 0.8.7)
141145
thor (>= 0.18.1, < 2.0)
142-
rake (11.2.2)
143-
rspec-core (3.4.0)
144-
rspec-support (~> 3.4.0)
145-
rspec-expectations (3.4.0)
146+
rake (11.3.0)
147+
rspec-core (3.5.3)
148+
rspec-support (~> 3.5.0)
149+
rspec-expectations (3.5.0)
146150
diff-lcs (>= 1.2.0, < 2.0)
147-
rspec-support (~> 3.4.0)
148-
rspec-mocks (3.4.0)
151+
rspec-support (~> 3.5.0)
152+
rspec-mocks (3.5.0)
149153
diff-lcs (>= 1.2.0, < 2.0)
150-
rspec-support (~> 3.4.0)
151-
rspec-rails (3.4.0)
152-
actionpack (>= 3.0, < 4.3)
153-
activesupport (>= 3.0, < 4.3)
154-
railties (>= 3.0, < 4.3)
155-
rspec-core (~> 3.4.0)
156-
rspec-expectations (~> 3.4.0)
157-
rspec-mocks (~> 3.4.0)
158-
rspec-support (~> 3.4.0)
159-
rspec-support (3.4.0)
160-
rubyzip (1.1.7)
154+
rspec-support (~> 3.5.0)
155+
rspec-rails (3.5.2)
156+
actionpack (>= 3.0)
157+
activesupport (>= 3.0)
158+
railties (>= 3.0)
159+
rspec-core (~> 3.5.0)
160+
rspec-expectations (~> 3.5.0)
161+
rspec-mocks (~> 3.5.0)
162+
rspec-support (~> 3.5.0)
163+
rspec-support (3.5.0)
164+
rubyzip (1.2.0)
161165
sass (3.4.22)
162-
sass-rails (5.0.4)
163-
railties (>= 4.0.0, < 5.0)
166+
sass-rails (5.0.6)
167+
railties (>= 4.0.0, < 6)
164168
sass (~> 3.1)
165169
sprockets (>= 2.8, < 4.0)
166170
sprockets-rails (>= 2.0, < 4.0)
167171
tilt (>= 1.1, < 3)
168-
selenium-webdriver (2.48.1)
172+
selenium-webdriver (2.53.4)
169173
childprocess (~> 0.5)
170-
multi_json (~> 1.0)
171174
rubyzip (~> 1.0)
172175
websocket (~> 1.0)
173-
spring (1.4.3)
176+
spring (1.7.2)
174177
spring-commands-rspec (1.0.4)
175178
spring (>= 0.9.1)
176-
sprockets (3.4.0)
179+
sprockets (3.7.0)
180+
concurrent-ruby (~> 1.0)
177181
rack (> 1, < 3)
178-
sprockets-es6 (0.9.1)
182+
sprockets-es6 (0.9.2)
179183
babel-source (>= 5.8.11)
180184
babel-transpiler
181185
sprockets (>= 3.0.0)
182-
sprockets-rails (2.3.3)
183-
actionpack (>= 3.0)
184-
activesupport (>= 3.0)
185-
sprockets (>= 2.8, < 4.0)
186+
sprockets-rails (3.2.0)
187+
actionpack (>= 4.0)
188+
activesupport (>= 4.0)
189+
sprockets (>= 3.0.0)
186190
sqlite3 (1.3.11)
187191
thor (0.19.1)
188192
thread_safe (0.3.5)
189-
tilt (2.0.1)
190-
turbolinks (2.5.3)
191-
coffee-rails
193+
tilt (2.0.5)
194+
turbolinks (5.0.1)
195+
turbolinks-source (~> 5)
196+
turbolinks-source (5.0.0)
192197
tzinfo (1.2.2)
193198
thread_safe (~> 0.1)
194-
uglifier (2.7.2)
195-
execjs (>= 0.3.0)
196-
json (>= 1.8.0)
197-
web-console (2.2.1)
199+
uglifier (3.0.2)
200+
execjs (>= 0.3.0, < 3)
201+
web-console (2.3.0)
198202
activemodel (>= 4.0)
199203
binding_of_caller (>= 0.7.2)
200204
railties (>= 4.0)
201205
sprockets-rails (>= 2.0, < 4.0)
202-
websocket (1.2.2)
206+
websocket (1.2.3)
203207
xpath (2.0.0)
204208
nokogiri (~> 1.3)
205209

@@ -220,7 +224,7 @@ DEPENDENCIES
220224
jquery-rails
221225
launchy
222226
quiet_assets
223-
rails (= 4.2.5)
227+
rails (= 4.2.7.1)
224228
rails_layout
225229
rspec-rails
226230
sass-rails (~> 5.0)
@@ -233,7 +237,7 @@ DEPENDENCIES
233237
web-console (~> 2.0)
234238

235239
RUBY VERSION
236-
ruby 2.2.3p173
240+
ruby 2.3.1p112
237241

238242
BUNDLED WITH
239243
1.12.5

0 commit comments

Comments
 (0)