Skip to content

Commit 0a7d65d

Browse files
committed
update Steam to 1.1.rc3 + bump version to 3.1.0.rc3
1 parent a2b6db6 commit 0a7d65d

File tree

5 files changed

+29
-36
lines changed

5 files changed

+29
-36
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: 'a3054f1', require: false
28+
# gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'a3054f1', 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: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,10 @@ GIT
44
specs:
55
database_cleaner (1.5.1)
66

7-
GIT
8-
remote: git://github.com/locomotivecms/steam.git
9-
revision: a3054f11cfbd75f6ced45ed96bc47f3bc738edc2
10-
ref: a3054f1
11-
specs:
12-
locomotivecms_steam (1.1.0.rc2)
13-
RedCloth (~> 4.2.9)
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-
haml (~> 4.0.6)
20-
httparty (~> 0.13.6)
21-
kramdown (~> 1.10.0)
22-
locomotivecms-solid (~> 4.0.1)
23-
locomotivecms_common (~> 0.1.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.7.2)
29-
rack-cache (~> 1.6.1)
30-
rack-rewrite (~> 1.5.1)
31-
rack_csrf (~> 2.5.0)
32-
sanitize (~> 4.0.1)
33-
sass (~> 3.4.21)
34-
sprockets (~> 3.5.2)
35-
367
PATH
378
remote: .
389
specs:
39-
locomotivecms (3.1.0.rc2)
10+
locomotivecms (3.1.0.rc3)
4011
actionmailer-with-request (~> 0.4.0)
4112
autoprefixer-rails (~> 6.3.3.1)
4213
bazaar (~> 0.0.2)
@@ -57,7 +28,7 @@ PATH
5728
jquery-ui-rails (~> 5.0.3)
5829
json-schema (~> 2.6.1)
5930
kaminari (~> 0.16.3)
60-
locomotivecms_steam (~> 1.1.0.rc2)
31+
locomotivecms_steam (~> 1.1.0.rc3)
6132
mime-types (~> 2.6.2)
6233
mimetype-fu (~> 0.1.2)
6334
mongo_session_store-rails4 (~> 6.0.0)
@@ -322,6 +293,29 @@ GEM
322293
attr_extras (~> 4.4.0)
323294
colorize
324295
stringex (~> 2.6.0)
296+
locomotivecms_steam (1.1.0.rc3)
297+
RedCloth (~> 4.2.9)
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+
haml (~> 4.0.6)
304+
httparty (~> 0.13.6)
305+
kramdown (~> 1.10.0)
306+
locomotivecms-solid (~> 4.0.1)
307+
locomotivecms_common (~> 0.1.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.7.2)
313+
rack-cache (~> 1.6.1)
314+
rack-rewrite (~> 1.5.1)
315+
rack_csrf (~> 2.5.0)
316+
sanitize (~> 4.0.1)
317+
sass (~> 3.4.21)
318+
sprockets (~> 3.5.2)
325319
loofah (2.0.3)
326320
nokogiri (>= 1.5.9)
327321
mail (2.6.3)
@@ -536,7 +530,6 @@ DEPENDENCIES
536530
i18n-tasks (~> 0.8.7)
537531
json_spec (~> 1.1.4)
538532
locomotivecms!
539-
locomotivecms_steam!
540533
pickle
541534
pry
542535
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.1.0.rc2'
5+
VERSION = '3.1.0.rc3'
66
end

locomotive_cms.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
3333
s.add_dependency 'mongo_session_store-rails4', '~> 6.0.0'
3434

3535
s.add_dependency 'custom_fields', '~> 2.7.0.rc1'
36-
s.add_dependency 'locomotivecms_steam', '~> 1.1.0.rc2'
36+
s.add_dependency 'locomotivecms_steam', '~> 1.1.0.rc3'
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 '2bf770af7c75d80bb8e87d21bde9ac4f' }
42+
it { expect(subject).to eq '76ecaab214311e09f51d2f2673d13a2b' }
4343

4444
end
4545

0 commit comments

Comments
 (0)