gitlab-org--gitlab-foss/app/views
Fatih Acet 88fa5916ff Merge branch '22343-honor-user-fixed-layout-pref' into 'master'
Ensure the 'fixed layout' preference is honored whenever possible

## What does this MR do?

Currently, when viewing any Merge Request the user's fixed-layout preference is overridden if they have set "Side-by-Side" view as their preference when viewing diffs.  This makes sense if they are currently viewing a diff, but this is confusing when their layout preference is overridden while they are on another tab (i.e. "Discussion" or "Builds").

This MR moves all responsibility for overriding the fixed layout from the Ruby page layout helper into frontend JavaScript where it is only applied when needed.

## Are there points in the code the reviewer needs to double check?

Check that nothing broke for users which have their layout preference set to "Fluid" as well as those which have it set to "Fixed".  I've already done this but double checking is always good idea 😄.

## Screenshots (if relevant)

![side-by-side-toggle-fixed](/uploads/033dc73e70b73da5692b75606733c938/side-by-side-toggle-fixed.gif)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #22343 

## Other Notes

As @lbennett noted in #22343, this is something of a band-aid.  It fixed most of the issue, but we still need to have a discussion about whether or not is acceptable to override user layout preferences for "Side-by-Side" views in general.  At least this MR limits the scope of this behavior to a single tab within an MR or merge conflict page.

See merge request !6422
2016-10-04 11:58:15 +00:00
..
abuse_report_mailer
abuse_reports
admin Add Container Registry on/off status to admin area 2016-10-03 15:53:59 +01:00
award_emoji Start Frontend work, fix routing problem 2016-09-19 19:50:40 +03:00
ci/lints Refactor fields in view 2016-09-30 12:22:55 +02:00
dashboard Merge branch 'todo-issue-due-date' into 'master' 2016-10-04 09:45:04 +00:00
devise fix LDAP omniauth regression (Closes: #22357) 2016-09-21 14:10:21 +10:00
discussions Changed to hash rocket and string 'true' 2016-09-27 23:50:09 +01:00
doorkeeper Removes class 'btn-link' of Revoke button 2016-09-26 12:13:45 +01:00
email_rejection_mailer
emojis Upgrade Gemojione from 2.6.1 to 3.0.1. 2016-07-18 10:40:16 -06:00
errors Update permissons links to new page 2016-07-14 11:04:03 +01:00
events Remove redundant js-timeago-pending from user activity log 2016-08-31 11:20:48 -05:00
explore right-align dropdown menus to prevent horizontal page overflow 2016-09-29 13:28:09 -05:00
groups Merge branch '20310-new-project-btn' into 'master' 2016-09-21 11:37:51 +00:00
help Added keyboard shortcut to navigate to issue boards 2016-09-15 18:20:36 -04:00
import add missing space 2016-09-20 13:15:02 +02:00
invites
issues
kaminari/gitlab
koding Remove documentation rendering from /koding for now 2016-08-22 17:36:04 +03:00
layouts Merge branch '22343-honor-user-fixed-layout-pref' into 'master' 2016-10-04 11:58:15 +00:00
notify Improve performance of MR show page 2016-08-18 19:08:59 -05:00
profiles Merge branch '22343-honor-user-fixed-layout-pref' into 'master' 2016-10-04 11:58:15 +00:00
projects Merge branch '22343-honor-user-fixed-layout-pref' into 'master' 2016-10-04 11:58:15 +00:00
repository_check_mailer
search Merge branch 'search-commit-ui-fix' into 'master' 2016-09-16 23:43:26 +00:00
sent_notifications Improve the Unsubscribe confirmation page 2016-09-20 12:24:53 +02:00
shared Updated artwork of empty group state. 2016-10-03 11:49:48 +03:00
sherlock
snippets Merge branch 'full-width-new-snippet-button' into 'master' 2016-09-26 21:09:19 +00:00
u2f Pass the remember_me option into the u2f form and support it while authenticating 2016-09-01 17:11:42 -07:00
users Dispaly organization name at user page 2016-09-27 14:04:39 +03:00