Skip to content

Commit 99cb773

Browse files
authored
Merge pull request #257 from openstax/upgrade-bootstrap-sass
Upgrade bootstrap-sass: upgrade other gems as well
2 parents 5c56c39 + c0c6c95 commit 99cb773

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ end
1212
gem 'rails', '4.2.11'
1313

1414
# Bootstrap
15-
gem 'bootstrap-sass', '~> 3.2.0'
15+
gem 'bootstrap-sass'
1616

1717
# Use SCSS for stylesheets
1818
gem 'sass-rails', '~> 5.0'

Gemfile.lock

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GEM
5656
apipie-rails (0.5.15)
5757
rails (>= 4.1)
5858
arel (6.0.4)
59-
autoprefixer-rails (9.4.10)
59+
autoprefixer-rails (9.5.0)
6060
execjs
6161
aws-ses (0.6.0)
6262
builder
@@ -65,11 +65,12 @@ GEM
6565
xml-simple
6666
baby_squeel (0.3.1)
6767
activerecord (>= 4.0.0)
68-
bootstrap-sass (3.2.0.2)
69-
sass (~> 3.2)
70-
brakeman (4.4.0)
68+
bootstrap-sass (3.4.1)
69+
autoprefixer-rails (>= 5.2.1)
70+
sassc (>= 2.0.0)
71+
brakeman (4.5.0)
7172
builder (3.2.3)
72-
byebug (11.0.0)
73+
byebug (11.0.1)
7374
carrierwave (1.3.1)
7475
activemodel (>= 4.0.0)
7576
activesupport (>= 4.0.0)
@@ -113,7 +114,7 @@ GEM
113114
compass (~> 1.0.0)
114115
sass-rails (< 5.1)
115116
sprockets (< 4.0)
116-
concurrent-ruby (1.1.4)
117+
concurrent-ruby (1.1.5)
117118
crass (1.0.4)
118119
daemons (1.3.1)
119120
database_cleaner (1.7.0)
@@ -126,9 +127,9 @@ GEM
126127
docile (1.1.5)
127128
doorkeeper (5.0.2)
128129
railties (>= 4.2)
129-
dotenv (2.7.1)
130-
dotenv-rails (2.7.1)
131-
dotenv (= 2.7.1)
130+
dotenv (2.7.2)
131+
dotenv-rails (2.7.2)
132+
dotenv (= 2.7.2)
132133
railties (>= 3.2, < 6.1)
133134
eco (1.0.0)
134135
coffee-script
@@ -161,7 +162,7 @@ GEM
161162
jquery-rails
162163
rails (>= 4.2)
163164
responders
164-
fog-aws (3.3.0)
165+
fog-aws (3.4.0)
165166
fog-core (~> 2.1)
166167
fog-json (~> 1.1)
167168
fog-xml (~> 0.1)
@@ -234,7 +235,7 @@ GEM
234235
multi_xml (0.6.0)
235236
multipart-post (2.0.0)
236237
nifty-generators (0.4.6)
237-
nokogiri (1.10.1)
238+
nokogiri (1.10.2)
238239
mini_portile2 (~> 2.4.0)
239240
nokogumbo (2.0.1)
240241
nokogiri (~> 1.8, >= 1.8.4)
@@ -244,7 +245,7 @@ GEM
244245
multi_json (~> 1.3)
245246
multi_xml (~> 0.5)
246247
rack (>= 1.2, < 3)
247-
oj (3.7.9)
248+
oj (3.7.11)
248249
oj_mimic_json (1.0.1)
249250
omniauth (1.9.0)
250251
hashie (>= 3.4.6, < 3.7.0)
@@ -285,7 +286,7 @@ GEM
285286
lev
286287
rails (>= 3.1)
287288
pager (1.0.1)
288-
parallel (1.14.0)
289+
parallel (1.16.0)
289290
parallel_tests (2.28.0)
290291
parallel
291292
pg (0.21.0)
@@ -407,6 +408,9 @@ GEM
407408
sprockets (>= 2.8, < 4.0)
408409
sprockets-rails (>= 2.0, < 4.0)
409410
tilt (>= 1.1, < 3)
411+
sassc (2.0.1)
412+
ffi (~> 1.9)
413+
rake
410414
scout_apm (3.0.0.pre28)
411415
sentry-raven (2.9.0)
412416
faraday (>= 0.7.6, < 1.0)
@@ -484,7 +488,7 @@ DEPENDENCIES
484488
apipie-rails
485489
autoprefixer-rails
486490
aws-ses (~> 0.6.0)
487-
bootstrap-sass (~> 3.2.0)
491+
bootstrap-sass
488492
brakeman
489493
byebug
490494
carrierwave

0 commit comments

Comments
 (0)