Skip to content

Commit a512ef0

Browse files
committedApr 26, 2015
Merge pull request #68 from rspec/upgrade_gems
Updated gems
2 parents abaacbe + db8ad8c commit a512ef0

File tree

1 file changed

+50
-50
lines changed

1 file changed

+50
-50
lines changed
 

‎Gemfile.lock

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: git://github.com/middleman/middleman-syntax.git
3-
revision: 8874c7aca904c96589ccd2ee031082fc2df69f7d
3+
revision: d1a49ee30f9a2ef939a00b78f3b38cca6c5bcc0c
44
specs:
55
middleman-syntax (2.0.0)
66
middleman-core (~> 3.2)
@@ -9,32 +9,32 @@ GIT
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
activesupport (4.1.7)
12+
activesupport (4.1.10)
1313
i18n (~> 0.6, >= 0.6.9)
1414
json (~> 1.7, >= 1.7.7)
1515
minitest (~> 5.1)
1616
thread_safe (~> 0.1)
1717
tzinfo (~> 1.1)
18-
addressable (2.3.6)
19-
bourbon (4.0.2)
20-
sass (~> 3.3)
18+
addressable (2.3.8)
19+
bourbon (4.2.2)
20+
sass (~> 3.4)
2121
thor
2222
builder (3.2.2)
2323
celluloid (0.16.0)
2424
timers (~> 4.0.0)
25-
chunky_png (1.3.3)
26-
coffee-script (2.3.0)
25+
chunky_png (1.3.4)
26+
coffee-script (2.4.1)
2727
coffee-script-source
2828
execjs
29-
coffee-script-source (1.8.0)
30-
compass (1.0.1)
29+
coffee-script-source (1.9.1.1)
30+
compass (1.0.3)
3131
chunky_png (~> 1.2)
32-
compass-core (~> 1.0.1)
32+
compass-core (~> 1.0.2)
3333
compass-import-once (~> 1.0.5)
3434
rb-fsevent (>= 0.9.3)
3535
rb-inotify (>= 0.9)
3636
sass (>= 3.3.13, < 3.5)
37-
compass-core (1.0.1)
37+
compass-core (1.0.3)
3838
multi_json (~> 1.0)
3939
sass (>= 3.3.0, < 3.5)
4040
compass-import-once (1.0.5)
@@ -44,53 +44,53 @@ GEM
4444
eventmachine (>= 0.12.9)
4545
http_parser.rb (~> 0.6.0)
4646
erubis (2.7.0)
47-
eventmachine (1.0.3)
48-
execjs (2.2.2)
47+
eventmachine (1.0.7)
48+
execjs (2.5.2)
4949
favicon_maker (1.3)
5050
docile (~> 1.1)
51-
ffi (1.9.6)
52-
haml (4.0.5)
51+
ffi (1.9.8)
52+
haml (4.0.6)
5353
tilt
5454
hike (1.2.3)
5555
hitimes (1.2.2)
5656
hooks (0.4.0)
5757
uber (~> 0.0.4)
5858
http_parser.rb (0.6.0)
59-
i18n (0.6.11)
60-
json (1.8.1)
61-
kramdown (1.5.0)
62-
listen (2.7.11)
63-
celluloid (>= 0.15.2)
59+
i18n (0.7.0)
60+
json (1.8.2)
61+
kramdown (1.6.0)
62+
listen (2.10.0)
63+
celluloid (~> 0.16.0)
6464
rb-fsevent (>= 0.9.3)
6565
rb-inotify (>= 0.9)
66-
middleman (3.3.6)
66+
middleman (3.3.11)
6767
coffee-script (~> 2.2)
6868
compass (>= 1.0.0, < 2.0.0)
6969
compass-import-once (= 1.0.5)
7070
execjs (~> 2.0)
7171
haml (>= 4.0.5)
7272
kramdown (~> 1.2)
73-
middleman-core (= 3.3.6)
73+
middleman-core (= 3.3.11)
7474
middleman-sprockets (>= 3.1.2)
7575
sass (>= 3.4.0, < 4.0)
7676
uglifier (~> 2.5)
7777
middleman-blog (3.5.3)
7878
addressable (~> 2.3.5)
7979
middleman-core (~> 3.2)
8080
tzinfo (>= 0.3.0)
81-
middleman-core (3.3.6)
81+
middleman-core (3.3.11)
8282
activesupport (~> 4.1.0)
8383
bundler (~> 1.1)
8484
erubis
8585
hooks (~> 0.3)
86-
i18n (~> 0.6.9)
86+
i18n (~> 0.7.0)
8787
listen (>= 2.7.9, < 3.0)
8888
padrino-helpers (~> 0.12.3)
8989
rack (>= 1.4.5, < 2.0)
9090
rack-test (~> 0.6.2)
9191
thor (>= 0.15.2, < 2.0)
9292
tilt (~> 1.4.1, < 2.0)
93-
middleman-deploy (0.3.0)
93+
middleman-deploy (1.0.0)
9494
middleman-core (>= 3.2)
9595
net-sftp
9696
ptools
@@ -101,41 +101,41 @@ GEM
101101
em-websocket (~> 0.5.1)
102102
middleman-core (~> 3.2)
103103
rack-livereload (~> 0.3.15)
104-
middleman-sprockets (3.3.10)
105-
middleman-core (~> 3.3)
104+
middleman-sprockets (3.4.2)
105+
middleman-core (>= 3.3)
106106
sprockets (~> 2.12.1)
107107
sprockets-helpers (~> 1.1.0)
108-
sprockets-sass (~> 1.2.0)
109-
mini_portile (0.6.1)
110-
minitest (5.4.2)
111-
multi_json (1.10.1)
112-
neat (1.6.0)
113-
bourbon (>= 3.1)
108+
sprockets-sass (~> 1.3.0)
109+
mini_portile (0.6.2)
110+
minitest (5.6.0)
111+
multi_json (1.11.0)
112+
neat (1.7.2)
113+
bourbon (>= 4.0)
114114
sass (>= 3.3)
115115
net-sftp (2.1.2)
116116
net-ssh (>= 2.6.5)
117-
net-ssh (2.9.1)
118-
nokogiri (1.6.5)
117+
net-ssh (2.9.2)
118+
nokogiri (1.6.6.2)
119119
mini_portile (~> 0.6.0)
120-
padrino-helpers (0.12.4)
120+
padrino-helpers (0.12.5)
121121
i18n (~> 0.6, >= 0.6.7)
122-
padrino-support (= 0.12.4)
122+
padrino-support (= 0.12.5)
123123
tilt (~> 1.4.1)
124-
padrino-support (0.12.4)
124+
padrino-support (0.12.5)
125125
activesupport (>= 3.1)
126-
ptools (1.2.6)
127-
rack (1.5.2)
126+
ptools (1.3.2)
127+
rack (1.6.0)
128128
rack-livereload (0.3.15)
129129
rack
130-
rack-test (0.6.2)
130+
rack-test (0.6.3)
131131
rack (>= 1.0)
132132
rb-fsevent (0.9.4)
133133
rb-inotify (0.9.5)
134134
ffi (>= 0.5.0)
135-
rouge (1.7.1)
136-
sass (3.4.7)
137-
slim (2.0.3)
138-
temple (~> 0.6.6)
135+
rouge (1.8.0)
136+
sass (3.4.13)
137+
slim (3.0.3)
138+
temple (~> 0.7.3)
139139
tilt (>= 1.3.3, < 2.1)
140140
sprockets (2.12.3)
141141
hike (~> 1.2)
@@ -144,19 +144,19 @@ GEM
144144
tilt (~> 1.1, != 1.3.0)
145145
sprockets-helpers (1.1.0)
146146
sprockets (~> 2.0)
147-
sprockets-sass (1.2.0)
147+
sprockets-sass (1.3.1)
148148
sprockets (~> 2.0)
149149
tilt (~> 1.1)
150-
temple (0.6.8)
150+
temple (0.7.5)
151151
thor (0.19.1)
152-
thread_safe (0.3.4)
152+
thread_safe (0.3.5)
153153
tilt (1.4.1)
154154
timers (4.0.1)
155155
hitimes
156156
tzinfo (1.2.2)
157157
thread_safe (~> 0.1)
158-
uber (0.0.10)
159-
uglifier (2.5.3)
158+
uber (0.0.13)
159+
uglifier (2.7.1)
160160
execjs (>= 0.3.0)
161161
json (>= 1.8.0)
162162

0 commit comments

Comments
 (0)
Please sign in to comment.