summaryrefslogtreecommitdiff
path: root/doc/api/system_hooks.md
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-08-16 18:29:04 -0500
committerRubén Dávila <ruben@gitlab.com>2017-08-16 18:29:04 -0500
commita3fbe3fedeb700f43bfa0de7e9113b3cff943c4e (patch)
tree4075549fa4b898c1187e8adecd112cea50ee880b /doc/api/system_hooks.md
parent72d5165bd57472692c77d6a9d159e65058513bf3 (diff)
downloadgitlab-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 'doc/api/system_hooks.md')
0 files changed, 0 insertions, 0 deletions