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
f79f7585
Commit
f79f7585
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
50297f71
6290b75d
No related merge requests found
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
2 additions
and
10 deletions
+2
-10
CHANGELOG
CHANGELOG
+1
-1
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-0
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+0
-1
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+0
-1
app/views/layouts/group.html.haml
app/views/layouts/group.html.haml
+0
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+0
-1
app/views/layouts/project_settings.html.haml
app/views/layouts/project_settings.html.haml
+0
-1
app/views/layouts/projects.html.haml
app/views/layouts/projects.html.haml
+0
-1
app/views/layouts/public_group.html.haml
app/views/layouts/public_group.html.haml
+0
-1
app/views/layouts/public_projects.html.haml
app/views/layouts/public_projects.html.haml
+0
-1
app/views/layouts/public_users.html.haml
app/views/layouts/public_users.html.haml
+0
-1
No files found.
CHANGELOG
View file @
f79f7585
...
...
@@ -33,7 +33,7 @@ v 7.8.0
-
-
-
-
-
Fix long broadcast message cut-off on left sidebar (Visay Keo)
- Add Project Avatars (Steven Thonus and Hannes Rosenögger)
-
-
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/_page.html.haml
View file @
f79f7585
-
if
defined?
(
sidebar
)
.page-with-sidebar
=
render
"layouts/broadcast"
.sidebar-wrapper
=
render
(
sidebar
)
.content-wrapper
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/admin.html.haml
View file @
f79f7585
...
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Admin area"
%body
{
class:
"#{app_theme} #{theme_type} admin"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Admin area"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/admin'
This diff is collapsed.
Click to expand it.
app/views/layouts/application.html.haml
View file @
f79f7585
...
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Dashboard"
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/dashboard'
This diff is collapsed.
Click to expand it.
app/views/layouts/group.html.haml
View file @
f79f7585
...
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
@group
.
name
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
This diff is collapsed.
Click to expand it.
app/views/layouts/profile.html.haml
View file @
f79f7585
...
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Profile"
%body
{
class:
"#{app_theme} #{theme_type} profile"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Profile"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/profile'
This diff is collapsed.
Click to expand it.
app/views/layouts/project_settings.html.haml
View file @
f79f7585
...
...
@@ -2,7 +2,6 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme} #{theme_type} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/init_auto_complete"
-
@project_settings_nav
=
true
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/projects.html.haml
View file @
f79f7585
...
...
@@ -2,7 +2,6 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
project_head_title
%body
{
class:
"#{app_theme} #{theme_type} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/init_auto_complete"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
This diff is collapsed.
Click to expand it.
app/views/layouts/public_group.html.haml
View file @
f79f7585
...
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
"group:
#{
@group
.
name
}
"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
This diff is collapsed.
Click to expand it.
app/views/layouts/public_projects.html.haml
View file @
f79f7585
...
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
project_title
(
@project
)
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
This diff is collapsed.
Click to expand it.
app/views/layouts/public_users.html.haml
View file @
f79f7585
...
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
@title
=
render
'layouts/page'
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