Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • A administrate
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 96
    • Issues 96
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 32
    • Merge requests 32
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • thoughtbot, inc.
  • administrate
  • Merge requests
  • !636

Upgrade Administrate to work with Rails 5

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge rails-5 into master Aug 01, 2016
  • Overview 7
  • Commits 14
  • Pipelines 0
  • Changes 16

Created by: teoljungberg

This PR upgrades Administrate to work with Rails 5. The changes are backwards compatible to Rails 4.2 which we support.

Changes:

  • Set active_record.time_zone_aware_types for Rails 5.

  • Replace column_types It was removed in the following commit to rails/rails

  • "Sanitize" order parameters to quell warnings.

  • Add HTTP method shims This provides backwards compatibility from Rails 5 to 4.

    Inspiration:

    • https://github.com/thoughtbot/clearance/pull/639
    • https://github.com/thoughtbot/high_voltage/pull/229/files
  • Configure serving public assets to work with Rails 4 and 5.

  • Only set raise_in_transactional_callbacks if < Rails 5. The option is deprecated in Rails 5.

  • Upgrade ActionController configuration for Rails 5

  • Remove unused spec helper

  • Only remove the XML parser if < Rails 5

  • Add appraisals for rails 4.2 and 5.0. Add binstub for appraisal.

  • Lax Rails version requirement. Lock in 4.2 < Rails::VERSION < 5.1.

  • Use fork of administrate-field-image. Which relaxes the version requirement for Rails.

  • Upgrade rspec-rails

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: rails-5