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
66399d55
Commit
66399d55
authored
12 years ago
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into hooray_apostrophes
parents
70174a1e
05da3801
Changes
18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
335 additions
and
280 deletions
+335
-280
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+13
-7
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+138
-140
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+19
-19
app/assets/stylesheets/themes/ui_basic.scss
app/assets/stylesheets/themes/ui_basic.scss
+5
-5
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+12
-12
app/assets/stylesheets/themes/ui_modern.scss
app/assets/stylesheets/themes/ui_modern.scss
+2
-1
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
app/helpers/gitlab_markdown_helper.rb
app/helpers/gitlab_markdown_helper.rb
+3
-46
app/views/errors/access_denied.html.haml
app/views/errors/access_denied.html.haml
+4
-5
app/views/errors/git_not_found.html.haml
app/views/errors/git_not_found.html.haml
+6
-9
app/views/errors/gitolite.html.haml
app/views/errors/gitolite.html.haml
+24
-24
app/views/errors/not_found.html.haml
app/views/errors/not_found.html.haml
+4
-5
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+1
-1
app/views/layouts/error.html.haml
app/views/layouts/error.html.haml
+2
-2
lib/gitlab/markdown.rb
lib/gitlab/markdown.rb
+98
-0
public/404.html
public/404.html
+1
-1
public/422.html
public/422.html
+1
-1
public/500.html
public/500.html
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
66399d55
...
...
@@ -249,7 +249,7 @@ ul.bordered-list li:last-child { border:none }
li
.commit
{
.avatar
{
width
:
24px
;
top
:
-
3
px
;
top
:
-
5
px
;
margin-right
:
10px
;
margin-left
:
10px
;
}
...
...
@@ -305,12 +305,7 @@ p.time {
}
.styled_image
{
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
-moz-box-shadow
:
0
0
5px
#888
;
-webkit-box-shadow
:
0
0
5px
#888
;
box-shadow
:
0
0
5px
#888
;
border
:
2px
solid
#ddd
;
}
.event_feed
{
...
...
@@ -729,3 +724,14 @@ li.note {
}
}
}
.git_error_tips
{
@extend
.span6
;
text-align
:left
;
margin-top
:
40px
;
pre
{
background
:white
;
border
:none
;
font-size
:
12px
;
}
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
66399d55
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/header.scss
View file @
66399d55
...
...
@@ -2,14 +2,14 @@
* Application Header
*
*/
header
{
header
{
width
:
100%
;
padding
:
0
;
margin
:
0
;
top
:
1px
;
left
:
0
;
background
:
#F1F1F1
;
/* for non-css3 browsers */
border-bottom
:
1px
solid
#ccc
;
border-bottom
:
1px
solid
#ccc
;
box-shadow
:
0
-1px
0
white
inset
;
-moz-box-shadow
:
0
-1px
0
white
inset
;
-webkit-box-shadow
:
0
-1px
0
white
inset
;
...
...
@@ -17,7 +17,7 @@ header {
height
:
60px
;
/**
*
*
* Logo holder
*
*/
...
...
@@ -27,10 +27,10 @@ header {
position
:relative
;
top
:
-5px
;
a
{
a
{
float
:left
;
h1
{
h1
{
text-indent
:
-9999px
;
width
:
102px
;
background
:
url('logo_text.png')
no-repeat
0px
-3px
;
...
...
@@ -54,8 +54,8 @@ header {
margin-top
:
-10px
;
}
}
.container
{
.top_panel_content
{
.container
{
.top_panel_content
{
margin
:auto
;
position
:relative
;
padding
:
15px
0
;
...
...
@@ -63,7 +63,7 @@ header {
}
/**
*
*
* Project / Area name
*
*/
...
...
@@ -78,10 +78,10 @@ header {
text-shadow
:
0
1px
1px
#FFF
;
}
.fbtn
{
.fbtn
{
float
:
right
;
margin-right
:
10px
;
.btn
{
.btn
{
margin-left
:
7px
;
background
:
#F1F1F1
;
border
:
1px
solid
#CCC
;
...
...
@@ -90,13 +90,13 @@ header {
/**
*
*
* Search box
*
*/
.search
{
.search
{
float
:
right
;
margin-right
:
50
px
;
margin-right
:
45
px
;
.search-input
{
@extend
.span2
;
...
...
@@ -110,7 +110,7 @@ header {
}
/**
*
*
* Account box
*
*/
...
...
@@ -125,13 +125,13 @@ header {
display
:
block
;
cursor
:
pointer
;
img
{
border-radius
:
4px
;
@include
border-radius
(
4px
)
;
right
:
5px
;
position
:
absolute
;
width
:
31
px
;
height
:
31
px
;
width
:
28
px
;
height
:
28
px
;
display
:
block
;
top
:
0
;
top
:
2px
;
&
:after
{
content
:
" "
;
display
:
block
;
...
...
@@ -186,7 +186,7 @@ header {
width
:
100px
;
position
:
absolute
;
right
:
10px
;
top
:
4
6
px
;
top
:
4
2
px
;
margin-top
:
0
;
float
:
right
;
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.2
);
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/themes/ui_basic.scss
View file @
66399d55
/**
* This file represent some UI that can be changed
* during web app restyle or theme select.
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
*/
.ui_basic
{
.ui_basic
{
/*
* Common styles
*
*/
a
{
color
:
$link_color
;
&
:hover
{
text-decoration
:none
;
&
:hover
{
text-decoration
:none
;
color
:
$blue_link
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/themes/ui_mars.scss
View file @
66399d55
/**
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
* Next items should be placed there
* - link colors
* - header restyles
...
...
@@ -13,20 +13,20 @@
* Application Header
*
*/
header
{
header
{
background
:
#474D57
url('bg-header.png')
repeat-x
bottom
;
box-shadow
:none
;
border-bottom
:
1px
solid
#444
;
.fbtn
{
.btn
{
.fbtn
{
.btn
{
margin-left
:
8px
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595D63
)
,
to
(
#31363E
));
background-image
:
-webkit-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
background-image
:
-moz-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
background-image
:
-o-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
font-size
:
12px
;
&
:hover
{
&
:hover
{
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595D63
)
,
to
(
#2C2F35
));
background-image
:
-webkit-linear-gradient
(
#595D63
6
.6%
,
#2C2F35
);
background-image
:
-moz-linear-gradient
(
#595D63
6
.6%
,
#202227
);
...
...
@@ -39,10 +39,10 @@
text-shadow
:
0
-1px
0
#000000
;
}
}
.search
{
.search
{
float
:
right
;
margin-right
:
5
5px
;
.search-input
{
margin-right
:
4
5px
;
.search-input
{
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.7
);
box-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
0
.2
)
,
0
2px
2px
rgba
(
0
,
0
,
0
,
0
.4
)
inset
;
background-color
:
#D2D5DA
;
...
...
@@ -57,8 +57,8 @@
color
:
#666
;
}
.app_logo
{
a
{
h1
{
a
{
h1
{
background
:
url('images.png')
no-repeat
-3px
-6px
;
width
:
65px
;
height
:
26px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/themes/ui_modern.scss
View file @
66399d55
...
...
@@ -91,7 +91,7 @@
*/
.search
{
float
:
right
;
margin-right
:
5
5px
;
margin-right
:
4
5px
;
.search-input
{
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.7
);
box-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
0
.2
)
,
0
2px
2px
rgba
(
0
,
0
,
0
,
0
.4
)
inset
;
...
...
@@ -127,6 +127,7 @@
.account-box
{
top
:
6px
;
img
{
top
:
1px
;
right
:
5px
;
width
:
26px
;
height
:
26px
;
...
...
This diff is collapsed.
Click to expand it.
app/helpers/application_helper.rb
View file @
66399d55
...
...
@@ -110,7 +110,7 @@ module ApplicationHelper
when
:admin_root
;
controller
.
controller_name
==
"dashboard"
when
:admin_users
;
controller
.
controller_name
==
'users'
when
:admin_projects
;
controller
.
controller_name
==
"projects"
when
:admin_
emails
;
controller
.
controller_name
==
'mailer
'
when
:admin_
hooks
;
controller
.
controller_name
==
'hooks
'
when
:admin_resque
;
controller
.
controller_name
==
'resque'
when
:admin_logs
;
controller
.
controller_name
==
'logs'
...
...
This diff is collapsed.
Click to expand it.
app/helpers/gitlab_markdown_helper.rb
View file @
66399d55
...
...
@@ -12,53 +12,10 @@ module GitlabMarkdownHelper
"{gfm-extraction-
#{
md5
}
}"
end
# match 1 2 3 4 5 6
text
.
gsub!
(
/(\W)?(@([\w\._]+)|[#!$](\d+)|([\h]{6,40}))(\W)?/
)
do
|
match
|
prefix
=
$1
reference
=
$2
user_name
=
$3
issue_id
=
$4
merge_request_id
=
$4
snippet_id
=
$4
commit_id
=
$5
suffix
=
$6
# TODO: add popups with additional information
# TODO: add popups with additional information
ref_link
=
case
reference
# team member: @foo
when
/^@/
user
=
@project
.
users
.
where
(
name:
user_name
).
first
member
=
@project
.
users_projects
.
where
(
user_id:
user
).
first
if
user
link_to
(
"@
#{
user_name
}
"
,
project_team_member_path
(
@project
,
member
),
html_options
.
merge
(
class:
"gfm gfm-team_member
#{
html_options
[
:class
]
}
"
))
if
member
# issue: #123
when
/^#/
# avoid HTML entities
unless
prefix
.
try
(
:end_with?
,
"&"
)
&&
suffix
.
try
(
:start_with?
,
";"
)
issue
=
@project
.
issues
.
where
(
id:
issue_id
).
first
link_to
(
"#
#{
issue_id
}
"
,
project_issue_path
(
@project
,
issue
),
html_options
.
merge
(
title:
"Issue:
#{
issue
.
title
}
"
,
class:
"gfm gfm-issue
#{
html_options
[
:class
]
}
"
))
if
issue
end
# merge request: !123
when
/^!/
merge_request
=
@project
.
merge_requests
.
where
(
id:
merge_request_id
).
first
link_to
(
"!
#{
merge_request_id
}
"
,
project_merge_request_path
(
@project
,
merge_request
),
html_options
.
merge
(
title:
"Merge Request:
#{
merge_request
.
title
}
"
,
class:
"gfm gfm-merge_request
#{
html_options
[
:class
]
}
"
))
if
merge_request
# snippet: $123
when
/^\$/
snippet
=
@project
.
snippets
.
where
(
id:
snippet_id
).
first
link_to
(
"$
#{
snippet_id
}
"
,
project_snippet_path
(
@project
,
snippet
),
html_options
.
merge
(
title:
"Snippet:
#{
snippet
.
title
}
"
,
class:
"gfm gfm-snippet
#{
html_options
[
:class
]
}
"
))
if
snippet
# commit: 123456...
when
/^\h/
commit
=
@project
.
commit
(
commit_id
)
link_to
(
commit_id
,
project_commit_path
(
@project
,
id:
commit
.
id
),
html_options
.
merge
(
title:
"Commit:
#{
commit
.
author_name
}
-
#{
CommitDecorator
.
new
(
commit
).
title
}
"
,
class:
"gfm gfm-commit
#{
html_options
[
:class
]
}
"
))
if
commit
end
# case
ref_link
.
nil?
?
match
:
"
#{
prefix
}#{
ref_link
}#{
suffix
}
"
end
# gsub
parser
=
Gitlab
::
Markdown
.
new
(
@project
,
html_options
)
text
=
parser
.
parse
(
text
)
# Insert pre block extractions
text
.
gsub!
(
/\{gfm-extraction-(\h{32})\}/
)
do
...
...
This diff is collapsed.
Click to expand it.
app/views/errors/access_denied.html.haml
View file @
66399d55
.alert-message.block-message.error
%h3
Access Denied
%hr
%p
You are not allowed to access this page.
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"vlink"
}
%h1
Access Denied
%hr
%h2
You are not allowed to access this page.
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"vlink"
}
This diff is collapsed.
Click to expand it.
app/views/errors/git_not_found.html.haml
View file @
66399d55
.alert-message.block-message.error
%h3
Git Resource Not found
%hr
%p
Application can't get access to some
%span
.label
branch
or
%span
.label
commit
in your repository. It may have been moved.
%h1
404
%hr
%h2
Git Resource Not found
%p
Application can't get access to some branch or commit in your repository. It
may have been moved.
This diff is collapsed.
Click to expand it.
app/views/errors/gitolite.html.haml
View file @
66399d55
.alert-message.block-message.e
rror
%h3
Gitolite Erro
r
%h4
Application can't get access to your g
itolite system.
%h1
Git E
rror
%h
r
%h2
Gitlab was unable to access your G
itolite system.
%h4
Tips for Administrator:
%ul
%li
%p
Check git logs in admin area
%li
%p
Check config/gitlab.yml for correct settings.
%li
%p
Diagnostic tool:
.git_error_tips
%h4
Tips for Administrator:
%ol
%li
%p
Check git logs in admin area
%li
%p
Check config/gitlab.yml for correct settings.
%li
%p
Diagnostic tool:
%pre
bundle exec rake gitlab:app:status RAILS_ENV=production
%li
%p
Permissions:
%pre
bundle exec rake gitlab:app:status RAILS_ENV=production
%li
%p
Permissions:
%pre
=
preserve
do
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive
=
preserve
do
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive
This diff is collapsed.
Click to expand it.
app/views/errors/not_found.html.haml
View file @
66399d55
.alert-message.block-message.error
%h3
Not found
%hr
%p
The resource you were looking for doesn't exist.
%p
You may have mistyped the address or it may have been removed.
%h1
404
%hr
%h2
The resource you were looking for doesn't exist.
%p
You may have mistyped the address or the page may have moved.
This diff is collapsed.
Click to expand it.
app/views/layouts/admin.html.haml
View file @
66399d55
...
...
@@ -14,7 +14,7 @@
=
link_to
"Users"
,
admin_users_path
%li
{
class:
tab_class
(
:admin_logs
)}
=
link_to
"Logs"
,
admin_logs_path
%li
{
class:
tab_class
(
:admin_
email
s
)}
%li
{
class:
tab_class
(
:admin_
hook
s
)}
=
link_to
"Hooks"
,
admin_hooks_path
%li
{
class:
tab_class
(
:admin_resque
)}
=
link_to
"Resque"
,
admin_resque_path
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/error.html.haml
View file @
66399d55
...
...
@@ -6,5 +6,5 @@
=
render
"layouts/head_panel"
,
title:
""
.container
.content
%
br
%h3
=
yield
%
center
.padded.prepend-top-20
=
yield
This diff is collapsed.
Click to expand it.
lib/gitlab/markdown.rb
0 → 100644
View file @
66399d55
module
Gitlab
# Custom parsing for Gitlab-flavored Markdown
#
# Examples
#
# >> m = Markdown.new(...)
#
# >> m.parse("Hey @david, can you fix this?")
# => "Hey <a href="/gitlab/team_members/1">@david</a>, can you fix this?"
#
# >> m.parse("Commit 35d5f7c closes #1234")
# => "Commit <a href="/gitlab/commits/35d5f7c">35d5f7c</a> closes <a href="/gitlab/issues/1234">#1234</a>"
class
Markdown
include
Rails
.
application
.
routes
.
url_helpers
include
ActionView
::
Helpers
REFERENCE_PATTERN
=
%r{
([^
\w
&;])? # Prefix (1)
( # Reference (2)
@([
\w\.
_]+) # User name (3)
|[#!$](
\d
+) # Issue/MR/Snippet ID (4)
|([
\h
]{6,40}) # Commit ID (5)
)
([^
\w
&;])? # Suffix (6)
}x
.
freeze
attr_reader
:html_options
def
initialize
(
project
,
html_options
=
{})
@project
=
project
@html_options
=
html_options
end
def
parse
(
text
)
text
.
gsub
(
REFERENCE_PATTERN
)
do
|
match
|
prefix
=
$1
||
''
reference
=
$2
identifier
=
$3
||
$4
||
$5
suffix
=
$6
||
''
if
ref_link
=
reference_link
(
reference
,
identifier
)
prefix
+
ref_link
+
suffix
else
match
end
end
end
private
# Private: Dispatches to a dedicated processing method based on reference
#
# reference - Object reference ("@1234", "!567", etc.)
# identifier - Object identifier (Issue ID, SHA hash, etc.)
#
# Returns string rendered by the processing method
def
reference_link
(
reference
,
identifier
)
case
reference
when
/^@/
then
reference_user
(
identifier
)
when
/^#/
then
reference_issue
(
identifier
)
when
/^!/
then
reference_merge_request
(
identifier
)
when
/^\$/
then
reference_snippet
(
identifier
)
when
/^\h/
then
reference_commit
(
identifier
)
end
end
def
reference_user
(
identifier
)
if
user
=
@project
.
users
.
where
(
name:
identifier
).
first
member
=
@project
.
users_projects
.
where
(
user_id:
user
).
first
link_to
(
"@
#{
user
.
name
}
"
,
project_team_member_path
(
@project
,
member
),
html_options
.
merge
(
class:
"gfm gfm-team_member
#{
html_options
[
:class
]
}
"
))
if
member
end
end
def
reference_issue
(
identifier
)
if
issue
=
@project
.
issues
.
where
(
id:
identifier
).
first
link_to
(
"#
#{
issue
.
id
}
"
,
project_issue_path
(
@project
,
issue
),
html_options
.
merge
(
title:
"Issue:
#{
issue
.
title
}
"
,
class:
"gfm gfm-issue
#{
html_options
[
:class
]
}
"
))
end
end
def
reference_merge_request
(
identifier
)
if
merge_request
=
@project
.
merge_requests
.
where
(
id:
identifier
).
first
link_to
(
"!
#{
merge_request
.
id
}
"
,
project_merge_request_path
(
@project
,
merge_request
),
html_options
.
merge
(
title:
"Merge Request:
#{
merge_request
.
title
}
"
,
class:
"gfm gfm-merge_request
#{
html_options
[
:class
]
}
"
))
end
end
def
reference_snippet
(
identifier
)
if
snippet
=
@project
.
snippets
.
where
(
id:
identifier
).
first
link_to
(
"$
#{
snippet
.
id
}
"
,
project_snippet_path
(
@project
,
snippet
),
html_options
.
merge
(
title:
"Snippet:
#{
snippet
.
title
}
"
,
class:
"gfm gfm-snippet
#{
html_options
[
:class
]
}
"
))
end
end
def
reference_commit
(
identifier
)
if
commit
=
@project
.
commit
(
identifier
)
link_to
(
identifier
,
project_commit_path
(
@project
,
id:
commit
.
id
),
html_options
.
merge
(
title:
"Commit:
#{
commit
.
author_name
}
-
#{
CommitDecorator
.
new
(
commit
).
title
}
"
,
class:
"gfm gfm-commit
#{
html_options
[
:class
]
}
"
))
end
end
end
end
This diff is collapsed.
Click to expand it.
public/404.html
View file @
66399d55
...
...
@@ -7,7 +7,7 @@
<body>
<h1>
404
</h1>
<div
class=
"alert-message block-message error"
>
<div>
<h2>
The page you were looking for doesn't exist.
</h2>
<p>
You may have mistyped the address or the page may have moved.
</p>
</div>
...
...
This diff is collapsed.
Click to expand it.
public/422.html
View file @
66399d55
...
...
@@ -8,7 +8,7 @@
<body>
<!-- This file lives in public/422.html -->
<h1>
422
</h1>
<div
class=
"alert-message block-message error"
>
<div>
<h2>
The change you wanted was rejected.
</h2>
<p>
Maybe you tried to change something you didn't have access to.
</p>
</div>
...
...
This diff is collapsed.
Click to expand it.
public/500.html
View file @
66399d55
...
...
@@ -8,7 +8,7 @@
<body>
<!-- This file lives in public/500.html -->
<h1>
500
</h1>
<div
class=
"alert-message block-message error"
>
<div>
<h2>
We're sorry, but something went wrong.
</h2>
<p>
We've been notified about this issue and we'll take a look at it shortly.
</p>
</div>
...
...
This diff is collapsed.
Click to expand it.
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