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
Jérome Perrin
gitlab-ce
Commits
6a445b42
Commit
6a445b42
authored
Feb 20, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed forgot password form
parent
22f4c190
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
27 deletions
+21
-27
app/views/devise/passwords/edit.html.erb
app/views/devise/passwords/edit.html.erb
+0
-16
app/views/devise/passwords/edit.html.haml
app/views/devise/passwords/edit.html.haml
+12
-0
app/views/devise/passwords/new.html.erb
app/views/devise/passwords/new.html.erb
+2
-1
app/views/projects/_project_head.html.haml
app/views/projects/_project_head.html.haml
+7
-10
No files found.
app/views/devise/passwords/edit.html.erb
deleted
100644 → 0
View file @
22f4c190
<h2>
Change your password
</h2>
<%=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
password_path
(
resource_name
),
:html
=>
{
:method
=>
:put
})
do
|
f
|
%>
<%=
devise_error_messages!
%>
<%=
f
.
hidden_field
:reset_password_token
%>
<div>
<%=
f
.
label
:password
,
"New password"
%>
<br
/>
<%=
f
.
password_field
:password
%>
</div>
<div>
<%=
f
.
label
:password_confirmation
,
"Confirm new password"
%>
<br
/>
<%=
f
.
password_field
:password_confirmation
%>
</div>
<div>
<%=
f
.
submit
"Change my password"
%>
</div>
<%
end
%>
<%=
render
:partial
=>
"devise/shared/links"
%>
app/views/devise/passwords/edit.html.haml
0 → 100644
View file @
6a445b42
=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
password_path
(
resource_name
),
:html
=>
{
:method
=>
:put
,
:class
=>
"login-box"
})
do
|
f
|
=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
%h3
Change your password
=
devise_error_messages!
=
f
.
hidden_field
:reset_password_token
%div
=
f
.
password_field
:password
,
:class
=>
"text top"
,
:placeholder
=>
"New password"
%div
=
f
.
password_field
:password_confirmation
,
:class
=>
"text bottom"
,
:placeholder
=>
"Confirm new password"
%div
=
f
.
submit
"Change my password"
,
:class
=>
"btn primary"
.right
=
render
:partial
=>
"devise/shared/links"
app/views/devise/passwords/new.html.erb
View file @
6a445b42
<%=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
password_path
(
resource_name
),
:html
=>
{
:class
=>
"login-box"
,
:method
=>
:post
})
do
|
f
|
%>
<%=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
password_path
(
resource_name
),
:html
=>
{
:class
=>
"login-box"
,
:method
=>
:post
})
do
|
f
|
%>
<%=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
%>
<%=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
%>
<%=
devise_error_messages!
%>
<%=
devise_error_messages!
%>
<%=
f
.
email_field
:email
,
:placeholder
=>
"Email"
,
:class
=>
"text top"
%>
<%=
f
.
email_field
:email
,
:placeholder
=>
"Email"
,
:class
=>
"text"
%>
<br/>
<br/>
<br/>
<%=
f
.
submit
"Reset password"
,
:class
=>
"primary btn"
%>
<%=
f
.
submit
"Reset password"
,
:class
=>
"primary btn"
%>
<div
class=
"right"
>
<%=
render
:partial
=>
"devise/shared/links"
%>
</div>
<div
class=
"right"
>
<%=
render
:partial
=>
"devise/shared/links"
%>
</div>
...
...
app/views/projects/_project_head.html.haml
View file @
6a445b42
...
@@ -16,16 +16,13 @@
...
@@ -16,16 +16,13 @@
%li
{
:class
=>
" #{'active' if (controller.controller_name == "
snippets
") }"
}
%li
{
:class
=>
" #{'active' if (controller.controller_name == "
snippets
") }"
}
=
link_to
project_snippets_path
(
@project
),
:class
=>
"snippets-tab tab"
do
=
link_to
project_snippets_path
(
@project
),
:class
=>
"snippets-tab tab"
do
Snippets
Snippets
-#%li{:class => "#{'active' if current_page?(project_repository_path(@project)) }"}
-#= link_to project_repository_path(@project) do
-
if
can?
current_user
,
:admin_project
,
@project
-#%span
%li
{
:class
=>
"#{'active' if controller.controller_name == "
hooks
" }"
}
-#Activities
=
link_to
project_hooks_path
(
@project
)
do
%li
{
:class
=>
"#{'active' if controller.controller_name == "
hooks
" }"
}
%span
=
link_to
project_hooks_path
(
@project
)
do
Hooks
%span
%li
{
:class
=>
"#{'active' if controller.controller_name == "
deploy_keys
"}"
}
Hooks
%li
{
:class
=>
"#{'active' if controller.controller_name == "
deploy_keys
"}"
}
-
if
can?
current_user
,
:admin_project
,
@project
=
link_to
project_deploy_keys_path
(
@project
)
do
=
link_to
project_deploy_keys_path
(
@project
)
do
%span
%span
Deploy Keys
Deploy Keys
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