cambium 1.1.5 → 1.1.6

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/cambium/admin/application.scss +1 -1
  3. data/app/controllers/cambium/admin_controller.rb +3 -1
  4. data/cambium.gemspec +1 -17
  5. data/lib/cambium/version.rb +1 -1
  6. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 76f6a0f62b15e34ce43ad75bd755cc2ac5074363
4
- data.tar.gz: 5cd10be0dbc8590dd039d95cbd2e7a1dd3eab3a9
3
+ metadata.gz: b4ea6803ff7b5699c765fd57eb79353db74645cc
4
+ data.tar.gz: 92f9fee301ccb91d0bb9f9755343e39db07f1ff3
5
5
  SHA512:
6
- metadata.gz: c7a6aa8263c90cbfd7ab1ee641cec7012c807f588a41f4072e188d80e52f44b7876a5ccfe899156026df68e2956c50733071daa2d9d945a4dbb2e1486660c7fe
7
- data.tar.gz: 84fe86a884806e674a98149f99d09c90616f06e4427d34c854c9381be33fae22e3c8f4506abef9b1c917b534fdf11e5b1d2879a9d5bcd88a3c570373fed159a9
6
+ metadata.gz: 5284b848c3a7d298fd978b9650f6b64c1ece775801ba615d84f6d2db5a07bff6a035a569f63464cf8b17906bf6cf5658c0fd61c3dd70f0807d1c6b3b7557a2d0
7
+ data.tar.gz: 8bc1d2704a51bf91d44aa7fe06a63ed9a13a81413aa535100210541991fac0b0eac146d344a9d22c5a9bbbd50049414b5256bad677a75170314a875bb89c31e9
data/app/assets/stylesheets/cambium/admin/application.scss CHANGED
@@ -6,7 +6,7 @@
6
6
  @import 'pickadate/classic';
7
7
  @import 'pickadate/classic.date';
8
8
  @import 'pickadate/classic.time';
9
- @import 'mark_it_zero/mark_it_zero';
9
+ @import 'mark_it_zero';
10
10
 
11
11
  // ------------------------------------------ Partials
12
12
 
data/app/controllers/cambium/admin_controller.rb CHANGED
@@ -82,7 +82,9 @@ class Cambium::AdminController < Cambium::BaseController
82
82
 
83
83
  def set_activities
84
84
  @activities = PaperTrail::Version.order(:created_at => :desc)
85
- .includes(:item).limit(20)
85
+ .includes(:item).limit(40)
86
+ @activities = @activities
87
+ .reject { |a| a.item.blank? || a.whodunnit.blank? }.first(20)
86
88
  @users = User.where(:id => @activities.collect(&:whodunnit)
87
89
  .reject(&:blank?).map(&:to_i))
88
90
  end
data/cambium.gemspec CHANGED
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
21
21
 
22
22
  spec.add_dependency 'bones-rails', '>= 1.1.3'
23
23
  spec.add_dependency 'kaminari'
24
- spec.add_dependency 'mark_it_zero'
24
+ spec.add_dependency 'mark_it_zero', '~> 0.3.0'
25
25
  spec.add_dependency 'paper_trail'
26
26
  spec.add_dependency 'pg_search'
27
27
  spec.add_dependency 'pickadate-rails'
@@ -29,20 +29,4 @@ Gem::Specification.new do |spec|
29
29
  spec.add_dependency 'rake'
30
30
  spec.add_dependency 'superslug'
31
31
 
32
- # 'ancestry',
33
- # 'annotate', all models
34
- # 'backbone-on-rails', install:app
35
- # 'coffee-rails', install:app
36
- # 'devise', model:user
37
- # 'factory_girl_rails',
38
- # 'faker',
39
- # 'hirb',
40
- # 'jbuilder',
41
- # 'jquery-rails', install:app
42
- # 'jquery-fileupload-rails',
43
- # 'simple_form',
44
- # 'uglifier', install:app
45
- # 'unicorn-rails', install:app
46
- # 'wysihtml5-rails',
47
-
48
32
  end
data/lib/cambium/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Cambium
2
- VERSION = "1.1.5"
2
+ VERSION = "1.1.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cambium
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.5
4
+ version: 1.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean C Davis
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-05-19 00:00:00.000000000 Z
12
+ date: 2015-05-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -57,16 +57,16 @@ dependencies:
57
57
  name: mark_it_zero
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - ">="
60
+ - - "~>"
61
61
  - !ruby/object:Gem::Version
62
- version: '0'
62
+ version: 0.3.0
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - ">="
67
+ - - "~>"
68
68
  - !ruby/object:Gem::Version
69
- version: '0'
69
+ version: 0.3.0
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: paper_trail
72
72
  requirement: !ruby/object:Gem::Requirement
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
289
289
  version: '0'
290
290
  requirements: []
291
291
  rubyforge_project:
292
- rubygems_version: 2.2.0
292
+ rubygems_version: 2.4.6
293
293
  signing_key:
294
294
  specification_version: 4
295
295
  summary: Rails generators to facilitate development.