Skip to content

Commit f4a8c8b

Browse files
committed
Revert "Bump middleman + html5-boilerplate dependency to stable 3.x releases"
This reverts commit 180496e.
1 parent 5cb525e commit f4a8c8b

File tree

2 files changed

+56
-85
lines changed

2 files changed

+56
-85
lines changed

Gemfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
source 'https://rubygems.org'
22

33
gem 'rake', '~> 10.0.3'
4-
gem 'sass', '~> 3.4.0'
4+
gem 'sass', '~> 3.2.5'
55
gem 'jquery-middleman', require: false
66
gem 'zurb-foundation', '~> 4.3.2', require: false
7-
gem 'middleman', '~> 3.4.1'
7+
gem 'middleman', '~> 3.2.0'
88
gem 'middleman-deploy', '~> 1.0'
99
gem 'builder'
1010
gem 'sitemap_generator'
@@ -14,7 +14,9 @@ gem 'redcarpet'
1414
gem 'pygments.rb'
1515

1616

17-
gem 'html5-boilerplate', :require => 'html5-boilerplate'
17+
gem 'html5-boilerplate', :require => 'html5-boilerplate',
18+
:git => 'https://github.com/edenspiekermann/compass-html5-boilerplate.git',
19+
:branch => 'padrino'
1820

1921
group :production do
2022
gem 'puma', '~> 1.6.3'

Gemfile.lock

Lines changed: 51 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,80 @@
1+
GIT
2+
remote: https://github.com/edenspiekermann/compass-html5-boilerplate.git
3+
revision: e415a36afe3d5240a46d48d0c7529b92b54d09bf
4+
branch: padrino
5+
specs:
6+
html5-boilerplate (1.0.0)
7+
compass (>= 0.11.1)
8+
19
GEM
210
remote: https://rubygems.org/
311
specs:
4-
activesupport (4.2.10)
5-
i18n (~> 0.7)
6-
minitest (~> 5.1)
7-
thread_safe (~> 0.3, >= 0.3.4)
8-
tzinfo (~> 1.1)
12+
activesupport (3.2.22.5)
13+
i18n (~> 0.6, >= 0.6.4)
14+
multi_json (~> 1.0)
915
builder (3.2.3)
10-
capybara (2.4.4)
11-
mime-types (>= 1.16)
12-
nokogiri (>= 1.3.3)
13-
rack (>= 1.0.0)
14-
rack-test (>= 0.5.4)
15-
xpath (~> 2.0)
1616
chunky_png (1.3.10)
17-
coffee-script (2.4.1)
17+
coffee-script (2.2.0)
1818
coffee-script-source
1919
execjs
2020
coffee-script-source (1.12.2)
21-
compass (1.0.3)
21+
compass (0.12.7)
2222
chunky_png (~> 1.2)
23-
compass-core (~> 1.0.2)
24-
compass-import-once (~> 1.0.5)
25-
rb-fsevent (>= 0.9.3)
26-
rb-inotify (>= 0.9)
27-
sass (>= 3.3.13, < 3.5)
28-
compass-core (1.0.3)
23+
fssm (>= 0.2.7)
24+
sass (~> 3.2.19)
25+
execjs (1.4.1)
2926
multi_json (~> 1.0)
30-
sass (>= 3.3.0, < 3.5)
31-
compass-h5bp (1.0.0)
32-
compass (~> 1.0, >= 1.0.3)
33-
compass-import-once (1.0.5)
34-
sass (>= 3.2, < 3.5)
35-
erubis (2.7.0)
36-
execjs (2.7.0)
3727
ffi (1.9.21)
28+
fssm (0.2.10)
3829
haml (5.0.4)
3930
temple (>= 0.8.0)
4031
tilt
4132
hike (1.2.3)
42-
hooks (0.4.1)
43-
uber (~> 0.0.14)
44-
html5-boilerplate (2.1.0)
45-
compass
46-
compass-h5bp
47-
i18n (0.7.0)
33+
i18n (0.6.11)
4834
icalendar (2.4.1)
4935
jquery-middleman (3.1.2)
5036
thor (>= 0.14, < 2.0)
5137
json (2.1.0)
5238
kramdown (1.16.2)
53-
listen (3.0.8)
54-
rb-fsevent (~> 0.9, >= 0.9.4)
55-
rb-inotify (~> 0.9, >= 0.9.7)
56-
middleman (3.4.1)
57-
coffee-script (~> 2.2)
58-
compass (>= 1.0.0, < 2.0.0)
59-
compass-import-once (= 1.0.5)
60-
execjs (~> 2.0)
61-
haml (>= 4.0.5)
39+
listen (1.3.1)
40+
rb-fsevent (>= 0.9.3)
41+
rb-inotify (>= 0.9)
42+
rb-kqueue (>= 0.2)
43+
middleman (3.2.2)
44+
coffee-script (~> 2.2.0)
45+
compass (>= 0.12.2)
46+
execjs (~> 1.4.0)
47+
haml (>= 3.1.6)
6248
kramdown (~> 1.2)
63-
middleman-core (= 3.4.1)
49+
middleman-core (= 3.2.2)
6450
middleman-sprockets (>= 3.1.2)
65-
sass (>= 3.4.0, < 4.0)
66-
uglifier (~> 2.5)
67-
middleman-core (3.4.1)
68-
activesupport (~> 4.1)
51+
sass (>= 3.1.20)
52+
uglifier (~> 2.4.0)
53+
middleman-core (3.2.2)
54+
activesupport (~> 3.2.6)
6955
bundler (~> 1.1)
70-
capybara (~> 2.4.4)
71-
erubis
72-
hooks (~> 0.3)
73-
i18n (~> 0.7.0)
74-
listen (~> 3.0.3)
75-
padrino-helpers (~> 0.12.3)
76-
rack (>= 1.4.5, < 2.0)
56+
i18n (~> 0.6.9)
57+
listen (~> 1.1)
58+
rack (>= 1.4.5)
59+
rack-test (~> 0.6.1)
7760
thor (>= 0.15.2, < 2.0)
78-
tilt (~> 1.4.1, < 2.0)
61+
tilt (~> 1.4.1)
7962
middleman-deploy (1.0.0)
8063
middleman-core (>= 3.2)
8164
net-sftp
8265
ptools
83-
middleman-sprockets (3.5.0)
84-
middleman-core (>= 3.3)
85-
sprockets (~> 2.12.1)
66+
middleman-sprockets (3.3.3)
67+
middleman-core (>= 3.2)
68+
sprockets (~> 2.2)
8669
sprockets-helpers (~> 1.1.0)
87-
sprockets-sass (~> 1.3.0)
88-
mime-types (3.1)
89-
mime-types-data (~> 3.2015)
90-
mime-types-data (3.2016.0521)
70+
sprockets-sass (~> 1.1.0)
9171
mini_portile2 (2.3.0)
92-
minitest (5.11.3)
9372
multi_json (1.13.1)
9473
net-sftp (2.1.2)
9574
net-ssh (>= 2.6.5)
9675
net-ssh (4.2.0)
9776
nokogiri (1.8.2)
9877
mini_portile2 (~> 2.3.0)
99-
padrino-helpers (0.12.8.1)
100-
i18n (~> 0.6, >= 0.6.7)
101-
padrino-support (= 0.12.8.1)
102-
tilt (~> 1.4.1)
103-
padrino-support (0.12.8.1)
104-
activesupport (>= 3.1)
10578
ptools (1.3.5)
10679
puma (1.6.3)
10780
rack (~> 1.2)
@@ -111,14 +84,16 @@ GEM
11184
rack-contrib (1.8.0)
11285
rack (~> 1.4)
11386
rack-rewrite (1.5.1)
114-
rack-test (0.8.2)
115-
rack (>= 1.0, < 3)
87+
rack-test (0.6.3)
88+
rack (>= 1.0)
11689
rake (10.0.4)
11790
rb-fsevent (0.10.2)
11891
rb-inotify (0.9.10)
11992
ffi (>= 0.5.0, < 2)
93+
rb-kqueue (0.2.5)
94+
ffi (>= 0.5.0)
12095
redcarpet (3.4.0)
121-
sass (3.4.25)
96+
sass (3.2.19)
12297
sitemap_generator (6.0.1)
12398
builder (~> 3.0)
12499
sprockets (2.12.4)
@@ -128,21 +103,15 @@ GEM
128103
tilt (~> 1.1, != 1.3.0)
129104
sprockets-helpers (1.1.0)
130105
sprockets (~> 2.0)
131-
sprockets-sass (1.3.1)
106+
sprockets-sass (1.1.0)
132107
sprockets (~> 2.0)
133108
tilt (~> 1.1)
134109
temple (0.8.0)
135110
thor (0.20.0)
136-
thread_safe (0.3.6)
137111
tilt (1.4.1)
138-
tzinfo (1.2.5)
139-
thread_safe (~> 0.1)
140-
uber (0.0.15)
141-
uglifier (2.7.2)
112+
uglifier (2.4.0)
142113
execjs (>= 0.3.0)
143114
json (>= 1.8.0)
144-
xpath (2.1.0)
145-
nokogiri (~> 1.3)
146115
zurb-foundation (4.3.2)
147116
sass (>= 3.2.0)
148117

@@ -152,10 +121,10 @@ PLATFORMS
152121
DEPENDENCIES
153122
builder
154123
coffee-script
155-
html5-boilerplate
124+
html5-boilerplate!
156125
icalendar
157126
jquery-middleman
158-
middleman (~> 3.4.1)
127+
middleman (~> 3.2.0)
159128
middleman-deploy (~> 1.0)
160129
nokogiri
161130
puma (~> 1.6.3)
@@ -165,7 +134,7 @@ DEPENDENCIES
165134
rake (~> 10.0.3)
166135
rb-inotify (~> 0.9)
167136
redcarpet
168-
sass (~> 3.4.0)
137+
sass (~> 3.2.5)
169138
sitemap_generator
170139
zurb-foundation (~> 4.3.2)
171140

0 commit comments

Comments
 (0)