Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
69723d20
Commit
69723d20
authored
Sep 19, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Devise 3.5.x deprecates `confirm!` in favor of `confirm`
parent
ce8f78a5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+1
-1
db/fixtures/production/001_admin.rb
db/fixtures/production/001_admin.rb
+1
-1
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+3
-3
spec/models/user_spec.rb
spec/models/user_spec.rb
+1
-1
No files found.
app/controllers/admin/users_controller.rb
View file @
69723d20
...
@@ -56,7 +56,7 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -56,7 +56,7 @@ class Admin::UsersController < Admin::ApplicationController
end
end
def
confirm
def
confirm
if
user
.
confirm
!
if
user
.
confirm
redirect_to
:back
,
notice:
"Successfully confirmed"
redirect_to
:back
,
notice:
"Successfully confirmed"
else
else
redirect_to
:back
,
alert:
"Error occurred. User was not confirmed"
redirect_to
:back
,
alert:
"Error occurred. User was not confirmed"
...
...
db/fixtures/production/001_admin.rb
View file @
69723d20
...
@@ -19,7 +19,7 @@ admin = User.create(
...
@@ -19,7 +19,7 @@ admin = User.create(
admin
.
projects_limit
=
10000
admin
.
projects_limit
=
10000
admin
.
admin
=
true
admin
.
admin
=
true
admin
.
save!
admin
.
save!
admin
.
confirm
!
admin
.
confirm
if
admin
.
valid?
if
admin
.
valid?
puts
%Q[
puts
%Q[
...
...
spec/mailers/notify_spec.rb
View file @
69723d20
...
@@ -712,7 +712,7 @@ describe Notify do
...
@@ -712,7 +712,7 @@ describe Notify do
before
do
before
do
user
.
update_attribute
(
:email
,
"user@company.com"
)
user
.
update_attribute
(
:email
,
"user@company.com"
)
user
.
confirm
!
user
.
confirm
end
end
it
"is sent from the committer email"
do
it
"is sent from the committer email"
do
...
@@ -730,7 +730,7 @@ describe Notify do
...
@@ -730,7 +730,7 @@ describe Notify do
before
do
before
do
user
.
update_attribute
(
:email
,
"user@something.company.com"
)
user
.
update_attribute
(
:email
,
"user@something.company.com"
)
user
.
confirm
!
user
.
confirm
end
end
it
"is sent from the default email"
do
it
"is sent from the default email"
do
...
@@ -748,7 +748,7 @@ describe Notify do
...
@@ -748,7 +748,7 @@ describe Notify do
before
do
before
do
user
.
update_attribute
(
:email
,
"user@mpany.com"
)
user
.
update_attribute
(
:email
,
"user@mpany.com"
)
user
.
confirm
!
user
.
confirm
end
end
it
"is sent from the default email"
do
it
"is sent from the default email"
do
...
...
spec/models/user_spec.rb
View file @
69723d20
...
@@ -188,7 +188,7 @@ describe User do
...
@@ -188,7 +188,7 @@ describe User do
end
end
it
'confirms a user'
do
it
'confirms a user'
do
user
.
confirm
!
user
.
confirm
expect
(
user
.
confirmed?
).
to
be_truthy
expect
(
user
.
confirmed?
).
to
be_truthy
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment