diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-06 00:30:40 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-14 00:58:17 +0300 |
| commit | 5f20574db5c7b91d54e829010c1fda093ea8a25e (patch) | |
| tree | acb1ee012c35be0b9d1dfad785d05e70deec714b | |
| parent | 1044dfbfd29866b101cfbdc278788bd4f55a7276 (diff) | |
Fix a few remaining references to the old Theme names/IDs
| -rw-r--r-- | app/views/layouts/devise.html.haml | 2 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 13 | ||||
| -rw-r--r-- | db/fixtures/production/001_admin.rb | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index d406f5764a7..1987bf1592a 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -1,7 +1,7 @@ !!! 5 %html{ lang: "en"} = render "layouts/head" - %body.ui_mars.login-page.application + %body.ui_charcoal.login-page.application = render "layouts/header/empty" = render "layouts/broadcast" .container.navless-container diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 96b6ed01f42..c32ac2042d0 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -62,12 +62,13 @@ production: &base # default_can_create_group: false # default: true # username_changing_enabled: false # default: true - User can change her username/namespace - ## Default theme - ## BASIC = 1 - ## MARS = 2 - ## MODERN = 3 - ## GRAY = 4 - ## COLOR = 5 + ## Default theme ID + ## 1 - Graphite + ## 2 - Charcoal + ## 3 - Green + ## 4 - Gray + ## 5 - Violet + ## 6 - Blue # default_theme: 2 # default: 2 ## Automatic issue closing diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index 8b560ee09e0..1c8740f6ba9 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -12,7 +12,7 @@ admin = User.create( username: 'root', password: password, password_expires_at: expire_time, - theme_id: Gitlab::Theme::MARS + theme_id: Gitlab::Themes::APPLICATION_DEFAULT ) |