delta/gitlab/gitlab-ce.git/spec/controllers, branch fix-foo-test gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' into 'master' 2018-06-18T09:19:40+00:00 Rémy Coutable remy@rymai.me 2018-06-18T09:19:40+00:00 781e0da9443ae0aa9937942a9adf67ef647ba7be Resolve "[Rails5] expected: "/search?search=seed_project" got: nil" Closes #48013 See merge request gitlab-org/gitlab-ce!19936 
Resolve "[Rails5] expected: "/search?search=seed_project" got: nil"

Closes #48013

See merge request gitlab-org/gitlab-ce!19936
 Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into 'master' 2018-06-18T09:18:32+00:00 Rémy Coutable remy@rymai.me 2018-06-18T09:18:32+00:00 52f53c2e0b814cccd97c4c25e07ba6de7cd7fbc3 [Rails5] Fix pipeline_schedules_controller_spec Closes #48011 See merge request gitlab-org/gitlab-ce!19919 
[Rails5] Fix pipeline_schedules_controller_spec

Closes #48011

See merge request gitlab-org/gitlab-ce!19919
 Merge branch 'rails5-fix-47960' into 'master' 2018-06-18T08:58:23+00:00 Rémy Coutable remy@rymai.me 2018-06-18T08:58:23+00:00 99fdbe4c230205510e1d7061e68bb1a003913d4b Rails5 fix update_attribute usage not causing a save Closes #47960 See merge request gitlab-org/gitlab-ce!19881 
Rails5 fix update_attribute usage not causing a save

Closes #47960

See merge request gitlab-org/gitlab-ce!19881
 Merge branch '47933-MR-invisible-milestone' into 'master' 2018-06-18T08:29:41+00:00 Douwe Maan douwe@gitlab.com 2018-06-18T08:29:41+00:00 4be23eeae376ede50905b741f88b089b1669b07f Resolve "Milestone not updating in MR sidebar after selection" Closes #47933 See merge request gitlab-org/gitlab-ce!19870 
Resolve "Milestone not updating in MR sidebar after selection"

Closes #47933

See merge request gitlab-org/gitlab-ce!19870
 [Rails5] Fix sessions_controller_spec 2018-06-16T08:12:46+00:00 blackst0ne blackst0ne.ru@gmail.com 2018-06-16T08:12:46+00:00 79c3ec014c7db667457268a75f9c47bee8653650 Refactor sessions_controller_spec to work both in rails4 and rails5. Remove the stubbed `request.referer` method, set real header instead. 
Refactor sessions_controller_spec to work both in rails4 and rails5.
Remove the stubbed `request.referer` method, set real header instead.
[Rails5] Fix pipeline_schedules_controller_spec 2018-06-16T04:26:15+00:00 blackst0ne blackst0ne.ru@gmail.com 2018-06-16T04:26:15+00:00 2b1153f71a680b0c5a4fb787897c20068a405fbf In Rails 5.0 there's a bug [1] in controller tests that doesn't parse nested parameters correctly. This commit brings a workaround to make specs work again both in rails4 and rails5. [1]: https://github.com/rails/rails/issues/23997 
In Rails 5.0 there's a bug [1] in controller tests that doesn't parse
nested parameters correctly.

This commit brings a workaround to make specs work again both in rails4
and rails5.

[1]: https://github.com/rails/rails/issues/23997
Fix milestones disappearing when changed on MR 2018-06-15T23:46:49+00:00 Mario de la Ossa mariodelaossa@gmail.com 2018-06-14T19:39:17+00:00 c6420ce2ab18681d6a5b06621d89775e3cf81065 






Merge branch 'dm-remove-favicon-main-version' into 'master'
2018-06-15T16:43:48+00:00

Robert Speicher
robert@gitlab.com

2018-06-15T16:43:48+00:00

26810dd77111c396891d20f9a4c688bc05c84044

Remove FaviconUploader favicon_main version

See merge request gitlab-org/gitlab-ce!19891




Remove FaviconUploader favicon_main version

See merge request gitlab-org/gitlab-ce!19891






Merge branch 'ce-jej/sanitize-group-saml-relay-state' into 'master'
2018-06-15T11:02:27+00:00

Kamil Trzciński
ayufan@ayufan.eu

2018-06-15T11:02:27+00:00

59a2123db285ba738375f6c713a91df27085367a

[CE backport] Backport InternalRedirect#sanitize_redirect

See merge request gitlab-org/gitlab-ce!19795




[CE backport] Backport InternalRedirect#sanitize_redirect

See merge request gitlab-org/gitlab-ce!19795






Remove FaviconUploader favicon_main version
2018-06-15T10:28:23+00:00

Douwe Maan
douwe@selenight.nl

2018-06-15T10:28:23+00:00

5fc3b8a08d9264eedbf886c45b4ef7b418df380d

See https://gitlab.com/gitlab-org/gitlab-ce/issues/47677 for more information





See https://gitlab.com/gitlab-org/gitlab-ce/issues/47677 for more information