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
Kazuhiko Shiozaki
gitlab-ce
Commits
34cc4c59
Commit
34cc4c59
authored
Feb 13, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Link head panel titles to relevant root page.
parent
529188e4
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
13 additions
and
10 deletions
+13
-10
CHANGELOG
CHANGELOG
+1
-0
app/controllers/snippets_controller.rb
app/controllers/snippets_controller.rb
+1
-0
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+1
-0
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+1
-1
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+1
-1
app/views/layouts/explore.html.haml
app/views/layouts/explore.html.haml
+2
-2
app/views/layouts/group.html.haml
app/views/layouts/group.html.haml
+1
-1
app/views/layouts/navless.html.haml
app/views/layouts/navless.html.haml
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+1
-1
app/views/layouts/public_group.html.haml
app/views/layouts/public_group.html.haml
+1
-1
app/views/layouts/public_users.html.haml
app/views/layouts/public_users.html.haml
+1
-1
app/views/layouts/search.html.haml
app/views/layouts/search.html.haml
+1
-1
No files found.
CHANGELOG
View file @
34cc4c59
...
@@ -50,6 +50,7 @@ v 7.8.0 (unreleased)
...
@@ -50,6 +50,7 @@ v 7.8.0 (unreleased)
- Prevent losing unsaved comments by automatically restoring them when comment page is loaded again.
- Prevent losing unsaved comments by automatically restoring them when comment page is loaded again.
- Don't allow page to be scaled on mobile.
- Don't allow page to be scaled on mobile.
- Clean the username acquired from OAuth/LDAP so it doesn't fail username validation and block signing up.
- Clean the username acquired from OAuth/LDAP so it doesn't fail username validation and block signing up.
- Link head panel titles to relevant root page.
v 7.7.2
v 7.7.2
- Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch
- Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch
...
...
app/controllers/snippets_controller.rb
View file @
34cc4c59
...
@@ -106,6 +106,7 @@ class SnippetsController < ApplicationController
...
@@ -106,6 +106,7 @@ class SnippetsController < ApplicationController
def
set_title
def
set_title
@title
=
'Snippets'
@title
=
'Snippets'
@title_url
=
snippets_path
end
end
def
snippet_params
def
snippet_params
...
...
app/controllers/users_controller.rb
View file @
34cc4c59
...
@@ -19,6 +19,7 @@ class UsersController < ApplicationController
...
@@ -19,6 +19,7 @@ class UsersController < ApplicationController
where
(
project_id:
authorized_projects_ids
).
limit
(
30
)
where
(
project_id:
authorized_projects_ids
).
limit
(
30
)
@title
=
@user
.
name
@title
=
@user
.
name
@title_url
=
user_path
(
@user
)
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
...
...
app/views/layouts/admin.html.haml
View file @
34cc4c59
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Admin area"
=
render
"layouts/head"
,
title:
"Admin area"
%body
{
class:
"#{app_theme} #{theme_type} admin"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} admin"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/head_panel"
,
title:
"Admin area"
=
render
"layouts/head_panel"
,
title:
link_to
(
"Admin area"
,
admin_root_path
)
=
render
'layouts/page'
,
sidebar:
'layouts/nav/admin'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/admin'
app/views/layouts/application.html.haml
View file @
34cc4c59
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Dashboard"
=
render
"layouts/head"
,
title:
"Dashboard"
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/head_panel"
,
title:
"Dashboard"
=
render
"layouts/head_panel"
,
title:
link_to
(
"Dashboard"
,
root_path
)
=
render
'layouts/page'
,
sidebar:
'layouts/nav/dashboard'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/dashboard'
app/views/layouts/explore.html.haml
View file @
34cc4c59
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
-
if
current_user
-
if
current_user
=
render
"layouts/head_panel"
,
title:
page_title
=
render
"layouts/head_panel"
,
title:
link_to
(
page_title
,
explore_root_path
)
-
else
-
else
=
render
"layouts/public_head_panel"
,
title:
page_title
=
render
"layouts/public_head_panel"
,
title:
link_to
(
page_title
,
explore_root_path
)
.container.navless-container
.container.navless-container
.content
.content
.explore-title
.explore-title
...
...
app/views/layouts/group.html.haml
View file @
34cc4c59
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/head_panel"
,
title:
@group
.
name
=
render
"layouts/head_panel"
,
title:
link_to
(
@group
.
name
,
group_path
(
@group
))
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
app/views/layouts/navless.html.haml
View file @
34cc4c59
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
=
render
"layouts/head"
,
title:
@title
=
render
"layouts/head"
,
title:
@title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
@title
=
render
"layouts/head_panel"
,
title:
defined?
(
@title_url
)
?
link_to
(
@title
,
@title_url
)
:
@title
.container.navless-container
.container.navless-container
.content
.content
=
render
"layouts/flash"
=
render
"layouts/flash"
...
...
app/views/layouts/profile.html.haml
View file @
34cc4c59
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Profile"
=
render
"layouts/head"
,
title:
"Profile"
%body
{
class:
"#{app_theme} #{theme_type} profile"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} profile"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/head_panel"
,
title:
"Profile"
=
render
"layouts/head_panel"
,
title:
link_to
(
"Profile"
,
profile_path
)
=
render
'layouts/page'
,
sidebar:
'layouts/nav/profile'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/profile'
app/views/layouts/public_group.html.haml
View file @
34cc4c59
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/public_head_panel"
,
title:
"group:
#{
@group
.
name
}
"
=
render
"layouts/public_head_panel"
,
title:
link_to
(
@group
.
name
,
group_path
(
@group
))
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
app/views/layouts/public_users.html.haml
View file @
34cc4c59
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@title
=
render
"layouts/head"
,
title:
@title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/public_head_panel"
,
title:
@title
=
render
"layouts/public_head_panel"
,
title:
defined?
(
@title_url
)
?
link_to
(
@title
,
@title_url
)
:
@title
=
render
'layouts/page'
=
render
'layouts/page'
app/views/layouts/search.html.haml
View file @
34cc4c59
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
=
render
"layouts/head"
,
title:
"Search"
=
render
"layouts/head"
,
title:
"Search"
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Search"
=
render
"layouts/head_panel"
,
title:
link_to
(
"Search"
,
search_path
)
.container.navless-container
.container.navless-container
.content
.content
=
render
"layouts/flash"
=
render
"layouts/flash"
...
...
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