diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-08-16 18:29:04 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2017-08-16 18:29:04 -0500 |
| commit | a3fbe3fedeb700f43bfa0de7e9113b3cff943c4e (patch) | |
| tree | 4075549fa4b898c1187e8adecd112cea50ee880b /lib/api | |
| parent | 72d5165bd57472692c77d6a9d159e65058513bf3 (diff) | |
| download | gitlab-ce-revert-merge-request-9199.tar.gz | |
WIP: Revert "Merge branch '26200-convert-sidebar-to-dropdown' into 'master'"revert-merge-request-9199
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.
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index e8dd61e493f..7d87197a270 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -35,7 +35,7 @@ module API expose :confirmed_at expose :last_activity_on expose :email - expose :color_scheme_id, :projects_limit, :current_sign_in_at + expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at expose :identities, using: Entities::Identity expose :can_create_group?, as: :can_create_group expose :can_create_project?, as: :can_create_project |