# Conflicts:
#	app/views/groups/_group_admin_settings.html.haml
#	spec/requests/api/runner_spec.rb

[ci skip]

Replace the `admin/emails.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ee!5513

Replace the `admin/push_rules.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ee!5512

Resolve "Create a new job to check that EE-specific lines are minimal"

Closes #5682

See merge request gitlab-org/gitlab-ee!5404

Replace the `project/source/markdown_render.feature` spinach test with an rspec analog

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

[Rails5] Fix spec/services/applications/create_service_spec.rb

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

[Rails5] Fix spec/models/notification_setting_spec.rb

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

[Rails5] Fix enum question mark methods

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

Display and revoke active sessions

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

[Rails5] Fix `undefined method 'downcase'` errors in requests specs

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

[Rails5] Fix `undefined method 'downcase'` errors in requests specs

See merge request gitlab-org/gitlab-ee!5510

[Rails5] Add `touch_later` to `Commit` model

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

[Rails5] Fix Arel::UpdateManager

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

[Rails5] Fix `TZInfo::InvalidTimezoneIdentifier` exception

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

[Rails5] Use `safe_params` instead of `params` in `url_for` helpers

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

[Rails5] Update `ApplicationController#log_exception` to fix `undefined method 'clean'` error

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

Fix file_store for artifacts and lfs when saving

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

Adds Omniauth Provider for Group SAML

See merge request gitlab-org/gitlab-ee!5509

[Rails5] Fix `params` for DeleteUserWorker

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

Enable LFS setting UI for Masters and Owners

Closes #33320

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

Port of jr-33320-lfs-settings-interface to EE

See merge request gitlab-org/gitlab-ee!5533

Migrate pipeline stages indices

Closes #43009

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

CE upstream - 2018-05-01 18:25 UTC

Closes #4922

See merge request gitlab-org/gitlab-ee!5535

# Conflicts:
#	app/helpers/auth_helper.rb
#	doc/api/discussions.md
#	lib/api/discussions.rb
#	spec/helpers/auth_helper_spec.rb
#	spec/requests/api/discussions_spec.rb

[ci skip]

Fix memory and performance issues in Karma test suite

Closes #45900 and #45806

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