trusty-cms 2.0.21 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc79bc42da160d18107b6fafe34bfc19002d072
-  data.tar.gz: dcc5d74e7c208b3466df33de59688048b6b0d8ad
+  metadata.gz: 3e17b78af7d900ff20b2ae788ff5b60b142eb4fe
+  data.tar.gz: 2ca88df7b48e51a17592c74596a93c72df4445cf
 SHA512:
-  metadata.gz: 3cd77d4f1670ca2af673a1084ed67354134f101543d8c0d551b4c51f2a3bacc3dd86782824cce800a7e1dfd0926a62d0b081f6800c2273d2392a584c08654e4c
-  data.tar.gz: 0fde4925450e19b85b9d237a7519731303ab7c3f5ede08df0861241a970b1c91bdd718ba5a3589aa7bcaf04a5608744402bcd061427c729476e24d88ac1c4477
+  metadata.gz: cb4191ef3ad959fd4919f9da3076c26d356d131b5a983dd5a1d380053ab30878967720b73685e3166668cc3099912ebf37219c5c7f5ee0dbb029df70e525a21c
+  data.tar.gz: ae24f0bbac9c6eb682db1b299b3e8f079a8cf0477e8c61b1d6a78b5c825be789d811d2e051b3604234f3e2cfc98f2be751f3043874b635eeff09419453b5af56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (2.0.21)
+    trusty-cms (2.0.22)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -322,4 +322,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/app/controllers/application_controller.rb

@@ -14,6 +14,7 @@ class ApplicationController < ActionController::Base
   before_filter :set_javascripts_and_stylesheets
   before_filter :force_utf8_params if RUBY_VERSION =~ /1\.9/
   before_filter :set_standard_body_style, :only => [:new, :edit, :update, :create]
+  before_filter :set_mailer
 
   attr_accessor :trusty_config, :cache
   attr_reader :pagination_parameters
@@ -52,6 +53,10 @@ class ApplicationController < ActionController::Base
 
   private
 
+    def set_mailer
+      ActionMailer::Base.default_url_options[:host] = request.host_with_port
+    end
+
     def set_current_user
       UserActionObserver.instance.current_user = current_user
     end

data/lib/login_system.rb

@@ -61,7 +61,7 @@ module LoginSystem
     end
 
     def login_from_session
-      User.find(session['user_id']) rescue nil
+      User.unscoped.find(session['user_id']) rescue nil
     end
 
     def login_from_cookie

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = "2.0.21"
+    VERSION = "2.0.22"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.22
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -894,7 +894,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.