GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 69723d20 authored by Robert Speicher's avatar Robert Speicher

Devise 3.5.x deprecates `confirm!` in favor of `confirm`

parent ce8f78a5
......@@ -56,7 +56,7 @@ def unlock
end
def confirm
if user.confirm!
if user.confirm
redirect_to :back, notice: "Successfully confirmed"
else
redirect_to :back, alert: "Error occurred. User was not confirmed"
......
......@@ -19,7 +19,7 @@
admin.projects_limit = 10000
admin.admin = true
admin.save!
admin.confirm!
admin.confirm
if admin.valid?
puts %Q[
......
......@@ -712,7 +712,7 @@
before do
user.update_attribute(:email, "user@company.com")
user.confirm!
user.confirm
end
it "is sent from the committer email" do
......@@ -730,7 +730,7 @@
before do
user.update_attribute(:email, "user@something.company.com")
user.confirm!
user.confirm
end
it "is sent from the default email" do
......@@ -748,7 +748,7 @@
before do
user.update_attribute(:email, "user@mpany.com")
user.confirm!
user.confirm
end
it "is sent from the default email" do
......
......@@ -188,7 +188,7 @@
end
it 'confirms a user' do
user.confirm!
user.confirm
expect(user.confirmed?).to be_truthy
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment