trusty-cms 2.0.21 → 2.0.22

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/Gemfile.lock +2 -2
  3. data/app/controllers/application_controller.rb +5 -0
  4. data/lib/login_system.rb +1 -1
  5. data/lib/trusty_cms.rb +1 -1
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cbc79bc42da160d18107b6fafe34bfc19002d072
4
- data.tar.gz: dcc5d74e7c208b3466df33de59688048b6b0d8ad
3
+ metadata.gz: 3e17b78af7d900ff20b2ae788ff5b60b142eb4fe
4
+ data.tar.gz: 2ca88df7b48e51a17592c74596a93c72df4445cf
5
5
  SHA512:
6
- metadata.gz: 3cd77d4f1670ca2af673a1084ed67354134f101543d8c0d551b4c51f2a3bacc3dd86782824cce800a7e1dfd0926a62d0b081f6800c2273d2392a584c08654e4c
7
- data.tar.gz: 0fde4925450e19b85b9d237a7519731303ab7c3f5ede08df0861241a970b1c91bdd718ba5a3589aa7bcaf04a5608744402bcd061427c729476e24d88ac1c4477
6
+ metadata.gz: cb4191ef3ad959fd4919f9da3076c26d356d131b5a983dd5a1d380053ab30878967720b73685e3166668cc3099912ebf37219c5c7f5ee0dbb029df70e525a21c
7
+ data.tar.gz: ae24f0bbac9c6eb682db1b299b3e8f079a8cf0477e8c61b1d6a78b5c825be789d811d2e051b3604234f3e2cfc98f2be751f3043874b635eeff09419453b5af56
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (2.0.21)
4
+ trusty-cms (2.0.22)
5
5
  RedCloth (~> 4.3.2)
6
6
  acts_as_tree (~> 2.1)
7
7
  bundler (~> 1.7)
@@ -322,4 +322,4 @@ DEPENDENCIES
322
322
  trustygems (~> 0.2.0)
323
323
 
324
324
  BUNDLED WITH
325
- 1.11.2
325
+ 1.12.5
data/app/controllers/application_controller.rb CHANGED
@@ -14,6 +14,7 @@ class ApplicationController < ActionController::Base
14
14
  before_filter :set_javascripts_and_stylesheets
15
15
  before_filter :force_utf8_params if RUBY_VERSION =~ /1\.9/
16
16
  before_filter :set_standard_body_style, :only => [:new, :edit, :update, :create]
17
+ before_filter :set_mailer
17
18
 
18
19
  attr_accessor :trusty_config, :cache
19
20
  attr_reader :pagination_parameters
@@ -52,6 +53,10 @@ class ApplicationController < ActionController::Base
52
53
 
53
54
  private
54
55
 
56
+ def set_mailer
57
+ ActionMailer::Base.default_url_options[:host] = request.host_with_port
58
+ end
59
+
55
60
  def set_current_user
56
61
  UserActionObserver.instance.current_user = current_user
57
62
  end
data/lib/login_system.rb CHANGED
@@ -61,7 +61,7 @@ module LoginSystem
61
61
  end
62
62
 
63
63
  def login_from_session
64
- User.find(session['user_id']) rescue nil
64
+ User.unscoped.find(session['user_id']) rescue nil
65
65
  end
66
66
 
67
67
  def login_from_cookie
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 = "2.0.21"
5
+ VERSION = "2.0.22"
6
6
  end
7
7
  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: 2.0.21
4
+ version: 2.0.22
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: 2016-05-31 00:00:00.000000000 Z
11
+ date: 2016-07-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tzinfo
@@ -894,7 +894,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
894
894
  version: 1.3.1
895
895
  requirements: []
896
896
  rubyforge_project:
897
- rubygems_version: 2.4.8
897
+ rubygems_version: 2.6.4
898
898
  signing_key:
899
899
  specification_version: 4
900
900
  summary: A no-fluff content management system designed for small teams.