Skip to content

Commit 7b79f69

Browse files
committed
bump version to 3.2.0 + last versions of Steam and CustomFields
1 parent fa0fe01 commit 7b79f69

File tree

5 files changed

+40
-47
lines changed

5 files changed

+40
-47
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ group :development do
2525
# gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b', require: false
2626

2727
# gem 'locomotivecms_steam', path: '../gems/steam', require: false
28-
gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'a2cba33', require: false
28+
# gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'a2cba33', require: false
2929

3030
# gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
3131
# gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

Gemfile.lock

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,18 @@ GIT
44
specs:
55
database_cleaner (1.5.3)
66

7-
GIT
8-
remote: git://github.com/locomotivecms/steam.git
9-
revision: a2cba33b3e70c3bb1f08465a6e4a75f469a43e85
10-
ref: a2cba33
11-
specs:
12-
locomotivecms_steam (1.2.0.rc2)
13-
RedCloth (~> 4.3.2)
14-
autoprefixer-rails (~> 6.3.3.1)
15-
chronic (~> 0.10.2)
16-
coffee-script (~> 2.4.1)
17-
compass (~> 1.0.3)
18-
dragonfly (~> 1.0.12)
19-
duktape (~> 1.3.0.6)
20-
httparty (~> 0.13.6)
21-
kramdown (~> 1.10.0)
22-
locomotivecms-solid (~> 4.0.1)
23-
locomotivecms_common (~> 0.2.0)
24-
mime-types (~> 2.6.1)
25-
mimetype-fu (~> 0.1.2)
26-
moneta (~> 0.8.0)
27-
morphine (~> 0.1.1)
28-
nokogiri (~> 1.6.8)
29-
pony (~> 1.11)
30-
rack-cache (~> 1.6.1)
31-
rack-rewrite (~> 1.5.1)
32-
rack_csrf (~> 2.5.0)
33-
sanitize (~> 4.0.1)
34-
sass (~> 3.4.21)
35-
sprockets (~> 3.5.2)
36-
377
PATH
388
remote: .
399
specs:
40-
locomotivecms (3.2.0.rc2)
10+
locomotivecms (3.2.0)
4111
actionmailer-with-request (~> 0.4.0)
4212
autoprefixer-rails (~> 6.3.3.1)
4313
bazaar (~> 0.0.2)
4414
bootstrap-kaminari-views (~> 0.0.5)
4515
bootstrap-sass (~> 3.3.6)
4616
carrierwave-mongoid (~> 0.8.1)
4717
codemirror-rails (~> 5.6)
48-
custom_fields (~> 2.7.0.rc1)
18+
custom_fields (~> 2.7.0)
4919
devise (~> 3.5.1)
5020
devise-encryptable (~> 0.2.0)
5121
dragonfly (~> 1.0.7)
@@ -58,7 +28,7 @@ PATH
5828
jquery-ui-rails (~> 5.0.3)
5929
json-schema (~> 2.6.1)
6030
kaminari (~> 0.16.3)
61-
locomotivecms_steam (~> 1.2.0.rc2)
31+
locomotivecms_steam (~> 1.2.0)
6232
mime-types (~> 2.6.2)
6333
mimetype-fu (~> 0.1.2)
6434
mongo_session_store-rails4 (~> 6.0.0)
@@ -164,7 +134,7 @@ GEM
164134
mongoid (>= 3.0, < 6.0)
165135
mongoid-grid_fs (>= 1.3, < 3.0)
166136
chronic (0.10.2)
167-
chunky_png (1.3.7)
137+
chunky_png (1.3.8)
168138
codemirror-rails (5.16.0)
169139
railties (>= 3.0, < 6.0)
170140
coderay (1.1.1)
@@ -209,7 +179,7 @@ GEM
209179
cucumber-core (1.5.0)
210180
gherkin (~> 4.0)
211181
cucumber-wire (0.0.1)
212-
custom_fields (2.7.0.rc1)
182+
custom_fields (2.7.0)
213183
activesupport (~> 4.2.5)
214184
carrierwave-mongoid (~> 0.8.1)
215185
monetize (~> 1.4.0)
@@ -279,7 +249,7 @@ GEM
279249
grape-entity-matchers (1.0.1)
280250
grape-entity (~> 0.4.0)
281251
rspec (>= 3.2.0)
282-
hashie (3.4.4)
252+
hashie (3.4.6)
283253
highline (1.7.8)
284254
htmlentities (4.3.4)
285255
http-cookie (1.0.2)
@@ -323,6 +293,30 @@ GEM
323293
attr_extras (~> 4.4.0)
324294
colorize
325295
stringex (~> 2.6.0)
296+
locomotivecms_steam (1.2.0)
297+
RedCloth (~> 4.3.2)
298+
autoprefixer-rails (~> 6.3.3.1)
299+
chronic (~> 0.10.2)
300+
coffee-script (~> 2.4.1)
301+
compass (~> 1.0.3)
302+
dragonfly (~> 1.0.12)
303+
duktape (~> 1.3.0.6)
304+
httparty (~> 0.13.6)
305+
kramdown (~> 1.10.0)
306+
locomotivecms-solid (~> 4.0.1)
307+
locomotivecms_common (~> 0.2.0)
308+
mime-types (~> 2.6.1)
309+
mimetype-fu (~> 0.1.2)
310+
moneta (~> 0.8.0)
311+
morphine (~> 0.1.1)
312+
nokogiri (~> 1.6.8)
313+
pony (~> 1.11)
314+
rack-cache (~> 1.6.1)
315+
rack-rewrite (~> 1.5.1)
316+
rack_csrf (~> 2.5.0)
317+
sanitize (~> 4.0.1)
318+
sass (~> 3.4.21)
319+
sprockets (~> 3.5.2)
326320
loofah (2.0.3)
327321
nokogiri (>= 1.5.9)
328322
mail (2.6.4)
@@ -338,11 +332,11 @@ GEM
338332
money (6.7.1)
339333
i18n (>= 0.6.4, <= 0.7.0)
340334
sixarm_ruby_unaccent (>= 1.1.1, < 2)
341-
mongo (2.3.0)
335+
mongo (2.3.1)
342336
bson (~> 4.1)
343337
mongo_session_store-rails4 (6.0.0)
344338
actionpack (>= 3.1)
345-
mongoid (5.1.4)
339+
mongoid (5.1.5)
346340
activemodel (~> 4.0)
347341
mongo (~> 2.1)
348342
origin (~> 2.2)
@@ -361,10 +355,10 @@ GEM
361355
nokogiri (1.6.8)
362356
mini_portile2 (~> 2.1.0)
363357
pkg-config (~> 1.1.7)
364-
nokogumbo (1.4.9)
358+
nokogumbo (1.4.10)
365359
nokogiri
366360
nprogress-rails (0.1.6.8)
367-
origin (2.2.0)
361+
origin (2.2.2)
368362
orm_adapter (0.5.0)
369363
pickle (0.5.1)
370364
cucumber (>= 0.8)
@@ -424,7 +418,7 @@ GEM
424418
rake (>= 0.8.7)
425419
thor (>= 0.18.1, < 2.0)
426420
rake (10.5.0)
427-
rb-fsevent (0.9.7)
421+
rb-fsevent (0.9.8)
428422
rb-inotify (0.9.7)
429423
ffi (>= 0.5.0)
430424
responders (2.1.2)
@@ -540,7 +534,6 @@ DEPENDENCIES
540534
i18n-tasks (~> 0.8.7)
541535
json_spec (~> 1.1.4)
542536
locomotivecms!
543-
locomotivecms_steam!
544537
pickle
545538
pry
546539
pry-byebug

lib/locomotive/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# MAJOR.MINOR.PATCH format.
33
# 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
44
module Locomotive #:nodoc
5-
VERSION = '3.2.0.rc2'
5+
VERSION = '3.2.0'
66
end

locomotive_cms.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Gem::Specification.new do |s|
3232
s.add_dependency 'mongoid-tree', '~> 2.0.1'
3333
s.add_dependency 'mongo_session_store-rails4', '~> 6.0.0'
3434

35-
s.add_dependency 'custom_fields', '~> 2.7.0.rc1'
36-
s.add_dependency 'locomotivecms_steam', '~> 1.2.0.rc2'
35+
s.add_dependency 'custom_fields', '~> 2.7.0'
36+
s.add_dependency 'locomotivecms_steam', '~> 1.2.0'
3737

3838
s.add_dependency 'slim', '~> 3.0.6'
3939
s.add_dependency 'simple_form', '~> 3.2.0'

spec/requests/locomotive/steam/cache_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
subject { middleware.send(:cache_key, steam_env) }
4141

42-
it { expect(subject).to eq 'fd87f5b55149276bc20fcc26465d27c9' }
42+
it { expect(subject).to eq 'e5bc074a017ba05e140a16185e3e38f7' }
4343

4444
end
4545

0 commit comments

Comments
 (0)