Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit c277dd4

Browse files
committed
Update gems
1 parent 3678c2a commit c277dd4

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

Gemfile.lock

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: git://github.com/carrierwaveuploader/carrierwave.git
3-
revision: 08d0aea29b058c1b98db1c19f4ccd37c9105e9eb
3+
revision: e3acabb512cb55b683b6d74a63db0723f06df091
44
specs:
55
carrierwave (0.10.0)
66
activemodel (>= 3.2.0)
@@ -67,10 +67,11 @@ GEM
6767
rack-test (>= 0.5.4)
6868
xpath (~> 2.0)
6969
commonjs (0.2.7)
70-
coveralls (0.8.9)
70+
concurrent-ruby (1.0.0)
71+
coveralls (0.8.10)
7172
json (~> 1.8)
7273
rest-client (>= 1.6.8, < 2)
73-
simplecov (~> 0.10.0)
74+
simplecov (~> 0.11.0)
7475
term-ansicolor (~> 1.3)
7576
thor (~> 0.19.1)
7677
tins (~> 1.6.0)
@@ -214,12 +215,13 @@ GEM
214215
tins (<= 1.6.0)
215216
ruby-progressbar (1.7.5)
216217
rubyzip (1.1.7)
217-
simplecov (0.10.0)
218+
simplecov (0.11.1)
218219
docile (~> 1.1.0)
219220
json (~> 1.8)
220221
simplecov-html (~> 0.10.0)
221222
simplecov-html (0.10.0)
222-
sprockets (3.4.1)
223+
sprockets (3.5.1)
224+
concurrent-ruby (~> 1.0)
223225
rack (> 1, < 3)
224226
sprockets-rails (2.3.3)
225227
actionpack (>= 3.0)
@@ -235,11 +237,11 @@ GEM
235237
thread_safe (0.3.5)
236238
tilt (2.0.1)
237239
tins (1.6.0)
238-
twitter-bootstrap-rails (3.2.0)
239-
actionpack (~> 4.1)
240-
execjs (~> 2.2)
241-
rails (~> 4.1)
242-
railties (~> 4.1)
240+
twitter-bootstrap-rails (3.2.2)
241+
actionpack (>= 3.1)
242+
execjs (>= 2.2.2, >= 2.2)
243+
less-rails (>= 2.5.0)
244+
railties (>= 3.1)
243245
tzinfo (1.2.2)
244246
thread_safe (~> 0.1)
245247
uglifier (2.7.2)

test/test_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'simplecov'
22
require 'coveralls'
3-
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
3+
SimpleCov.formatters = [
44
SimpleCov::Formatter::HTMLFormatter,
55
Coveralls::SimpleCov::Formatter
66
]

0 commit comments

Comments
 (0)