trusty-cms 1.1.0.rc1 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/Gemfile.lock +12 -8
  2. data/lib/trusty_cms.rb +1 -1
  3. data/spec/rails_helper.rb +1 -1
  4. data/tmp/cache/747/A70/TrustyCms%3A%3AConfig +0 -0
  5. data/tmp/cache/85C/FA0/TrustyCms.cache_mtime +0 -0
  6. metadata +3 -3
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (1.0.1)
4
+ trusty-cms (1.1.0.rc1)
5
5
  RedCloth (~> 4.2.0)
6
6
  acts_as_tree (~> 0.1.1)
7
7
  bundler (>= 1.0.0)
@@ -67,10 +67,14 @@ GEM
67
67
  rack-test (>= 0.5.4)
68
68
  xpath (~> 2.0)
69
69
  chunky_png (1.3.3)
70
- ckeditor (4.1.0)
71
- mime-types
70
+ ckeditor (4.1.1)
71
+ cocaine
72
72
  orm_adapter (~> 0.5.0)
73
+ climate_control (0.0.3)
74
+ activesupport (>= 3.0)
73
75
  cliver (0.3.2)
76
+ cocaine (0.5.4)
77
+ climate_control (>= 0.0.3, < 1.0)
74
78
  coderay (1.1.0)
75
79
  compass (1.0.1)
76
80
  chunky_png (~> 1.2)
@@ -95,7 +99,7 @@ GEM
95
99
  eventmachine (1.0.3-java)
96
100
  ffi (1.9.6)
97
101
  ffi (1.9.6-java)
98
- haml (4.0.5)
102
+ haml (4.0.6)
99
103
  tilt
100
104
  haml-rails (0.4)
101
105
  actionpack (>= 3.1, < 4.1)
@@ -124,9 +128,9 @@ GEM
124
128
  mini_portile (0.6.1)
125
129
  multi_json (1.10.1)
126
130
  mysql (2.9.1)
127
- nokogiri (1.6.4.1)
131
+ nokogiri (1.6.5)
128
132
  mini_portile (~> 0.6.0)
129
- nokogiri (1.6.4.1-java)
133
+ nokogiri (1.6.5-java)
130
134
  orm_adapter (0.5.0)
131
135
  poltergeist (1.5.1)
132
136
  capybara (~> 2.1)
@@ -166,7 +170,7 @@ GEM
166
170
  rake (>= 0.8.7)
167
171
  rdoc (~> 3.4)
168
172
  thor (>= 0.14.6, < 2.0)
169
- rake (10.3.2)
173
+ rake (10.4.1)
170
174
  rb-fsevent (0.9.4)
171
175
  rb-inotify (0.9.5)
172
176
  ffi (>= 0.5.0)
@@ -188,7 +192,7 @@ GEM
188
192
  rspec-mocks (~> 3.0.0)
189
193
  rspec-support (~> 3.0.0)
190
194
  rspec-support (3.0.4)
191
- sass (3.4.8)
195
+ sass (3.4.9)
192
196
  slop (3.6.0)
193
197
  spoon (0.0.4)
194
198
  ffi
data/lib/trusty_cms.rb CHANGED
@@ -6,7 +6,7 @@ unless defined? TrustyCms::Version
6
6
  Major = '1'
7
7
  Minor = '1'
8
8
  Tiny = '0'
9
- Patch = 'rc1' # set to nil for normal release
9
+ Patch = nil # set to nil for normal release
10
10
 
11
11
  class << self
12
12
  def to_s
data/spec/rails_helper.rb CHANGED
@@ -8,7 +8,7 @@ require 'capybara/poltergeist'
8
8
  Capybara.javascript_driver = :poltergeist
9
9
 
10
10
  Capybara.register_driver :poltergeist do |app|
11
- Capybara::Poltergeist::Driver.new(app, timeout: 30)
11
+ Capybara::Poltergeist::Driver.new(app, timeout: 60)
12
12
  end
13
13
 
14
14
  require 'database_cleaner'
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0.rc1
5
- prerelease: 6
4
+ version: 1.1.0
5
+ prerelease:
6
6
  platform: ruby
7
7
  authors:
8
8
  - TrustyCms CMS dev team
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-12-02 00:00:00.000000000 Z
12
+ date: 2014-12-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: tzinfo