Skip to content

Commit 75a7524

Browse files
committed
bump gems
UPDATED: activesupport 4.2.6 5.0.0.1 autoprefixer-rails 6.3.6.2 6.5.0.1 bootstrap-sass 3.3.6 3.3.7 daemons 1.2.3 1.2.4 eventmachine 1.0.9.1 1.2.0.1 ffi 1.9.10 1.9.14 json 1.8.3 2.0.2 minitest 5.9.0 5.9.1 rake 11.1.2 11.3.0 rspec 3.4.0 3.5.0 rspec-core 3.4.4 3.5.4 rspec-expectations 3.4.0 3.5.0 rspec-mocks 3.4.1 3.5.0 rspec-support 3.4.1 3.5.0 sprockets 3.6.0 3.7.0 treetop 1.6.5 1.6.8
1 parent bb9b4de commit 75a7524

File tree

2 files changed

+31
-27
lines changed

2 files changed

+31
-27
lines changed

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ gem "sinatra", "~> 1.4.0"
88
gem "sinatra-contrib", "~> 1.4.0"
99
gem "nokogiri"
1010
gem "thin"
11-
gem "eventmachine", "~>1.0.3"
1211
gem 'rack-codehighlighter'
1312
gem 'coderay'
1413
gem "deckrb", "~> 0.5.2"
@@ -21,6 +20,9 @@ gem 'bootstrap-sass'
2120
gem 'jquery-cdn'
2221
gem 'sprockets'
2322

23+
# Relax this restriction if RailsInstaller starts packaging something after 2.2.4
24+
gem 'ruby_dep', '1.3.1'
25+
2426
group :development do
2527
gem "rspec"
2628
gem "rerun"

Gemfile.lock

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
4+
activesupport (5.0.0.1)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
56
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
10-
autoprefixer-rails (6.3.6.2)
9+
autoprefixer-rails (6.5.0.1)
1110
execjs
1211
backports (3.6.8)
13-
bootstrap-sass (3.3.6)
12+
bootstrap-sass (3.3.7)
1413
autoprefixer-rails (>= 5.2.1)
1514
sass (>= 3.3.4)
1615
coderay (1.1.1)
1716
concurrent-ruby (1.0.2)
18-
daemons (1.2.3)
17+
daemons (1.2.4)
1918
deckrb (0.5.2)
2019
coderay
2120
erector (>= 0.9.0)
@@ -29,22 +28,22 @@ GEM
2928
diff-lcs (1.2.5)
3029
erector (0.10.0)
3130
treetop (>= 1.2.3)
32-
eventmachine (1.0.9.1)
31+
eventmachine (1.2.0.1)
3332
execjs (2.7.0)
34-
ffi (1.9.10)
33+
ffi (1.9.14)
3534
files (0.3.1)
3635
font-awesome-sass (4.6.2)
3736
sass (>= 3.2)
3837
i18n (0.7.0)
3938
jquery-cdn (2.2.4)
4039
sprockets (>= 2)
41-
json (1.8.3)
40+
json (2.0.2)
4241
listen (3.1.5)
4342
rb-fsevent (~> 0.9, >= 0.9.4)
4443
rb-inotify (~> 0.9, >= 0.9.7)
4544
ruby_dep (~> 1.2)
4645
mini_portile2 (2.1.0)
47-
minitest (5.9.0)
46+
minitest (5.9.1)
4847
multi_json (1.12.1)
4948
nokogiri (1.6.8)
5049
mini_portile2 (~> 2.1.0)
@@ -59,26 +58,26 @@ GEM
5958
rack
6059
rack-test (0.6.3)
6160
rack (>= 1.0)
62-
rake (11.1.2)
61+
rake (11.3.0)
6362
rb-fsevent (0.9.7)
6463
rb-inotify (0.9.7)
6564
ffi (>= 0.5.0)
6665
redcarpet (2.3.0)
6766
rerun (0.11.0)
6867
listen (~> 3.0)
69-
rspec (3.4.0)
70-
rspec-core (~> 3.4.0)
71-
rspec-expectations (~> 3.4.0)
72-
rspec-mocks (~> 3.4.0)
73-
rspec-core (3.4.4)
74-
rspec-support (~> 3.4.0)
75-
rspec-expectations (3.4.0)
68+
rspec (3.5.0)
69+
rspec-core (~> 3.5.0)
70+
rspec-expectations (~> 3.5.0)
71+
rspec-mocks (~> 3.5.0)
72+
rspec-core (3.5.4)
73+
rspec-support (~> 3.5.0)
74+
rspec-expectations (3.5.0)
7675
diff-lcs (>= 1.2.0, < 2.0)
77-
rspec-support (~> 3.4.0)
78-
rspec-mocks (3.4.1)
76+
rspec-support (~> 3.5.0)
77+
rspec-mocks (3.5.0)
7978
diff-lcs (>= 1.2.0, < 2.0)
80-
rspec-support (~> 3.4.0)
81-
rspec-support (3.4.1)
79+
rspec-support (~> 3.5.0)
80+
rspec-support (3.5.0)
8281
ruby_dep (1.3.1)
8382
rubyzip (1.2.0)
8483
sass (3.4.22)
@@ -93,7 +92,7 @@ GEM
9392
rack-test
9493
sinatra (~> 1.4.0)
9594
tilt (>= 1.3, < 3)
96-
sprockets (3.6.0)
95+
sprockets (3.7.0)
9796
concurrent-ruby (~> 1.0)
9897
rack (> 1, < 3)
9998
thin (1.7.0)
@@ -102,7 +101,7 @@ GEM
102101
rack (>= 1, < 3)
103102
thread_safe (0.3.5)
104103
tilt (2.0.5)
105-
treetop (1.6.5)
104+
treetop (1.6.8)
106105
polyglot (~> 0.3)
107106
trollop (2.1.2)
108107
tzinfo (1.2.2)
@@ -117,7 +116,6 @@ DEPENDENCIES
117116
coderay
118117
deckrb (~> 0.5.2)
119118
erector (~> 0.10.0)
120-
eventmachine (~> 1.0.3)
121119
files (~> 0.3.0)
122120
font-awesome-sass
123121
i18n (~> 0.7)
@@ -130,12 +128,16 @@ DEPENDENCIES
130128
redcarpet
131129
rerun
132130
rspec
131+
ruby_dep (= 1.3.1)
133132
rubyzip
134133
sass
135134
sinatra (~> 1.4.0)
136135
sinatra-contrib (~> 1.4.0)
137136
sprockets
138137
thin
139138

139+
RUBY VERSION
140+
ruby 2.2.4p230
141+
140142
BUNDLED WITH
141-
1.11.2
143+
1.12.5

0 commit comments

Comments
 (0)