summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-24 19:24:27 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-24 19:24:27 +0300
commit15f62fcc27235b3c8012c80f0517ecf5c27aa205 (patch)
tree5028208fe942960fbe02e3f87d14a9cae3b7e0c2
parentafc9d548198ac2b405fbf3a268cdc0c2ffd35995 (diff)
downloadgitlab-ce-15f62fcc27235b3c8012c80f0517ecf5c27aa205.tar.gz
Fix profile emails with new key route
-rw-r--r--app/views/notify/new_ssh_key_email.html.haml2
-rw-r--r--app/views/notify/new_ssh_key_email.text.erb2
-rw-r--r--spec/features/security/profile_access_spec.rb4
-rw-r--r--spec/mailers/notify_spec.rb2
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/notify/new_ssh_key_email.html.haml b/app/views/notify/new_ssh_key_email.html.haml
index eff197ce0f4..deb0822d8f2 100644
--- a/app/views/notify/new_ssh_key_email.html.haml
+++ b/app/views/notify/new_ssh_key_email.html.haml
@@ -7,4 +7,4 @@
%code= @key.title
%p
If this key was added in error, you can remove it here:
- = link_to "SSH Keys", keys_url
+ = link_to "SSH Keys", profile_keys_url
diff --git a/app/views/notify/new_ssh_key_email.text.erb b/app/views/notify/new_ssh_key_email.text.erb
index 2b1f8a06858..5f0080c2b76 100644
--- a/app/views/notify/new_ssh_key_email.text.erb
+++ b/app/views/notify/new_ssh_key_email.text.erb
@@ -4,4 +4,4 @@ A new public key was added to your account:
title.................. <%= @key.title %>
-If this key was added in error, you can remove it here: <%= keys_url %>
+If this key was added in error, you can remove it here: <%= profile_keys_url %>
diff --git a/spec/features/security/profile_access_spec.rb b/spec/features/security/profile_access_spec.rb
index f854f3fb066..52130b3f8c6 100644
--- a/spec/features/security/profile_access_spec.rb
+++ b/spec/features/security/profile_access_spec.rb
@@ -10,8 +10,8 @@ describe "Users Security" do
it { new_user_session_path.should_not be_404_for :visitor }
end
- describe "GET /keys" do
- subject { keys_path }
+ describe "GET /profile/keys" do
+ subject { profile_keys_path }
it { should be_allowed_for @u1 }
it { should be_allowed_for :admin }
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 7290e2b739d..e7e8bc5b028 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -86,7 +86,7 @@ describe Notify do
end
it 'includes a link to ssh keys page' do
- should have_body_text /#{keys_path}/
+ should have_body_text /#{profile_keys_path}/
end
end