From a3fbe3fedeb700f43bfa0de7e9113b3cff943c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <ruben@gitlab.com>
Date: Wed, 16 Aug 2017 18:29:04 -0500
Subject: WIP: Revert "Merge branch '26200-convert-sidebar-to-dropdown' into
 'master'"

This reverts commit aa792b91bbddeeb61ce77f9525fcaf238a9ad331, reversing
changes made to 5d8f5328baca93b9134f10ae593e71834578a9f8.

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/right_sidebar.js
	app/assets/stylesheets/framework.scss
	app/assets/stylesheets/framework/header.scss
	app/assets/stylesheets/framework/sidebar.scss
	app/assets/stylesheets/framework/variables.scss
	app/assets/stylesheets/pages/issuable.scss
	app/assets/stylesheets/print.scss
	app/controllers/profiles/preferences_controller.rb
	app/helpers/nav_helper.rb
	app/models/user.rb
	app/views/layouts/_page.html.haml
	app/views/layouts/application.html.haml
	app/views/layouts/header/_default.html.haml
	app/views/layouts/nav/_dashboard.html.haml
	app/views/profiles/preferences/show.html.haml
	db/schema.rb
	doc/api/users.md
	spec/features/dashboard/active_tab_spec.rb
	spec/features/dashboard/issuables_counter_spec.rb
	spec/features/dashboard/shortcuts_spec.rb
	spec/features/profiles/preferences_spec.rb
	spec/fixtures/api/schemas/user/public.json
	spec/models/user_spec.rb

Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch revert-merge-request-9199
You are currently reverting commit aa792b91bb.
---
 spec/models/user_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'spec/models/user_spec.rb')

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 97bb91a6ac8..34902cfb69d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -716,6 +716,7 @@ describe User do
       it "applies defaults to user" do
         expect(user.projects_limit).to eq(Gitlab.config.gitlab.default_projects_limit)
         expect(user.can_create_group).to eq(Gitlab.config.gitlab.default_can_create_group)
+        expect(user.theme_id).to eq(Gitlab.config.gitlab.default_theme)
         expect(user.external).to be_falsey
       end
     end
@@ -726,6 +727,7 @@ describe User do
       it "applies defaults to user" do
         expect(user.projects_limit).to eq(123)
         expect(user.can_create_group).to be_falsey
+        expect(user.theme_id).to eq(1)
       end
     end
 
-- 
cgit v1.2.1