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
1b1a408a
Commit
1b1a408a
authored
Dec 30, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert span into col-md
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
447b46ca
Changes
41
Hide whitespace changes
Inline
Side-by-side
Showing
41 changed files
with
96 additions
and
96 deletions
+96
-96
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+9
-9
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+2
-2
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+2
-2
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+2
-2
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+2
-2
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+2
-2
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+2
-2
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+2
-2
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+2
-2
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+2
-2
app/views/dashboard/show.html.haml
app/views/dashboard/show.html.haml
+2
-2
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+2
-2
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+2
-2
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+2
-2
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+2
-2
app/views/help/_api_layout.html.haml
app/views/help/_api_layout.html.haml
+2
-2
app/views/help/_layout.html.haml
app/views/help/_layout.html.haml
+2
-2
app/views/help/index.html.haml
app/views/help/index.html.haml
+3
-3
app/views/layouts/project_settings.html.haml
app/views/layouts/project_settings.html.haml
+2
-2
app/views/profiles/keys/show.html.haml
app/views/profiles/keys/show.html.haml
+2
-2
app/views/profiles/notifications/_settings.html.haml
app/views/profiles/notifications/_settings.html.haml
+2
-2
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+2
-2
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+2
-2
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+3
-3
app/views/projects/branches/index.html.haml
app/views/projects/branches/index.html.haml
+3
-3
app/views/projects/branches/recent.html.haml
app/views/projects/branches/recent.html.haml
+3
-3
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+2
-2
app/views/projects/deploy_keys/index.html.haml
app/views/projects/deploy_keys/index.html.haml
+2
-2
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+2
-2
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+3
-3
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+2
-2
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+1
-1
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+2
-2
app/views/projects/milestones/index.html.haml
app/views/projects/milestones/index.html.haml
+2
-2
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+5
-5
app/views/projects/protected_branches/index.html.haml
app/views/projects/protected_branches/index.html.haml
+3
-3
app/views/projects/repositories/stats.html.haml
app/views/projects/repositories/stats.html.haml
+2
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+2
-2
app/views/snippets/current_user_index.html.haml
app/views/snippets/current_user_index.html.haml
+2
-2
app/views/users/show.html.haml
app/views/users/show.html.haml
+2
-2
No files found.
app/views/admin/dashboard/index.html.haml
View file @
1b1a408a
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
You can manage projects, users and other GitLab data from here.
You can manage projects, users and other GitLab data from here.
%hr
%hr
.admin_dash.row
.admin_dash.row
.
span
4
.
col-md-
4
.light-well
.light-well
%h4
Projects
%h4
Projects
.data
.data
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%h1
=
Project
.
count
%h1
=
Project
.
count
%hr
%hr
=
link_to
'New Project'
,
new_project_path
,
class:
"btn btn-new"
=
link_to
'New Project'
,
new_project_path
,
class:
"btn btn-new"
.
span
4
.
col-md-
4
.light-well
.light-well
%h4
Users
%h4
Users
.data
.data
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
%h1
=
User
.
count
%h1
=
User
.
count
%hr
%hr
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-new"
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-new"
.
span
4
.
col-md-
4
.light-well
.light-well
%h4
Groups
%h4
Groups
.data
.data
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-new"
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-new"
.row.prepend-top-10
.row.prepend-top-10
.
span
4
.
col-md-
4
%h4
Latest projects
%h4
Latest projects
%hr
%hr
-
@projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
%span
.light.pull-right
%span
.light.pull-right
#{
time_ago_with_tooltip
(
project
.
created_at
)
}
#{
time_ago_with_tooltip
(
project
.
created_at
)
}
.
span
4
.
col-md-
4
%h4
Latest users
%h4
Latest users
%hr
%hr
-
@users
.
each
do
|
user
|
-
@users
.
each
do
|
user
|
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
%span
.light.pull-right
%span
.light.pull-right
#{
time_ago_with_tooltip
(
user
.
created_at
)
}
#{
time_ago_with_tooltip
(
user
.
created_at
)
}
.
span
4
.
col-md-
4
%h4
Latest groups
%h4
Latest groups
%hr
%hr
-
@groups
.
each
do
|
group
|
-
@groups
.
each
do
|
group
|
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
%br
%br
.row
.row
.
span
4
.
col-md-
4
%h4
Stats
%h4
Stats
%hr
%hr
%p
%p
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
Milestones
Milestones
%span
.light.pull-right
%span
.light.pull-right
=
Milestone
.
count
=
Milestone
.
count
.
span
4
.
col-md-
4
%h4
%h4
Features
Features
%hr
%hr
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
OmniAuth
OmniAuth
%span
.light.pull-right
%span
.light.pull-right
=
boolean_to_icon
Gitlab
.
config
.
omniauth
.
enabled
=
boolean_to_icon
Gitlab
.
config
.
omniauth
.
enabled
.
span
4
.
col-md-
4
%h4
Components
%h4
Components
%hr
%hr
%p
%p
...
...
app/views/admin/groups/show.html.haml
View file @
1b1a408a
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
Edit
Edit
%hr
%hr
.row
.row
.
span
6
.
col-md-
6
.ui-box
.ui-box
.title
.title
Group info:
Group info:
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
%span
.pull-right.light
%span
.pull-right.light
%span
.monospace
=
project
.
path_with_namespace
+
".git"
%span
.monospace
=
project
.
path_with_namespace
+
".git"
.
span
6
.
col-md-
6
.ui-box
.ui-box
.title
.title
Add user(s) to the group:
Add user(s) to the group:
...
...
app/views/admin/projects/index.html.haml
View file @
1b1a408a
.row
.row
.
span
4
.
col-md-
4
.admin-filter
.admin-filter
=
form_tag
admin_projects_path
,
method: :get
,
class:
'form-inline'
do
=
form_tag
admin_projects_path
,
method: :get
,
class:
'form-inline'
do
.control-group
.control-group
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
.form-actions
.form-actions
=
submit_tag
"Search"
,
class:
"btn submit btn-primary"
=
submit_tag
"Search"
,
class:
"btn submit btn-primary"
=
link_to
"Reset"
,
admin_projects_path
,
class:
"btn"
=
link_to
"Reset"
,
admin_projects_path
,
class:
"btn"
.
span
8
.
col-md-
8
.ui-box
.ui-box
.title
.title
Projects (
#{
@projects
.
total_count
}
)
Projects (
#{
@projects
.
total_count
}
)
...
...
app/views/admin/projects/show.html.haml
View file @
1b1a408a
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
Edit
Edit
%hr
%hr
.row
.row
.
span
6
.
col-md-
6
.ui-box
.ui-box
.title
.title
Project info:
Project info:
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
.controls
.controls
=
f
.
submit
'Transfer'
,
class:
'btn btn-primary'
=
f
.
submit
'Transfer'
,
class:
'btn btn-primary'
.
span
6
.
col-md-
6
-
if
@group
-
if
@group
.ui-box
.ui-box
.title
.title
...
...
app/views/admin/users/_form.html.haml
View file @
1b1a408a
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
%fieldset
%fieldset
%legend
Access
%legend
Access
.row
.row
.
span
8
.
col-md-
8
.control-group
.control-group
=
f
.
label
:projects_limit
=
f
.
label
:projects_limit
.controls
=
f
.
number_field
:projects_limit
.controls
=
f
.
number_field
:projects_limit
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
=
f
.
label
:admin
do
=
f
.
label
:admin
do
%strong
.cred
Administrator
%strong
.cred
Administrator
.controls
=
f
.
check_box
:admin
.controls
=
f
.
check_box
:admin
.
span
4
.
col-md-
4
-
unless
@user
.
new_record?
-
unless
@user
.
new_record?
.alert.alert-error
.alert.alert-error
-
if
@user
.
blocked?
-
if
@user
.
blocked?
...
...
app/views/admin/users/index.html.haml
View file @
1b1a408a
.row
.row
.
span
3
.
col-md-
3
.admin-filter
.admin-filter
=
form_tag
admin_users_path
,
method: :get
,
class:
'form-inline'
do
=
form_tag
admin_users_path
,
method: :get
,
class:
'form-inline'
do
=
search_field_tag
:name
,
params
[
:name
],
placeholder:
'Name, email or username'
,
class:
'input-xpadding span2'
=
search_field_tag
:name
,
params
[
:name
],
placeholder:
'Name, email or username'
,
class:
'input-xpadding span2'
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
%hr
%hr
=
link_to
'Reset'
,
admin_users_path
,
class:
"btn btn-cancel"
=
link_to
'Reset'
,
admin_users_path
,
class:
"btn btn-cancel"
.
span
9
.
col-md-
9
.ui-box
.ui-box
.title
.title
Users (
#{
@users
.
total_count
}
)
Users (
#{
@users
.
total_count
}
)
...
...
app/views/admin/users/show.html.haml
View file @
1b1a408a
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%hr
%hr
.row
.row
.
span
6
.
col-md-
6
.ui-box
.ui-box
.title
.title
Account:
Account:
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
%strong
#{
@user
.
solo_owned_groups
.
map
(
&
:name
).
join
(
', '
)
}
%strong
#{
@user
.
solo_owned_groups
.
map
(
&
:name
).
join
(
', '
)
}
=
link_to
'Remove user'
,
[
:admin
,
@user
],
data:
{
confirm:
"USER
#{
@user
.
name
}
WILL BE REMOVED! Are you sure?"
},
method: :delete
,
class:
"btn btn-remove"
=
link_to
'Remove user'
,
[
:admin
,
@user
],
data:
{
confirm:
"USER
#{
@user
.
name
}
WILL BE REMOVED! Are you sure?"
},
method: :delete
,
class:
"btn btn-remove"
.
span
6
.
col-md-
6
-
if
@user
.
users_groups
.
present?
-
if
@user
.
users_groups
.
present?
.ui-box
.ui-box
.title
Groups:
.title
Groups:
...
...
app/views/dashboard/issues.html.haml
View file @
1b1a408a
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
%hr
%hr
.row
.row
.
span
3
.
col-md-
3
=
render
'shared/filter'
,
entity:
'issue'
=
render
'shared/filter'
,
entity:
'issue'
.
span
9
.
col-md-
9
=
render
'shared/issues'
=
render
'shared/issues'
app/views/dashboard/merge_requests.html.haml
View file @
1b1a408a
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
List all merge requests from all project's you have access to.
List all merge requests from all project's you have access to.
%hr
%hr
.row
.row
.
span
3
.
col-md-
3
=
render
'shared/filter'
,
entity:
'merge_request'
=
render
'shared/filter'
,
entity:
'merge_request'
.
span
9
.
col-md-
9
=
render
'shared/merge_requests'
=
render
'shared/merge_requests'
app/views/dashboard/projects.html.haml
View file @
1b1a408a
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
All projects you have access to are listed here. Public projects are not included here unless you are a member
All projects you have access to are listed here. Public projects are not included here unless you are a member
%hr
%hr
.row
.row
.
span
3
.
col-md-
3
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
=
nav_tab
:scope
,
nil
do
=
nav_tab
:scope
,
nil
do
=
link_to
projects_dashboard_filter_path
(
scope:
nil
)
do
=
link_to
projects_dashboard_filter_path
(
scope:
nil
)
do
...
@@ -81,7 +81,7 @@
...
@@ -81,7 +81,7 @@
%i
.icon-tag
%i
.icon-tag
=
label
.
name
=
label
.
name
.
span
9
.
col-md-
9
%ul
.bordered-list.my-projects.top-list
%ul
.bordered-list.my-projects.top-list
-
@projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
%li
.my-project-row
%li
.my-project-row
...
...
app/views/dashboard/show.html.haml
View file @
1b1a408a
-
if
@has_authorized_projects
-
if
@has_authorized_projects
.dashboard
.dashboard
.activities.
span
8
.activities.
col-md-
8
=
render
'activities'
=
render
'activities'
.side.
span
4
.side.
col-md-
4
=
render
'sidebar'
=
render
'sidebar'
-
else
-
else
...
...
app/views/groups/edit.html.haml
View file @
1b1a408a
.row
.row
.
span
2
.
col-md-
2
%ul
.nav.nav-pills.nav-stacked.nav-stacked-menu
%ul
.nav.nav-pills.nav-stacked.nav-stacked-menu
%li
.active
%li
.active
=
link_to
'#tab-edit'
,
'data-toggle'
=>
'tab'
do
=
link_to
'#tab-edit'
,
'data-toggle'
=>
'tab'
do
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%li
%li
=
link_to
'Remove'
,
'#tab-remove'
,
'data-toggle'
=>
'tab'
=
link_to
'Remove'
,
'#tab-remove'
,
'data-toggle'
=>
'tab'
.
span
10
.
col-md-
10
.tab-content
.tab-content
.tab-pane.active
#tab-edit
.tab-pane.active
#tab-edit
.ui-box
.ui-box
...
...
app/views/groups/issues.html.haml
View file @
1b1a408a
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%hr
%hr
.row
.row
.
span
3
.
col-md-
3
=
render
'shared/filter'
,
entity:
'issue'
=
render
'shared/filter'
,
entity:
'issue'
.
span
9
.
col-md-
9
=
render
'shared/issues'
=
render
'shared/issues'
app/views/groups/merge_requests.html.haml
View file @
1b1a408a
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
group. To see all merge requests you should visit
#{
link_to
'dashboard'
,
merge_requests_dashboard_path
}
page.
group. To see all merge requests you should visit
#{
link_to
'dashboard'
,
merge_requests_dashboard_path
}
page.
%hr
%hr
.row
.row
.
span
3
.
col-md-
3
=
render
'shared/filter'
,
entity:
'merge_request'
=
render
'shared/filter'
,
entity:
'merge_request'
.
span
9
.
col-md-
9
=
render
'shared/merge_requests'
=
render
'shared/merge_requests'
app/views/groups/show.html.haml
View file @
1b1a408a
.dashboard
.dashboard
.activities.
span
8
.activities.
col-md-
8
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
=
link_to
dashboard_path
,
class:
'btn btn-tiny'
do
=
link_to
dashboard_path
,
class:
'btn btn-tiny'
do
←
To dashboard
←
To dashboard
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
-
else
-
else
%p
.nothing_here_message
Project activity will be displayed here
%p
.nothing_here_message
Project activity will be displayed here
.loading.hide
.loading.hide
.side.
span
4
.side.
col-md-
4
-
if
@group
.
description
.
present?
-
if
@group
.
description
.
present?
.description-block
.description-block
=
@group
.
description
=
@group
.
description
...
...
app/views/help/_api_layout.html.haml
View file @
1b1a408a
.row
.row
.
span
3
.
col-md-
3
.append-bottom-20
.append-bottom-20
=
link_to
help_path
,
class:
'btn btn-small'
do
=
link_to
help_path
,
class:
'btn btn-small'
do
%i
.icon-angle-left
%i
.icon-angle-left
...
@@ -9,5 +9,5 @@
...
@@ -9,5 +9,5 @@
%li
{
class:
file
==
@category
?
'active'
:
nil
}
%li
{
class:
file
==
@category
?
'active'
:
nil
}
=
link_to
file
.
titleize
,
help_api_file_path
(
file
)
=
link_to
file
.
titleize
,
help_api_file_path
(
file
)
.
span
9.pull-right
.
col-md-
9.pull-right
=
yield
=
yield
app/views/help/_layout.html.haml
View file @
1b1a408a
.row
.row
.
span
3
{
:"data-spy"
=>
'affix'
}
.
col-md-
3
{
:"data-spy"
=>
'affix'
}
%h3
.page-title
Help
%h3
.page-title
Help
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
-
links
=
{
:"Workflow"
=>
help_workflow_path
,
:"SSH Keys"
=>
help_ssh_path
,
:"GitLab Markdown"
=>
help_markdown_path
,
:"Permissions"
=>
help_permissions_path
,
:"API"
=>
help_api_path
,
:"Web Hooks"
=>
help_web_hooks_path
,
:"Rake Tasks"
=>
help_raketasks_path
,
:"System Hooks"
=>
help_system_hooks_path
,
:"Public Access"
=>
help_public_access_path
,
:"Security"
=>
help_security_path
}
-
links
=
{
:"Workflow"
=>
help_workflow_path
,
:"SSH Keys"
=>
help_ssh_path
,
:"GitLab Markdown"
=>
help_markdown_path
,
:"Permissions"
=>
help_permissions_path
,
:"API"
=>
help_api_path
,
:"Web Hooks"
=>
help_web_hooks_path
,
:"Rake Tasks"
=>
help_raketasks_path
,
:"System Hooks"
=>
help_system_hooks_path
,
:"Public Access"
=>
help_public_access_path
,
:"Security"
=>
help_security_path
}
...
@@ -7,5 +7,5 @@
...
@@ -7,5 +7,5 @@
%li
{
class:
current_page?
(
path
)
?
'active'
:
nil
}
%li
{
class:
current_page?
(
path
)
?
'active'
:
nil
}
=
link_to
title
,
path
=
link_to
title
,
path
.
span
9.pull-right
.
col-md-
9.pull-right
=
yield
=
yield
app/views/help/index.html.haml
View file @
1b1a408a
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
Read more about GitLab at
#{
link_to
"gitlab.org"
,
"http://gitlab.org/"
,
target:
"_blank"
}
.
Read more about GitLab at
#{
link_to
"gitlab.org"
,
"http://gitlab.org/"
,
target:
"_blank"
}
.
.row
.row
.
span
4
.
col-md-
4
.ui-box
.ui-box
.title
.title
Quick help
Quick help
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
Browse our
Browse our
=
link_to
"issue tracker"
,
"https://github.com/gitlabhq/gitlabhq/issues"
=
link_to
"issue tracker"
,
"https://github.com/gitlabhq/gitlabhq/issues"
.
span
4
.
col-md-
4
.ui-box
.ui-box
.title
.title
User documentation
User documentation
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
%strong
=
link_to
"Web Hooks"
,
help_web_hooks_path
%strong
=
link_to
"Web Hooks"
,
help_web_hooks_path
%p
Let GitLab notify you when new code has been pushed to your project.
%p
Let GitLab notify you when new code has been pushed to your project.
.
span
4
.
col-md-
4
.ui-box
.ui-box
.title
.title
Admin documentation
Admin documentation
...
...
app/views/layouts/project_settings.html.haml
View file @
1b1a408a
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
.container
.container
.content
.content
.row
.row
.
span
2
.
col-md-
2
=
render
"projects/settings_nav"
=
render
"projects/settings_nav"
.
span
10
.
col-md-
10
=
yield
=
yield
app/views/profiles/keys/show.html.haml
View file @
1b1a408a
.row
.row
.
span
4
.
col-md-
4
.ui-box
.ui-box
.title
.title
SSH Key
SSH Key
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
%span
.light
Created on:
%span
.light
Created on:
%strong
=
@key
.
created_at
.
stamp
(
"Aug 21, 2011"
)
%strong
=
@key
.
created_at
.
stamp
(
"Aug 21, 2011"
)
.
span
8
.
col-md-
8
%p
%p
%span
.light
Fingerprint:
%span
.light
Fingerprint:
%strong
=
@key
.
fingerprint
%strong
=
@key
.
fingerprint
...
...
app/views/profiles/notifications/_settings.html.haml
View file @
1b1a408a
%li
%li
.row
.row
.
span
4
.
col-md-
4
%span
%span
=
notification_icon
(
notification
)
=
notification_icon
(
notification
)
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
link_to
membership
.
group
.
name
,
membership
.
group
=
link_to
membership
.
group
.
name
,
membership
.
group
-
else
-
else
=
link_to_project
(
membership
.
project
)
=
link_to_project
(
membership
.
project
)
.
span
7
.
col-md-
7
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
hidden_field_tag
:notification_type
,
type
,
id:
dom_id
(
membership
,
'notification_type'
)
=
hidden_field_tag
:notification_type
,
type
,
id:
dom_id
(
membership
,
'notification_type'
)
=
hidden_field_tag
:notification_id
,
membership
.
id
,
id:
dom_id
(
membership
,
'notification_id'
)
=
hidden_field_tag
:notification_id
,
membership
.
id
,
id:
dom_id
(
membership
,
'notification_id'
)
...
...
app/views/profiles/notifications/show.html.haml
View file @
1b1a408a
...
@@ -18,11 +18,11 @@
...
@@ -18,11 +18,11 @@
–
You will receive all notifications from projects in which you participate
–
You will receive all notifications from projects in which you participate
.row
.row
.
span
4
.
col-md-
4
%h4
%h4
=
notification_icon
(
@notification
)
=
notification_icon
(
@notification
)
Global setting
Global setting
.
span
7
.
col-md-
7
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'update-notifications'
do
=
hidden_field_tag
:notification_type
,
'global'
=
hidden_field_tag
:notification_type
,
'global'
...
...
app/views/profiles/show.html.haml
View file @
1b1a408a
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.row
.row
.
span
7
.
col-md-
7
.control-group
.control-group
=
f
.
label
:name
,
class:
"control-label"
=
f
.
label
:name
,
class:
"control-label"
.controls
.controls
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
=
f
.
text_area
:bio
,
rows:
6
,
class:
"input-xlarge"
,
maxlength:
250
=
f
.
text_area
:bio
,
rows:
6
,
class:
"input-xlarge"
,
maxlength:
250
%span
.help-block
Tell us about yourself in fewer than 250 characters.
%span
.help-block
Tell us about yourself in fewer than 250 characters.
.
span
5.pull-right
.
col-md-
5.pull-right
.light-well
.light-well
=
image_tag
avatar_icon
(
@user
.
email
,
160
),
alt:
''
,
class:
'avatar s160'
=
image_tag
avatar_icon
(
@user
.
email
,
160
),
alt:
''
,
class:
'avatar s160'
...
...
app/views/projects/_home_panel.html.haml
View file @
1b1a408a
-
empty_repo
=
@project
.
empty_repo?
-
empty_repo
=
@project
.
empty_repo?
.project-home-panel
{
:class
=>
(
"empty-project"
if
empty_repo
)}
.project-home-panel
{
:class
=>
(
"empty-project"
if
empty_repo
)}
.row
.row
.
span
6
.
col-md-
6
%h4
.project-home-title
%h4
.project-home-title
=
@project
.
name_with_namespace
=
@project
.
name_with_namespace
%span
.visibility-level-label
%span
.visibility-level-label
=
visibility_level_icon
(
@project
.
visibility_level
)
=
visibility_level_icon
(
@project
.
visibility_level
)
=
visibility_level_label
(
@project
.
visibility_level
)
=
visibility_level_label
(
@project
.
visibility_level
)
.
span
6
.
col-md-
6
-
unless
empty_repo
-
unless
empty_repo
.project-home-dropdown
.project-home-dropdown
=
render
"dropdown"
=
render
"dropdown"
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
=
render
"shared/clone_panel"
=
render
"shared/clone_panel"
.project-home-extra.clearfix.row
.project-home-extra.clearfix.row
.project-home-desc.
span
8
.project-home-desc.
col-md-
8
-
if
@project
.
description
.
present?
-
if
@project
.
description
.
present?
=
@project
.
description
=
@project
.
description
-
if
can?
(
current_user
,
:admin_project
,
@project
)
-
if
can?
(
current_user
,
:admin_project
,
@project
)
...
...
app/views/projects/branches/index.html.haml
View file @
1b1a408a
=
render
"projects/commits/head"
=
render
"projects/commits/head"
.row
.row
.
span
3
.
col-md-
3
=
render
"filter"
=
render
"filter"
.
span
9
.
col-md-
9
-
unless
@branches
.
empty?
-
unless
@branches
.
empty?
%ul
.bordered-list.top-list
%ul
.bordered-list.top-list
-
@branches
.
each
do
|
branch
|
-
@branches
.
each
do
|
branch
|
=
render
"projects/branches/branch"
,
branch:
branch
=
render
"projects/branches/branch"
,
branch:
branch
=
paginate
@branches
,
theme:
'gitlab'
=
paginate
@branches
,
theme:
'gitlab'
\ No newline at end of file
app/views/projects/branches/recent.html.haml
View file @
1b1a408a
=
render
"projects/commits/head"
=
render
"projects/commits/head"
.row
.row
.
span
3
.
col-md-
3
=
render
"filter"
=
render
"filter"
.
span
9
.
col-md-
9
%ul
.bordered-list.top-list
%ul
.bordered-list.top-list
-
@branches
.
each
do
|
branch
|
-
@branches
.
each
do
|
branch
|
=
render
"projects/branches/branch"
,
branch:
branch
=
render
"projects/branches/branch"
,
branch:
branch
\ No newline at end of file
app/views/projects/commits/_commits.html.haml
View file @
1b1a408a
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
sort
.
reverse
.
each
do
|
day
,
commits
|
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
sort
.
reverse
.
each
do
|
day
,
commits
|
.row.commits-row
.row.commits-row
.
span
2
.
col-md-
2
%h4
%h4
%i
.icon-calendar
%i
.icon-calendar
%span
=
day
.
stamp
(
"28 Aug, 2010"
)
%span
=
day
.
stamp
(
"28 Aug, 2010"
)
%p
=
pluralize
(
commits
.
count
,
'commit'
)
%p
=
pluralize
(
commits
.
count
,
'commit'
)
.
span
10
.
col-md-
10
%ul
.well-list
%ul
.well-list
=
render
commits
,
project:
@project
=
render
commits
,
project:
@project
%hr
.lists-separator
%hr
.lists-separator
app/views/projects/deploy_keys/index.html.haml
View file @
1b1a408a
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%hr
.clearfix
%hr
.clearfix
.row
.row
.
span
5.enabled-keys
.
col-md-
5.enabled-keys
%h5
%h5
%strong
.cgreen
Enabled deploy keys
%strong
.cgreen
Enabled deploy keys
for this project
for this project
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
-
if
@enabled_keys
.
blank?
-
if
@enabled_keys
.
blank?
.light-well
.light-well
%p
.nothing_here_message
Create a
#{
link_to
'new deploy key'
,
new_project_deploy_key_path
(
@project
)
}
or add an existing one
%p
.nothing_here_message
Create a
#{
link_to
'new deploy key'
,
new_project_deploy_key_path
(
@project
)
}
or add an existing one
.
span
5.available-keys
.
col-md-
5.available-keys
%h5
%h5
%strong
Deploy keys
%strong
Deploy keys
from projects available to you
from projects available to you
...
...
app/views/projects/issues/index.html.haml
View file @
1b1a408a
=
render
"head"
=
render
"head"
.row
.row
.
span
3
.
col-md-
3
=
render
'shared/project_filter'
,
project_entities_path:
project_issues_path
(
@project
)
=
render
'shared/project_filter'
,
project_entities_path:
project_issues_path
(
@project
)
.
span
9.issues-holder
.
col-md-
9.issues-holder
=
render
"issues"
=
render
"issues"
app/views/projects/issues/show.html.haml
View file @
1b1a408a
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
Edit
Edit
.pull-right
.pull-right
.
span
3
#votes
=
render
'votes/votes_block'
,
votable:
@issue
.
col-md-
3
#votes
=
render
'votes/votes_block'
,
votable:
@issue
.back-link
.back-link
=
link_to
project_issues_path
(
@project
)
do
=
link_to
project_issues_path
(
@project
)
do
...
...
app/views/projects/merge_requests/_form.html.haml
View file @
1b1a408a
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.merge-request-branches
.merge-request-branches
.row
.row
.
span
5
.
col-md-
5
.clearfix
.clearfix
.pull-left
.pull-left
=
f
.
select
(
:source_project_id
,
[[
@merge_request
.
source_project_path
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project chosen span3'
,
disabled:
@merge_request
.
persisted?
})
=
f
.
select
(
:source_project_id
,
[[
@merge_request
.
source_project_path
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project chosen span3'
,
disabled:
@merge_request
.
persisted?
})
...
@@ -15,10 +15,10 @@
...
@@ -15,10 +15,10 @@
=
f
.
select
(
:source_branch
,
@merge_request
.
source_project
.
repository
.
branch_names
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch chosen span2'
})
=
f
.
select
(
:source_branch
,
@merge_request
.
source_project
.
repository
.
branch_names
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch chosen span2'
})
.mr_source_commit.prepend-top-10
.mr_source_commit.prepend-top-10
.
span
2
.
col-md-
2
%h2
.merge-request-angle.light
%h2
.merge-request-angle.light
%i
.icon-long-arrow-right
%i
.icon-long-arrow-right
.
span
5
.
col-md-
5
.clearfix
.clearfix
.pull-left
.pull-left
-
projects
=
@project
.
forked_from_project
.
nil?
?
[
@project
]
:
[
@project
,
@project
.
forked_from_project
]
-
projects
=
@project
.
forked_from_project
.
nil?
?
[
@project
]
:
[
@project
,
@project
.
forked_from_project
]
...
...
app/views/projects/merge_requests/index.html.haml
View file @
1b1a408a
...
@@ -8,9 +8,9 @@
...
@@ -8,9 +8,9 @@
.row
.row
.
span
3
.
col-md-
3
=
render
'shared/project_filter'
,
project_entities_path:
project_merge_requests_path
(
@project
)
=
render
'shared/project_filter'
,
project_entities_path:
project_merge_requests_path
(
@project
)
.
span
9
.
col-md-
9
.ui-box
.ui-box
.title
.title
.mr-filters
.mr-filters
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
1b1a408a
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
Edit
Edit
.pull-right
.pull-right
.
span
3
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
.
col-md-
3
#votes
=
render
'votes/votes_block'
,
votable:
@merge_request
.back-link
.back-link
=
link_to
project_merge_requests_path
(
@project
)
do
=
link_to
project_merge_requests_path
(
@project
)
do
...
...
app/views/projects/milestones/_form.html.haml
View file @
1b1a408a
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
-
@milestone
.
errors
.
full_messages
.
each
do
|
msg
|
-
@milestone
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.row
.row
.
span
6
.
col-md-
6
.control-group
.control-group
=
f
.
label
:title
,
"Title"
,
class:
"control-label"
=
f
.
label
:title
,
"Title"
,
class:
"control-label"
.controls
.controls
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
.controls
.controls
=
f
.
text_area
:description
,
maxlength:
2000
,
class:
"input-xlarge"
,
rows:
10
=
f
.
text_area
:description
,
maxlength:
2000
,
class:
"input-xlarge"
,
rows:
10
%p
.hint
Milestones are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
%p
.hint
Milestones are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
.
span
6
.
col-md-
6
.control-group
.control-group
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
.controls
=
f
.
hidden_field
:due_date
.controls
=
f
.
hidden_field
:due_date
...
...
app/views/projects/milestones/index.html.haml
View file @
1b1a408a
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
New Milestone
New Milestone
.row
.row
.
span
3
.
col-md-
3
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
%li
{
class:
(
"active"
if
(
params
[
:f
]
==
"active"
||
!
params
[
:f
]))}
%li
{
class:
(
"active"
if
(
params
[
:f
]
==
"active"
||
!
params
[
:f
]))}
=
link_to
project_milestones_path
(
@project
,
f:
"active"
)
do
=
link_to
project_milestones_path
(
@project
,
f:
"active"
)
do
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
%li
{
class:
(
"active"
if
params
[
:f
]
==
"all"
)}
%li
{
class:
(
"active"
if
params
[
:f
]
==
"all"
)}
=
link_to
project_milestones_path
(
@project
,
f:
"all"
)
do
=
link_to
project_milestones_path
(
@project
,
f:
"all"
)
do
All
All
.
span
9
.
col-md-
9
.ui-box
.ui-box
%ul
.well-list
%ul
.well-list
=
render
@milestones
=
render
@milestones
...
...
app/views/projects/milestones/show.html.haml
View file @
1b1a408a
...
@@ -72,22 +72,22 @@
...
@@ -72,22 +72,22 @@
.tab-content
.tab-content
.tab-pane.active
#tab-issues
.tab-pane.active
#tab-issues
.row
.row
.
span
4
.
col-md-
4
=
render
(
'issues'
,
title:
'Unstarted Issues (open and unassigned)'
,
issues:
@issues
.
opened
.
unassigned
)
=
render
(
'issues'
,
title:
'Unstarted Issues (open and unassigned)'
,
issues:
@issues
.
opened
.
unassigned
)
.
span
4
.
col-md-
4
=
render
(
'issues'
,
title:
'Ongoing Issues (open and assigned)'
,
issues:
@issues
.
opened
.
assigned
)
=
render
(
'issues'
,
title:
'Ongoing Issues (open and assigned)'
,
issues:
@issues
.
opened
.
assigned
)
.
span
4
.
col-md-
4
=
render
(
'issues'
,
title:
'Completed Issues (closed)'
,
issues:
@issues
.
closed
)
=
render
(
'issues'
,
title:
'Completed Issues (closed)'
,
issues:
@issues
.
closed
)
.tab-pane
#tab-merge-requests
.tab-pane
#tab-merge-requests
.row
.row
.
span
6
.
col-md-
6
.ui-box
.ui-box
.title
Open
.title
Open
%ul
.well-list
%ul
.well-list
-
@merge_requests
.
opened
.
each
do
|
merge_request
|
-
@merge_requests
.
opened
.
each
do
|
merge_request
|
=
render
'merge_request'
,
merge_request:
merge_request
=
render
'merge_request'
,
merge_request:
merge_request
.
span
6
.
col-md-
6
.ui-box
.ui-box
.title
Closed
.title
Closed
%ul
.well-list
%ul
.well-list
...
...
app/views/projects/protected_branches/index.html.haml
View file @
1b1a408a
=
render
"projects/commits/head"
=
render
"projects/commits/head"
.row
.row
.
span
3
.
col-md-
3
=
render
"projects/branches/filter"
=
render
"projects/branches/filter"
.
span
9
.
col-md-
9
.alert.alert-info
.alert.alert-info
%p
Protected branches designed to prevent push for all except
#{
link_to
"masters"
,
help_permissions_path
,
class:
"vlink"
}
.
%p
Protected branches designed to prevent push for all except
#{
link_to
"masters"
,
help_permissions_path
,
class:
"vlink"
}
.
%p
This ability allows:
%p
This ability allows:
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
.entry.clearfix
.entry.clearfix
=
f
.
label
:name
,
"Branch"
=
f
.
label
:name
,
"Branch"
.
span
3
.
col-md-
3
=
f
.
select
(
:name
,
@project
.
open_branches
.
map
{
|
br
|
[
br
.
name
,
br
.
name
]
}
,
{
include_blank:
"Select branch"
},
{
class:
"chosen span3"
})
=
f
.
select
(
:name
,
@project
.
open_branches
.
map
{
|
br
|
[
br
.
name
,
br
.
name
]
}
,
{
include_blank:
"Select branch"
},
{
class:
"chosen span3"
})
=
f
.
submit
'Protect'
,
class:
"btn-create btn"
=
f
.
submit
'Protect'
,
class:
"btn-create btn"
...
...
app/views/projects/repositories/stats.html.haml
View file @
1b1a408a
=
render
"projects/commits/head"
=
render
"projects/commits/head"
.row
.row
.
span
6
.
col-md-
6
%div
#activity-chart
.chart
%div
#activity-chart
.chart
%hr
%hr
%p
%p
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
%span
=
@stats
.
authors_count
%span
=
@stats
.
authors_count
.
span
6
.
col-md-
6
%h4
Top 50 Committers:
%h4
Top 50 Committers:
%ol
.styled
%ol
.styled
-
@stats
.
authors
[
0
...
50
].
each
do
|
author
|
-
@stats
.
authors
[
0
...
50
].
each
do
|
author
|
...
...
app/views/projects/show.html.haml
View file @
1b1a408a
=
render
"home_panel"
=
render
"home_panel"
.row
.row
.
span
9
.
col-md-
9
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
=
render
'shared/event_filter'
=
render
'shared/event_filter'
.content_list
.content_list
.loading.hide
.loading.hide
.
span
3.project-side
.
col-md-
3.project-side
.clearfix
.clearfix
-
if
@project
.
archived?
-
if
@project
.
archived?
.alert
.alert
...
...
app/views/snippets/current_user_index.html.haml
View file @
1b1a408a
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
%hr
%hr
.row
.row
.
span
3
.
col-md-
3
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
=
nav_tab
:scope
,
nil
do
=
nav_tab
:scope
,
nil
do
=
link_to
user_snippets_path
(
@user
)
do
=
link_to
user_snippets_path
(
@user
)
do
...
@@ -29,6 +29,6 @@
...
@@ -29,6 +29,6 @@
%span
.pull-right
%span
.pull-right
=
@user
.
snippets
.
public
.
count
=
@user
.
snippets
.
public
.
count
.
span
9.my-snippets
.
col-md-
9.my-snippets
=
render
'snippets'
=
render
'snippets'
app/views/users/show.html.haml
View file @
1b1a408a
.row
.row
.
span
8
.
col-md-
8
%h3
.page-title
%h3
.page-title
=
image_tag
avatar_icon
(
@user
.
email
,
90
),
class:
"avatar s90"
,
alt:
''
=
image_tag
avatar_icon
(
@user
.
email
,
90
),
class:
"avatar s90"
,
alt:
''
=
@user
.
name
=
@user
.
name
...
@@ -16,6 +16,6 @@
...
@@ -16,6 +16,6 @@
%hr
%hr
%h4
User Activity:
%h4
User Activity:
=
render
@events
=
render
@events
.
span
4
.
col-md-
4
=
render
'profile'
,
user:
@user
=
render
'profile'
,
user:
@user
=
render
'projects'
,
user:
@user
=
render
'projects'
,
user:
@user
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