Skip to content

Commit ae97624

Browse files
DanielKehoeDanielKehoe
committed
bundle update
1 parent cd74cfd commit ae97624

File tree

1 file changed

+66
-112
lines changed

1 file changed

+66
-112
lines changed

‎Gemfile.lock

Lines changed: 66 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.1.5)
5-
actionpack (= 4.1.5)
6-
actionview (= 4.1.5)
7-
mail (~> 2.5.4)
8-
actionpack (4.1.5)
9-
actionview (= 4.1.5)
10-
activesupport (= 4.1.5)
4+
actionmailer (4.1.6)
5+
actionpack (= 4.1.6)
6+
actionview (= 4.1.6)
7+
mail (~> 2.5, >= 2.5.4)
8+
actionpack (4.1.6)
9+
actionview (= 4.1.6)
10+
activesupport (= 4.1.6)
1111
rack (~> 1.5.2)
1212
rack-test (~> 0.6.2)
13-
actionview (4.1.5)
14-
activesupport (= 4.1.5)
13+
actionview (4.1.6)
14+
activesupport (= 4.1.6)
1515
builder (~> 3.1)
1616
erubis (~> 2.7.0)
17-
activemodel (4.1.5)
18-
activesupport (= 4.1.5)
17+
activemodel (4.1.6)
18+
activesupport (= 4.1.6)
1919
builder (~> 3.1)
20-
activerecord (4.1.5)
21-
activemodel (= 4.1.5)
22-
activesupport (= 4.1.5)
20+
activerecord (4.1.6)
21+
activemodel (= 4.1.6)
22+
activesupport (= 4.1.6)
2323
arel (~> 5.0.0)
24-
activesupport (4.1.5)
24+
activesupport (4.1.6)
2525
i18n (~> 0.6, >= 0.6.9)
2626
json (~> 1.7, >= 1.7.7)
2727
minitest (~> 5.1)
2828
thread_safe (~> 0.1)
2929
tzinfo (~> 1.1)
3030
addressable (2.3.6)
3131
arel (5.0.1.20140414130214)
32-
better_errors (1.1.0)
32+
better_errors (2.0.0)
3333
coderay (>= 1.0.0)
3434
erubis (>= 2.6.6)
35+
rack (>= 0.9.0)
3536
binding_of_caller (0.7.2)
3637
debug_inspector (>= 0.0.1)
37-
bootstrap-sass (3.2.0.1)
38+
bootstrap-sass (3.2.0.2)
3839
sass (~> 3.2)
3940
builder (3.2.2)
40-
capybara (2.4.1)
41+
capybara (2.4.3)
4142
mime-types (>= 1.16)
4243
nokogiri (>= 1.3.3)
4344
rack (>= 1.0.0)
@@ -52,7 +53,7 @@ GEM
5253
coffee-script (2.3.0)
5354
coffee-script-source
5455
execjs
55-
coffee-script-source (1.7.1)
56+
coffee-script-source (1.8.0)
5657
database_cleaner (1.3.0)
5758
debug_inspector (0.0.2)
5859
diff-lcs (1.2.5)
@@ -65,69 +66,73 @@ GEM
6566
railties (>= 3.0.0)
6667
faker (1.4.3)
6768
i18n (~> 0.5)
68-
ffi (1.9.3)
69+
ffi (1.9.4)
6970
high_voltage (2.2.1)
7071
hike (1.2.3)
7172
i18n (0.6.11)
7273
jbuilder (2.1.3)
7374
activesupport (>= 3.0.0, < 5)
7475
multi_json (~> 1.2)
75-
jquery-rails (3.1.1)
76+
jquery-rails (3.1.2)
7677
railties (>= 3.0, < 5.0)
7778
thor (>= 0.14, < 2.0)
7879
json (1.8.1)
7980
launchy (2.4.2)
8081
addressable (~> 2.3)
81-
mail (2.5.4)
82-
mime-types (~> 1.16)
83-
treetop (~> 1.4.8)
84-
mime-types (1.25.1)
82+
mail (2.6.1)
83+
mime-types (>= 1.16, < 3)
84+
mime-types (2.3)
8585
mini_portile (0.6.0)
86-
minitest (5.4.0)
86+
minitest (5.4.1)
8787
multi_json (1.10.1)
8888
nokogiri (1.6.3.1)
8989
mini_portile (= 0.6.0)
90-
polyglot (0.3.5)
90+
pg (0.17.1)
9191
quiet_assets (1.0.3)
9292
railties (>= 3.1, < 5.0)
9393
rack (1.5.2)
9494
rack-test (0.6.2)
9595
rack (>= 1.0)
96-
rails (4.1.5)
97-
actionmailer (= 4.1.5)
98-
actionpack (= 4.1.5)
99-
actionview (= 4.1.5)
100-
activemodel (= 4.1.5)
101-
activerecord (= 4.1.5)
102-
activesupport (= 4.1.5)
96+
rails (4.1.6)
97+
actionmailer (= 4.1.6)
98+
actionpack (= 4.1.6)
99+
actionview (= 4.1.6)
100+
activemodel (= 4.1.6)
101+
activerecord (= 4.1.6)
102+
activesupport (= 4.1.6)
103103
bundler (>= 1.3.0, < 2.0)
104-
railties (= 4.1.5)
104+
railties (= 4.1.6)
105105
sprockets-rails (~> 2.0)
106-
rails_layout (1.0.21)
107-
railties (4.1.5)
108-
actionpack (= 4.1.5)
109-
activesupport (= 4.1.5)
106+
rails_12factor (0.0.2)
107+
rails_serve_static_assets
108+
rails_stdout_logging
109+
rails_layout (1.0.22)
110+
rails_serve_static_assets (0.0.2)
111+
rails_stdout_logging (0.0.3)
112+
railties (4.1.6)
113+
actionpack (= 4.1.6)
114+
activesupport (= 4.1.6)
110115
rake (>= 0.8.7)
111116
thor (>= 0.18.1, < 2.0)
112117
rake (10.3.2)
113-
rdoc (4.1.1)
118+
rdoc (4.1.2)
114119
json (~> 1.4)
115-
rspec-core (3.0.4)
116-
rspec-support (~> 3.0.0)
117-
rspec-expectations (3.0.4)
120+
rspec-core (3.1.4)
121+
rspec-support (~> 3.1.0)
122+
rspec-expectations (3.1.1)
118123
diff-lcs (>= 1.2.0, < 2.0)
119-
rspec-support (~> 3.0.0)
120-
rspec-mocks (3.0.4)
121-
rspec-support (~> 3.0.0)
122-
rspec-rails (3.0.2)
124+
rspec-support (~> 3.1.0)
125+
rspec-mocks (3.1.1)
126+
rspec-support (~> 3.1.0)
127+
rspec-rails (3.1.0)
123128
actionpack (>= 3.0)
124129
activesupport (>= 3.0)
125130
railties (>= 3.0)
126-
rspec-core (~> 3.0.0)
127-
rspec-expectations (~> 3.0.0)
128-
rspec-mocks (~> 3.0.0)
129-
rspec-support (~> 3.0.0)
130-
rspec-support (3.0.4)
131+
rspec-core (~> 3.1.0)
132+
rspec-expectations (~> 3.1.0)
133+
rspec-mocks (~> 3.1.0)
134+
rspec-support (~> 3.1.0)
135+
rspec-support (3.1.0)
131136
rubyzip (1.1.6)
132137
sass (3.2.19)
133138
sass-rails (4.0.3)
@@ -138,86 +143,33 @@ GEM
138143
sdoc (0.4.1)
139144
json (~> 1.7, >= 1.7.7)
140145
rdoc (~> 4.0)
141-
selenium-webdriver (2.42.0)
142-
childprocess (>= 0.5.0)
146+
selenium-webdriver (2.43.0)
147+
childprocess (~> 0.5)
143148
multi_json (~> 1.0)
144149
rubyzip (~> 1.0)
145-
websocket (~> 1.0.4)
150+
websocket (~> 1.0)
146151
spring (1.1.3)
147152
sprockets (2.11.0)
148153
hike (~> 1.2)
149154
multi_json (~> 1.0)
150155
rack (~> 1.0)
151156
tilt (~> 1.1, != 1.3.0)
152-
sprockets-rails (2.1.3)
157+
sprockets-rails (2.1.4)
153158
actionpack (>= 3.0)
154159
activesupport (>= 3.0)
155160
sprockets (~> 2.8)
156161
sqlite3 (1.3.9)
157162
thor (0.19.1)
158163
thread_safe (0.3.4)
159164
tilt (1.4.1)
160-
treetop (1.4.15)
161-
polyglot
162-
polyglot
163-
polyglot
164-
polyglot
165-
polyglot
166-
polyglot
167-
polyglot
168-
polyglot
169-
polyglot
170-
polyglot
171-
polyglot
172-
polyglot
173-
polyglot
174-
polyglot
175-
polyglot
176-
polyglot
177-
polyglot
178-
polyglot (>= 0.3.1)
179-
polyglot (>= 0.3.1)
180-
polyglot (>= 0.3.1)
181-
polyglot (>= 0.3.1)
182-
polyglot (>= 0.3.1)
183-
polyglot (>= 0.3.1)
184-
polyglot (>= 0.3.1)
185-
polyglot (>= 0.3.1)
186-
polyglot (>= 0.3.1)
187-
polyglot (>= 0.3.1)
188-
polyglot (>= 0.3.1)
189-
polyglot (>= 0.3.1)
190-
polyglot (>= 0.3.1)
191-
polyglot (>= 0.3.1)
192-
polyglot (>= 0.3.1)
193-
polyglot (>= 0.3.1)
194-
polyglot (>= 0.3.1)
195-
polyglot (>= 0.3.1)
196-
polyglot (>= 0.3.1)
197-
polyglot (>= 0.3.1)
198-
polyglot (>= 0.3.1)
199-
polyglot (>= 0.3.1)
200-
polyglot (>= 0.3.1)
201-
polyglot (>= 0.3.1)
202-
polyglot (>= 0.3.1)
203-
polyglot (>= 0.3.1)
204-
polyglot (>= 0.3.1)
205-
polyglot (>= 0.3.1)
206-
polyglot (>= 0.3.1)
207-
polyglot (>= 0.3.1)
208-
polyglot (>= 0.3.1)
209-
polyglot (>= 0.3.1)
210-
polyglot (>= 0.3.1)
211-
polyglot (>= 0.3.1)
212-
polyglot (>= 0.3.1)
213-
turbolinks (2.2.2)
165+
turbolinks (2.3.0)
214166
coffee-rails
215167
tzinfo (1.2.2)
216168
thread_safe (~> 0.1)
217169
uglifier (2.5.3)
218170
execjs (>= 0.3.0)
219171
json (>= 1.8.0)
220-
websocket (1.0.7)
172+
websocket (1.2.1)
221173
xpath (2.0.0)
222174
nokogiri (~> 1.3)
223175

@@ -237,8 +189,10 @@ DEPENDENCIES
237189
jbuilder (~> 2.0)
238190
jquery-rails
239191
launchy
192+
pg
240193
quiet_assets
241-
rails (= 4.1.5)
194+
rails (= 4.1.6)
195+
rails_12factor
242196
rails_layout
243197
rspec-rails
244198
sass-rails (~> 4.0.3)

0 commit comments

Comments
 (0)