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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
15f62fcc
Commit
15f62fcc
authored
Jun 24, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix profile emails with new key route
parent
afc9d548
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/notify/new_ssh_key_email.html.haml
app/views/notify/new_ssh_key_email.html.haml
+1
-1
app/views/notify/new_ssh_key_email.text.erb
app/views/notify/new_ssh_key_email.text.erb
+1
-1
spec/features/security/profile_access_spec.rb
spec/features/security/profile_access_spec.rb
+2
-2
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+1
-1
No files found.
app/views/notify/new_ssh_key_email.html.haml
View file @
15f62fcc
...
@@ -7,4 +7,4 @@
...
@@ -7,4 +7,4 @@
%code
=
@key
.
title
%code
=
@key
.
title
%p
%p
If this key was added in error, you can remove it here:
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
app/views/notify/new_ssh_key_email.text.erb
View file @
15f62fcc
...
@@ -4,4 +4,4 @@ A new public key was added to your account:
...
@@ -4,4 +4,4 @@ A new public key was added to your account:
title..................
<%=
@key
.
title
%>
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
%>
spec/features/security/profile_access_spec.rb
View file @
15f62fcc
...
@@ -10,8 +10,8 @@ describe "Users Security" do
...
@@ -10,8 +10,8 @@ describe "Users Security" do
it
{
new_user_session_path
.
should_not
be_404_for
:visitor
}
it
{
new_user_session_path
.
should_not
be_404_for
:visitor
}
end
end
describe
"GET /keys"
do
describe
"GET /
profile/
keys"
do
subject
{
keys_path
}
subject
{
profile_
keys_path
}
it
{
should
be_allowed_for
@u1
}
it
{
should
be_allowed_for
@u1
}
it
{
should
be_allowed_for
:admin
}
it
{
should
be_allowed_for
:admin
}
...
...
spec/mailers/notify_spec.rb
View file @
15f62fcc
...
@@ -86,7 +86,7 @@ describe Notify do
...
@@ -86,7 +86,7 @@ describe Notify do
end
end
it
'includes a link to ssh keys page'
do
it
'includes a link to ssh keys page'
do
should
have_body_text
/
#{
keys_path
}
/
should
have_body_text
/
#{
profile_
keys_path
}
/
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