Rémy Coutable 5a8873f362 Merge branch 'rs-diff_view' into 'master' ...

Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732

2016-04-22 07:49:46 +00:00

..

application_controller.rb

Clarify that the diff view setting always comes from the cookie

2016-04-19 17:47:58 -04:00

artifacts_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

avatars_controller.rb

Tweaks, refactoring, and specs

2016-03-20 21:04:07 +01:00

badges_controller.rb

Use default branch when displaying list of badges

2016-04-06 19:56:35 +02:00

blame_controller.rb

Move blame group logic to dedicated class

2016-01-28 14:49:21 +01:00

blob_controller.rb

Add a Blob model that wraps Gitlab::Git::Blob

2016-02-18 22:45:30 -05:00

branches_controller.rb

Return status code 303 after a branch DELETE operation to avoid project deletion

2016-04-06 21:11:10 -07:00

builds_controller.rb

Use Rails-way to send file by X-Sendfile

2016-04-19 23:18:43 +02:00

commit_controller.rb

Merge branch 'ci-commit-as-pipeline' into 'master'

2016-04-21 08:10:37 +00:00

commits_controller.rb

Replaces "Create merge request" link with one to the MR when one exists

2016-02-10 10:32:25 -02:00

compare_controller.rb

Use Gitlab::Git::DiffCollections

2016-03-03 18:38:44 +01:00

deploy_keys_controller.rb

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

find_file_controller.rb

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2016-01-07 12:56:18 +01:00

forks_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

graphs_controller.rb

Migrate CI::Project to Project

2015-12-11 18:02:09 +01:00

group_links_controller.rb

Use guard clause to check ability to share project

2016-04-19 12:15:56 +02:00

hooks_controller.rb

Migrate CI::Services and CI::WebHooks to Services and WebHooks

2015-12-10 16:04:08 +01:00

imports_controller.rb

ContinueToParams -> ContinueParams

2016-03-13 13:13:19 +01:00

issues_controller.rb

Merge branch 'label-text-color-sidebar' into 'master'

2016-04-21 23:13:38 +00:00

labels_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

merge_requests_controller.rb

Merge branch 'label-text-color-sidebar' into 'master'

2016-04-21 23:13:38 +00:00

milestones_controller.rb

Standardised the output of the JSON to always include the name

2016-03-29 11:59:13 +01:00

network_controller.rb

Fix network graph when branch name has single quotes

2015-07-29 23:29:47 -07:00

notes_controller.rb

Fix code review issues

2016-04-12 14:24:05 +02:00

notification_settings_controller.rb

Simplify Projects::NotificationSettingsController

2016-04-12 12:10:58 -03:00

project_members_controller.rb

Remove unused authorization from controller

2016-04-20 10:57:31 -03:00

protected_branches_controller.rb

Fixed Rubocop offenses

2015-12-15 00:53:52 -02:00

raw_controller.rb

Refactor caching code

2016-03-07 14:27:53 +01:00

refs_controller.rb

Make it possible to switch ref in badges view

2016-04-06 19:56:34 +02:00

releases_controller.rb

Refactor release code a bit

2015-11-09 15:30:50 +01:00

repositories_controller.rb

Move RepositoryArchiveCacheWorker to sidekiq-cron

2016-04-12 11:12:05 -04:00

runner_projects_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

runners_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

services_controller.rb

add slack notifications for wiki pages

2016-04-20 08:25:40 +08:00

snippets_controller.rb

Ensure project snippets have their own access level

2016-03-25 18:51:17 +01:00

tags_controller.rb

Use the configured Kaminari "per page" default

2016-03-19 17:37:54 -04:00

tree_controller.rb

Fix specs and behavior for LFS files

2015-12-18 16:14:12 +01:00

triggers_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

uploads_controller.rb

Address feedback

2016-03-22 00:09:20 +01:00

variables_controller.rb

Make the CI permission model simpler

2016-02-02 09:18:08 +01:00

wikis_controller.rb

improve check if wiki page is persisted

2016-04-20 08:25:41 +08:00