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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c7cfe3d8
Commit
c7cfe3d8
authored
Sep 03, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
devise session templates to haml. Fix problem with missing message in commit
parent
0c5e5569
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
58 additions
and
66 deletions
+58
-66
app/decorators/commit_decorator.rb
app/decorators/commit_decorator.rb
+8
-0
app/views/devise/sessions/_new_ldap.html.erb
app/views/devise/sessions/_new_ldap.html.erb
+0
-39
app/views/devise/sessions/_new_ldap.html.haml
app/views/devise/sessions/_new_ldap.html.haml
+29
-0
app/views/devise/sessions/new.html.erb
app/views/devise/sessions/new.html.erb
+0
-27
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+21
-0
No files found.
app/decorators/commit_decorator.rb
View file @
c7cfe3d8
...
@@ -16,6 +16,8 @@ class CommitDecorator < ApplicationDecorator
...
@@ -16,6 +16,8 @@ class CommitDecorator < ApplicationDecorator
# In case this first line is longer than 80 characters, it is cut off
# In case this first line is longer than 80 characters, it is cut off
# after 70 characters and ellipses (`&hellp;`) are appended.
# after 70 characters and ellipses (`&hellp;`) are appended.
def
title
def
title
return
no_commit_message
unless
safe_message
title_end
=
safe_message
.
index
(
/\n/
)
title_end
=
safe_message
.
index
(
/\n/
)
if
(
!
title_end
&&
safe_message
.
length
>
80
)
||
(
title_end
&&
title_end
>
80
)
if
(
!
title_end
&&
safe_message
.
length
>
80
)
||
(
title_end
&&
title_end
>
80
)
safe_message
[
0
..
69
]
<<
"…"
.
html_safe
safe_message
[
0
..
69
]
<<
"…"
.
html_safe
...
@@ -35,4 +37,10 @@ class CommitDecorator < ApplicationDecorator
...
@@ -35,4 +37,10 @@ class CommitDecorator < ApplicationDecorator
safe_message
.
split
(
/\n/
,
2
)[
1
].
try
(
:chomp
)
safe_message
.
split
(
/\n/
,
2
)[
1
].
try
(
:chomp
)
end
end
end
end
protected
def
no_commit_message
"--no commit message"
end
end
end
app/views/devise/sessions/_new_ldap.html.erb
deleted
100644 → 0
View file @
0c5e5569
<%=
form_tag
(
user_omniauth_callback_path
(
:ldap
),
:class
=>
"login-box"
,
:id
=>
'new_ldap_user'
)
do
%>
<%=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
%>
<%=
text_field_tag
:username
,
nil
,
{
:class
=>
"text top"
,
:placeholder
=>
"LDAP Login"
}
%>
<%=
password_field_tag
:password
,
nil
,
{
:class
=>
"text bottom"
,
:placeholder
=>
"Password"
}
%>
<br/>
<%=
submit_tag
"LDAP Sign in"
,
:class
=>
"primary btn"
%>
<%-
if
devise_mapping
.
omniauthable?
%>
<%-
(
resource_class
.
omniauth_providers
-
[
:ldap
]).
each
do
|
provider
|
%>
<hr/>
<%=
link_to
"Sign in with
#{
provider
.
to_s
.
titleize
}
"
,
omniauth_authorize_path
(
resource_name
,
provider
),
:class
=>
"btn primary"
%>
<br
/>
<%
end
-%>
<%
end
-%>
<hr/>
<a
href=
"#"
id=
"other_form_toggle"
onclick=
"javascript:$('#new_user').toggle();"
>
Other Sign in
</a>
<!-- inline for right now just to illustrate -->
<script
type=
"text/javascript"
>
$
(
function
()
{
$
(
'
#new_user
'
).
toggle
();
});
</script>
<%
end
%>
<%=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
session_path
(
resource_name
),
:html
=>
{
:class
=>
"login-box"
})
do
|
f
|
%>
<%=
f
.
text_field
:email
,
:class
=>
"text top"
,
:placeholder
=>
"Email"
%>
<%=
f
.
password_field
:password
,
:class
=>
"text bottom"
,
:placeholder
=>
"Password"
%>
<%
if
devise_mapping
.
rememberable?
-%>
<div
class=
"clearfix inputs-list"
>
<label
class=
"checkbox remember_me"
for=
"user_remember_me"
>
<%=
f
.
check_box
:remember_me
%>
<span>
Remember me
</span></label></div>
<%
end
-%>
<br/>
<%=
f
.
submit
"Sign in"
,
:class
=>
"primary btn"
%>
<div
class=
"right"
>
<%=
render
:partial
=>
"devise/shared/links"
%>
</div>
<%
end
%>
app/views/devise/sessions/_new_ldap.html.haml
0 → 100644
View file @
c7cfe3d8
=
form_tag
(
user_omniauth_callback_path
(
:ldap
),
:class
=>
"login-box"
,
:id
=>
'new_ldap_user'
)
do
=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
=
text_field_tag
:username
,
nil
,
{
:class
=>
"text top"
,
:placeholder
=>
"LDAP Login"
}
=
password_field_tag
:password
,
nil
,
{
:class
=>
"text bottom"
,
:placeholder
=>
"Password"
}
%br
/
=
submit_tag
"LDAP Sign in"
,
:class
=>
"primary btn"
-
if
devise_mapping
.
omniauthable?
-
(
resource_class
.
omniauth_providers
-
[
:ldap
]).
each
do
|
provider
|
%hr
/
=
link_to
"Sign in with
#{
provider
.
to_s
.
titleize
}
"
,
omniauth_authorize_path
(
resource_name
,
provider
),
:class
=>
"btn primary"
%br
/
%hr
/
%a
#other_form_toggle
{
:href
=>
"#"
,
:onclick
=>
"javascript:$('#new_user').toggle();"
}
Other Sign in
:javascript
$
(
function
()
{
$
(
'
#new_user
'
).
toggle
();
});
=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
session_path
(
resource_name
),
:html
=>
{
:class
=>
"login-box"
})
do
|
f
|
=
f
.
text_field
:email
,
:class
=>
"text top"
,
:placeholder
=>
"Email"
=
f
.
password_field
:password
,
:class
=>
"text bottom"
,
:placeholder
=>
"Password"
-
if
devise_mapping
.
rememberable?
.clearfix.inputs-list
%label
.checkbox.remember_me
{
:for
=>
"user_remember_me"
}
=
f
.
check_box
:remember_me
%span
Remember me
%br
/
=
f
.
submit
"Sign in"
,
:class
=>
"primary btn"
.right
=
render
:partial
=>
"devise/shared/links"
app/views/devise/sessions/new.html.erb
deleted
100644 → 0
View file @
0c5e5569
<%
unless
ldap_enable?
-%>
<%=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
session_path
(
resource_name
),
:html
=>
{
:class
=>
"login-box"
})
do
|
f
|
%>
<%=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
%>
<%=
f
.
text_field
:email
,
:class
=>
"text top"
,
:placeholder
=>
"Email"
%>
<%=
f
.
password_field
:password
,
:class
=>
"text bottom"
,
:placeholder
=>
"Password"
%>
<%
if
devise_mapping
.
rememberable?
-%>
<div
class=
"clearfix inputs-list"
>
<label
class=
"checkbox remember_me"
for=
"user_remember_me"
>
<%=
f
.
check_box
:remember_me
%>
<span>
Remember me
</span></label></div>
<%
end
-%>
<br/>
<%=
f
.
submit
"Sign in"
,
:class
=>
"primary btn"
%>
<div
class=
"right"
>
<%=
render
:partial
=>
"devise/shared/links"
%>
</div>
<%-
if
devise_mapping
.
omniauthable?
%>
<%-
resource_class
.
omniauth_providers
.
each
do
|
provider
|
%>
<hr/>
<%=
link_to
"Sign in with
#{
provider
.
to_s
.
titleize
}
"
,
omniauth_authorize_path
(
resource_name
,
provider
),
:class
=>
"btn primary"
%>
<br
/>
<%
end
-%>
<%
end
-%>
<%
end
%>
<%
else
%>
<%=
render
:partial
=>
'devise/sessions/new_ldap'
%>
<%
end
%>
app/views/devise/sessions/new.html.haml
0 → 100644
View file @
c7cfe3d8
-
if
ldap_enable?
=
render
:partial
=>
'devise/sessions/new_ldap'
-
else
=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
session_path
(
resource_name
),
:html
=>
{
:class
=>
"login-box"
})
do
|
f
|
=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
=
f
.
text_field
:email
,
:class
=>
"text top"
,
:placeholder
=>
"Email"
=
f
.
password_field
:password
,
:class
=>
"text bottom"
,
:placeholder
=>
"Password"
-
if
devise_mapping
.
rememberable?
.clearfix.inputs-list
%label
.checkbox.remember_me
{
:for
=>
"user_remember_me"
}
=
f
.
check_box
:remember_me
%span
Remember me
%br
/
=
f
.
submit
"Sign in"
,
:class
=>
"primary btn wide"
.right
=
render
:partial
=>
"devise/shared/links"
-
if
devise_mapping
.
omniauthable?
-
resource_class
.
omniauth_providers
.
each
do
|
provider
|
%hr
/
=
link_to
"Sign in with
#{
provider
.
to_s
.
titleize
}
"
,
omniauth_authorize_path
(
resource_name
,
provider
),
:class
=>
"btn primary"
%br
/
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