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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5aeb8053
Commit
5aeb8053
authored
Dec 20, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
549540f1
a9786733
Changes
21
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
41 additions
and
28 deletions
+41
-28
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+0
-6
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+3
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+4
-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/errors.html.haml
app/views/layouts/errors.html.haml
+1
-1
app/views/layouts/explore.html.haml
app/views/layouts/explore.html.haml
+1
-1
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/project_settings.html.haml
app/views/layouts/project_settings.html.haml
+1
-1
app/views/layouts/projects.html.haml
app/views/layouts/projects.html.haml
+1
-1
app/views/layouts/public_group.html.haml
app/views/layouts/public_group.html.haml
+1
-1
app/views/layouts/public_projects.html.haml
app/views/layouts/public_projects.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
app/views/profiles/update.js.erb
app/views/profiles/update.js.erb
+2
-2
app/views/projects/transfer.js.haml
app/views/projects/transfer.js.haml
+1
-6
doc/raketasks/README.md
doc/raketasks/README.md
+3
-0
doc/update/7.5-to-7.6.md
doc/update/7.5-to-7.6.md
+1
-1
lib/gitlab/theme.rb
lib/gitlab/theme.rb
+14
-0
No files found.
app/assets/javascripts/application.js.coffee
View file @
5aeb8053
...
...
@@ -51,12 +51,6 @@ window.ajaxGet = (url) ->
window
.
showAndHide
=
(
selector
)
->
window
.
errorMessage
=
(
message
)
->
ehtml
=
$
(
"<p>"
)
ehtml
.
addClass
(
"error_message"
)
ehtml
.
html
(
message
)
ehtml
window
.
split
=
(
val
)
->
return
val
.
split
(
/,\s*/
)
...
...
app/controllers/projects_controller.rb
View file @
5aeb8053
...
...
@@ -44,6 +44,9 @@ class ProjectsController < ApplicationController
def
transfer
::
Projects
::
TransferService
.
new
(
project
,
current_user
,
project_params
).
execute
if
@project
.
errors
[
:namespace_id
].
present?
flash
[
:alert
]
=
@project
.
errors
[
:namespace_id
].
first
end
end
def
show
...
...
app/helpers/application_helper.rb
View file @
5aeb8053
...
...
@@ -114,6 +114,10 @@ module ApplicationHelper
Gitlab
::
Theme
.
css_class_by_id
(
current_user
.
try
(
:theme_id
))
end
def
theme_type
Gitlab
::
Theme
.
type_css_class_by_id
(
current_user
.
try
(
:theme_id
))
end
def
user_color_scheme_class
COLOR_SCHEMES
[
current_user
.
try
(
:color_scheme_id
)]
if
defined?
(
current_user
)
end
...
...
app/views/layouts/admin.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Admin area"
%body
{
class:
"#{app_theme} admin"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
admin"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Admin area"
%nav
.main-nav.navbar-collapse.collapse
...
...
app/views/layouts/application.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Dashboard"
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
%nav
.main-nav.navbar-collapse.collapse
...
...
app/views/layouts/errors.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Error"
%body
{
class:
"#{app_theme} application"
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
}
=
render
"layouts/head_panel"
,
title:
""
if
current_user
.container.navless-container
=
render
"layouts/flash"
...
...
app/views/layouts/explore.html.haml
View file @
5aeb8053
...
...
@@ -2,7 +2,7 @@
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
page_title
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
-
if
current_user
=
render
"layouts/head_panel"
,
title:
page_title
...
...
app/views/layouts/group.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"group:
#{
@group
.
name
}
"
%nav
.main-nav.navbar-collapse.collapse
...
...
app/views/layouts/navless.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@title
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
@title
.container.navless-container
...
...
app/views/layouts/profile.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Profile"
%body
{
class:
"#{app_theme} profile"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
profile"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Profile"
%nav
.main-nav.navbar-collapse.collapse
...
...
app/views/layouts/project_settings.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
%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"
...
...
app/views/layouts/projects.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
project_head_title
%body
{
class:
"#{app_theme} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
%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"
...
...
app/views/layouts/public_group.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
"group:
#{
@group
.
name
}
"
%nav
.main-nav.navbar-collapse.collapse
...
...
app/views/layouts/public_projects.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
project_title
(
@project
)
%nav
.main-nav.navbar-collapse.collapse
...
...
app/views/layouts/public_users.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@title
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
@title
.container.navless-container
...
...
app/views/layouts/search.html.haml
View file @
5aeb8053
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Search"
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
#{theme_type}
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Search"
.container.navless-container
...
...
app/views/profiles/update.js.erb
View file @
5aeb8053
// Remove body class for any previous theme, re-add current one
$('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color')
$('body').addClass('
<%=
app_theme
%>
')
$('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color
light_theme dark_theme
')
$('body').addClass('
<%=
app_theme
%>
<%=
theme_type
%>
')
// Re-render the header to reflect the new theme
$('header').html('
<%=
escape_javascript
(
render
(
"layouts/head_panel"
,
title:
"Profile"
))
%>
')
...
...
app/views/projects/transfer.js.haml
View file @
5aeb8053
-
if
@project
.
errors
[
:namespace_id
].
present?
:plain
$("#tab-transfer .errors-holder").replaceWith(errorMessage('
#{
escape_javascript
(
@project
.
errors
[
:namespace_id
].
first
)
}
'));
$("#tab-transfer .form-actions input").removeAttr('disabled').removeClass('disabled');
-
else
:plain
:plain
location.href = "
#{
edit_project_path
(
@project
)
}
";
doc/raketasks/README.md
View file @
5aeb8053
# Rake tasks
-
[
Backup restore
](
backup_restore.md
)
-
[
Cleanup
](
cleanup.md
)
-
[
Features
](
features.md
)
-
[
Maintenance
](
maintenance.md
)
and self-checks
-
[
User management
](
user_management.md
)
-
[
Web hooks
](
web_hooks.md
)
...
...
doc/update/7.5-to-7.6.md
View file @
5aeb8053
...
...
@@ -70,7 +70,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
There are new configuration options available for
[
`gitlab.yml`
](
config/gitlab.yml.example
)
. View them with the command below and apply them to your current
`gitlab.yml`
.
```
git diff origin/7-
6
-stable:config/gitlab.yml.example origin/7-6-stable:config/gitlab.yml.example
git diff origin/7-
5
-stable:config/gitlab.yml.example origin/7-6-stable:config/gitlab.yml.example
```
#### Change Nginx settings
...
...
lib/gitlab/theme.rb
View file @
5aeb8053
...
...
@@ -19,5 +19,19 @@ module Gitlab
return
themes
[
id
]
end
def
self
.
type_css_class_by_id
(
id
)
types
=
{
BASIC
=>
'light_theme'
,
MARS
=>
'dark_theme'
,
MODERN
=>
'dark_theme'
,
GRAY
=>
'dark_theme'
,
COLOR
=>
'dark_theme'
}
id
||=
Gitlab
.
config
.
gitlab
.
default_theme
types
[
id
]
end
end
end
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