trusty-cms 3.0.9 → 3.0.10
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +2 -2
- data/app/controllers/admin/password_resets_controller.rb +8 -1
- data/lib/trusty_cms.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c90cf84c2bfce42f6c1581b1ab23e74c0b22fe43
|
|
4
|
+
data.tar.gz: 2aaa1cd3ef052bcc9cf3fa1b1a8744454b4f6093
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ee4a31ccb3dd1ae8bd389958e5f730c5bfacc8be3d4c572bc29230a836452fb7748df29c91ccb842275ccf2e8c6b7db8230c7349f75a3fe27b8edb9ed55d0c29
|
|
7
|
+
data.tar.gz: 2cfbb8d7d9bb6ba3fdb424abb1c5f8b2fc74b929feec339739f3fe5e3324c7cc07be7077d5114fe165646de1f82db5167ed89d80ff1f6e1a2040ae6564ab20d4
|
data/Gemfile.lock
CHANGED
|
@@ -8,7 +8,7 @@ GIT
|
|
|
8
8
|
PATH
|
|
9
9
|
remote: .
|
|
10
10
|
specs:
|
|
11
|
-
trusty-cms (3.0.
|
|
11
|
+
trusty-cms (3.0.10)
|
|
12
12
|
RedCloth (~> 4.3.2)
|
|
13
13
|
acts_as_tree (~> 2.6.1)
|
|
14
14
|
bundler (~> 1.7)
|
|
@@ -266,7 +266,7 @@ GEM
|
|
|
266
266
|
sprockets (3.7.1)
|
|
267
267
|
concurrent-ruby (~> 1.0)
|
|
268
268
|
rack (> 1, < 3)
|
|
269
|
-
sprockets-rails (3.2.
|
|
269
|
+
sprockets-rails (3.2.1)
|
|
270
270
|
actionpack (>= 4.0)
|
|
271
271
|
activesupport (>= 4.0)
|
|
272
272
|
sprockets (>= 3.0.0)
|
|
@@ -20,10 +20,17 @@ class Admin::PasswordResetsController < ApplicationController
|
|
|
20
20
|
@user = User.find_by_password_reset_token!(params[:id])
|
|
21
21
|
if @user.password_reset_sent_at < 2.hours.ago
|
|
22
22
|
redirect_to new_password_reset_path, :alert => "Password reset has expired."
|
|
23
|
-
elsif @user.update_attributes(
|
|
23
|
+
elsif @user.update_attributes(password_params)
|
|
24
24
|
redirect_to welcome_url, :notice => "Password has been reset!"
|
|
25
25
|
else
|
|
26
26
|
render :edit
|
|
27
27
|
end
|
|
28
28
|
end
|
|
29
|
+
|
|
30
|
+
private
|
|
31
|
+
|
|
32
|
+
def password_params
|
|
33
|
+
params.require(:user).permit(:password, :password_confirmation)
|
|
34
|
+
end
|
|
35
|
+
|
|
29
36
|
end
|
data/lib/trusty_cms.rb
CHANGED
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.0.
|
|
4
|
+
version: 3.0.10
|
|
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: 2017-
|
|
11
|
+
date: 2017-09-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: tzinfo
|
|
@@ -1684,7 +1684,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
1684
1684
|
version: 1.3.1
|
|
1685
1685
|
requirements: []
|
|
1686
1686
|
rubyforge_project:
|
|
1687
|
-
rubygems_version: 2.6.
|
|
1687
|
+
rubygems_version: 2.6.13
|
|
1688
1688
|
signing_key:
|
|
1689
1689
|
specification_version: 4
|
|
1690
1690
|
summary: A no-fluff content management system designed for small teams.
|