trusty-cms 3.1.10 → 3.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +46 -46
  3. data/app/controllers/admin/page_fields_controller.rb +1 -1
  4. data/app/views/admin/layouts/_site_chooser.html.haml +0 -2
  5. data/app/views/admin/sites/edit.haml +0 -1
  6. data/app/views/admin/sites/index.haml +1 -2
  7. data/app/views/admin/sites/new.haml +0 -1
  8. data/lib/trusty_cms.rb +1 -1
  9. data/vendor/extensions/multi-site-extension/lib/multi_site/engine.rb +0 -4
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e1b4c73711f7c592579a1564ca3191d6e528d332
4
- data.tar.gz: c21141b06db1db5e76767dca9dd3d2c1b063021b
3
+ metadata.gz: a3260a9da5f00e7da4f5c2efab2fdf782490f5c0
4
+ data.tar.gz: 259eaf17d2f4dbabc127ef1940ec04c57d5588be
5
5
  SHA512:
6
- metadata.gz: 775d838815bf49148043a016da84381e5769c0db320105e95382f7a1b00d1b045d70c4f322d4e1b006adecca539dfeb98955ab70def68a2bc4e27fdc709841ec
7
- data.tar.gz: db51f3e79eb9cdcd7f7724009d1f25579ef61e97479803c6e14493adbad3e6ea44e3814701fb1fe84c871b40bbd58f4f3d0588627e2ba63cc8bdc002cac18e04
6
+ metadata.gz: c8a332f33aa2c30556cabd2c696151c560a14efc8f2929dd0b0fdae5e77ee81cc068b99fe3ee1b2a89c4029b034bb8154a35f330b15d2bef59177c394db4bc26
7
+ data.tar.gz: c1ee6c5e3077728602f86850b1e502be35efab85f3cc393b6b6666af5b652632a4325cb0e6e6a92dc1b1a7a87b7b2f031df3a6cafa2f8ebc44cba8d0a81d54ae
data/Gemfile.lock CHANGED
@@ -8,7 +8,7 @@ GIT
8
8
  PATH
9
9
  remote: .
10
10
  specs:
11
- trusty-cms (3.1.10)
11
+ trusty-cms (3.1.11)
12
12
  RedCloth (~> 4.3.2)
13
13
  acts_as_tree (~> 2.6.1)
14
14
  bundler (~> 1.7)
@@ -38,39 +38,39 @@ GEM
38
38
  remote: https://rubygems.org/
39
39
  specs:
40
40
  RedCloth (4.3.2)
41
- actioncable (5.1.4)
42
- actionpack (= 5.1.4)
41
+ actioncable (5.1.5)
42
+ actionpack (= 5.1.5)
43
43
  nio4r (~> 2.0)
44
44
  websocket-driver (~> 0.6.1)
45
- actionmailer (5.1.4)
46
- actionpack (= 5.1.4)
47
- actionview (= 5.1.4)
48
- activejob (= 5.1.4)
45
+ actionmailer (5.1.5)
46
+ actionpack (= 5.1.5)
47
+ actionview (= 5.1.5)
48
+ activejob (= 5.1.5)
49
49
  mail (~> 2.5, >= 2.5.4)
50
50
  rails-dom-testing (~> 2.0)
51
- actionpack (5.1.4)
52
- actionview (= 5.1.4)
53
- activesupport (= 5.1.4)
51
+ actionpack (5.1.5)
52
+ actionview (= 5.1.5)
53
+ activesupport (= 5.1.5)
54
54
  rack (~> 2.0)
55
55
  rack-test (>= 0.6.3)
56
56
  rails-dom-testing (~> 2.0)
57
57
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
58
- actionview (5.1.4)
59
- activesupport (= 5.1.4)
58
+ actionview (5.1.5)
59
+ activesupport (= 5.1.5)
60
60
  builder (~> 3.1)
61
61
  erubi (~> 1.4)
62
62
  rails-dom-testing (~> 2.0)
63
63
  rails-html-sanitizer (~> 1.0, >= 1.0.3)
64
- activejob (5.1.4)
65
- activesupport (= 5.1.4)
64
+ activejob (5.1.5)
65
+ activesupport (= 5.1.5)
66
66
  globalid (>= 0.3.6)
67
- activemodel (5.1.4)
68
- activesupport (= 5.1.4)
69
- activerecord (5.1.4)
70
- activemodel (= 5.1.4)
71
- activesupport (= 5.1.4)
67
+ activemodel (5.1.5)
68
+ activesupport (= 5.1.5)
69
+ activerecord (5.1.5)
70
+ activemodel (= 5.1.5)
71
+ activesupport (= 5.1.5)
72
72
  arel (~> 8.0)
73
- activesupport (5.1.4)
73
+ activesupport (5.1.5)
74
74
  concurrent-ruby (~> 1.0, >= 1.0.2)
75
75
  i18n (~> 0.7)
76
76
  minitest (~> 5.1)
@@ -83,7 +83,7 @@ GEM
83
83
  public_suffix (>= 2.0.2, < 4.0)
84
84
  arel (8.0.0)
85
85
  builder (3.2.3)
86
- byebug (9.1.0)
86
+ byebug (10.0.0)
87
87
  capybara (2.13.0)
88
88
  addressable
89
89
  mime-types (>= 1.16)
@@ -135,7 +135,7 @@ GEM
135
135
  factory_girl_rails (4.6.0)
136
136
  factory_girl (~> 4.5.0)
137
137
  railties (>= 3.0.0)
138
- ffi (1.9.21)
138
+ ffi (1.9.23)
139
139
  globalid (0.4.1)
140
140
  activesupport (>= 4.2.0)
141
141
  haml (5.0.4)
@@ -153,13 +153,13 @@ GEM
153
153
  haml (>= 4.0, < 6)
154
154
  nokogiri (>= 1.6.0)
155
155
  ruby_parser (~> 3.5)
156
- i18n (0.9.3)
156
+ i18n (0.9.5)
157
157
  concurrent-ruby (~> 1.0)
158
158
  json (2.1.0)
159
159
  launchy (2.4.3)
160
160
  addressable (~> 2.3)
161
161
  libv8 (3.16.14.19)
162
- loofah (2.1.1)
162
+ loofah (2.2.0)
163
163
  crass (~> 1.0.2)
164
164
  nokogiri (>= 1.5.9)
165
165
  mail (2.7.0)
@@ -185,44 +185,44 @@ GEM
185
185
  coderay (~> 1.1.0)
186
186
  method_source (~> 0.8.1)
187
187
  slop (~> 3.4)
188
- pry-byebug (3.5.1)
189
- byebug (~> 9.1)
188
+ pry-byebug (3.6.0)
189
+ byebug (~> 10.0)
190
190
  pry (~> 0.10)
191
191
  pry-rails (0.3.6)
192
192
  pry (>= 0.10.4)
193
- public_suffix (3.0.1)
193
+ public_suffix (3.0.2)
194
194
  puma (3.11.2)
195
195
  rack (2.0.4)
196
196
  rack-cache (1.7.1)
197
197
  rack (>= 0.4)
198
- rack-test (0.8.2)
198
+ rack-test (0.8.3)
199
199
  rack (>= 1.0, < 3)
200
200
  radius (0.7.4)
201
- rails (5.1.4)
202
- actioncable (= 5.1.4)
203
- actionmailer (= 5.1.4)
204
- actionpack (= 5.1.4)
205
- actionview (= 5.1.4)
206
- activejob (= 5.1.4)
207
- activemodel (= 5.1.4)
208
- activerecord (= 5.1.4)
209
- activesupport (= 5.1.4)
201
+ rails (5.1.5)
202
+ actioncable (= 5.1.5)
203
+ actionmailer (= 5.1.5)
204
+ actionpack (= 5.1.5)
205
+ actionview (= 5.1.5)
206
+ activejob (= 5.1.5)
207
+ activemodel (= 5.1.5)
208
+ activerecord (= 5.1.5)
209
+ activesupport (= 5.1.5)
210
210
  bundler (>= 1.3.0)
211
- railties (= 5.1.4)
211
+ railties (= 5.1.5)
212
212
  sprockets-rails (>= 2.0.0)
213
213
  rails-dom-testing (2.0.3)
214
214
  activesupport (>= 4.2.0)
215
215
  nokogiri (>= 1.6)
216
216
  rails-html-sanitizer (1.0.3)
217
217
  loofah (~> 2.0)
218
- railties (5.1.4)
219
- actionpack (= 5.1.4)
220
- activesupport (= 5.1.4)
218
+ railties (5.1.5)
219
+ actionpack (= 5.1.5)
220
+ activesupport (= 5.1.5)
221
221
  method_source
222
222
  rake (>= 0.8.7)
223
223
  thor (>= 0.18.1, < 2.0)
224
224
  rake (10.5.0)
225
- rb-fsevent (0.10.2)
225
+ rb-fsevent (0.10.3)
226
226
  rb-inotify (0.9.10)
227
227
  ffi (>= 0.5.0, < 2)
228
228
  rdoc (5.1.0)
@@ -250,7 +250,7 @@ GEM
250
250
  rspec-mocks (~> 3.7.0)
251
251
  rspec-support (~> 3.7.0)
252
252
  rspec-support (3.7.1)
253
- ruby_parser (3.10.1)
253
+ ruby_parser (3.11.0)
254
254
  sexp_processor (~> 4.9)
255
255
  sass (3.4.25)
256
256
  sass-rails (5.0.7)
@@ -259,7 +259,7 @@ GEM
259
259
  sprockets (>= 2.8, < 4.0)
260
260
  sprockets-rails (>= 2.0, < 4.0)
261
261
  tilt (>= 1.1, < 3)
262
- sexp_processor (4.10.0)
262
+ sexp_processor (4.10.1)
263
263
  simplecov (0.13.0)
264
264
  docile (~> 1.1.0)
265
265
  json (>= 1.8, < 3)
@@ -285,7 +285,7 @@ GEM
285
285
  tilt (2.0.8)
286
286
  trustygems (0.2.1)
287
287
  rake
288
- tzinfo (1.2.4)
288
+ tzinfo (1.2.5)
289
289
  thread_safe (~> 0.1)
290
290
  uglifier (3.2.0)
291
291
  execjs (>= 0.3.0, < 3)
@@ -320,4 +320,4 @@ DEPENDENCIES
320
320
  trustygems (~> 0.2.0)
321
321
 
322
322
  BUNDLED WITH
323
- 1.16.0
323
+ 1.16.1
data/app/controllers/admin/page_fields_controller.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  class Admin::PageFieldsController < Admin::ResourceController
2
2
  def create
3
- self.model = PageField.new(page_fields_params)
3
+ self.model.attributes = page_fields_params
4
4
  @controller_name = 'page'
5
5
  @template_name = 'edit'
6
6
  render :partial => "page_field", :object => model,
data/app/views/admin/layouts/_site_chooser.html.haml CHANGED
@@ -1,5 +1,3 @@
1
- = stylesheet_link_tag 'admin/multi_site'
2
-
3
1
  - if admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
4
2
  %nav#site_chooser
5
3
  %ul#nav
data/app/views/admin/sites/edit.haml CHANGED
@@ -1,4 +1,3 @@
1
- = stylesheet_link_tag 'admin/multi_site'
2
1
  - render_region :main do |main|
3
2
  - main.edit_header do
4
3
  %h1 Edit Site
data/app/views/admin/sites/index.haml CHANGED
@@ -1,5 +1,4 @@
1
- = stylesheet_link_tag 'admin/multi_site'
2
- = render_region :top
1
+ = render_region :top
3
2
 
4
3
  %h1 Sites
5
4
 
data/app/views/admin/sites/new.haml CHANGED
@@ -1,4 +1,3 @@
1
- = stylesheet_link_tag 'admin/multi_site'
2
1
  - render_region :main do |main|
3
2
  - main.edit_header do
4
3
  %h1 New Site
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = '3.1.10'
5
+ VERSION = '3.1.11'
6
6
  end
7
7
  end
data/vendor/extensions/multi-site-extension/lib/multi_site/engine.rb CHANGED
@@ -2,9 +2,5 @@ module MultiSite
2
2
  class Engine < Rails::Engine
3
3
  paths["app/helpers"] = []
4
4
 
5
- initializer "multi_site.assets.precompile" do |app|
6
- app.config.assets.precompile += %w(admin/multi_site.css)
7
- end
8
-
9
5
  end
10
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.10
4
+ version: 3.1.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-02-07 00:00:00.000000000 Z
11
+ date: 2018-03-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tzinfo