Code

Rails 5#656

Code

Closed

v-kumar wants to merge 25 commits intothoughtbot:rails-5thoughtbot/administrate:rails-5from v-kumar:rails-5v-kumar/administrate:rails-5Copy head branch name to clipboard

+30-18

Commits

Commits on Jul 8, 2016

• Upgrade rspec-rails

  teoljungberg

  committed
  10a664a

Commits on Aug 1, 2016

• Use fork of administrate-field-image

  Show description for 8555ecf
  teoljungberg

  committed
  8555ecf

• Lax Rails version requirement

  Show description for d5afa35
  teoljungberg

  committed
  d5afa35

• Add appraisals for rails 4.2 and 5.0

  Show description for 6667398
  teoljungberg

  committed
  6667398

• Only remove the XML parser if < Rails 5

  teoljungberg

  committed
  b4522fb

• Remove unused helper

  teoljungberg

  committed
  2aa9677

• Upgrade ActionController configuration for Rails 5

  teoljungberg

  committed
  9f2e80a

• Only set raise_in_transactional_callbacks if < Rails 5

  Show description for b204616
  teoljungberg

  committed
  b204616

• Configure serving public assets to work with Rails 4 and 5

  teoljungberg

  committed
  38076b9

• Add HTTP method shims

  Show description for 83bcab0
  teoljungberg

  committed
  83bcab0

• "Sanitize" order parameters to quell warnings

  teoljungberg

  committed
  e44bba4

• Replace column_types

  Show description for a45d2de
  teoljungberg

  committed
  a45d2de

• Set active_record.time_zone_aware_types for Rails 5

  teoljungberg

  committed
  5ac9ddb

• fixup! Use fork of administrate-field-image

  teoljungberg

  committed
  c4922bf

Commits on Sep 11, 2016

• Merge remote-tracking branch 'origin/master' into rails-5

  v-kumar

  committed
  d2ef3d1

• per: thoughtbot@5227c9b

  v-kumar

  committed
  5f52179

• Update rubocop definitions to the latest

  v-kumar

  committed
  c12a6ee

• fix assert_template dependency for rails-controller-testing

  v-kumar

  committed
  cd591ca

Commits on Sep 12, 2016

• add rails-controller-testing gemfile to appraisal

  v-kumar

  committed
  a8500eb

Commits on Oct 4, 2016

• Update changelog to reflect recent merges

  danbee

  committed
  84096ca

Commits on Oct 15, 2016

• Remove bundler version from lock file

  danbee

  committed
  e533a60

Commits on Oct 17, 2016

• Merge remote-tracking branch 'upstream/master' into rails-5

  v-kumar

  committed
  ae9de7d

• Use sanitized_order_params instead of params to avoid "Attempting to generate a URL from non-sanitized request parameters" error

  v-kumar

  committed
  a6e3630

Commits on Oct 19, 2016

• Fix the specs with the Rails 5 branch and the clear search button (thoughtbot#671)

  Show description for 73d4d55
  danbee

  authored
  73d4d55

Commits on Oct 23, 2016

• Merge remote-tracking branch 'upstream/master' into rails-5

  v-kumar

  committed
  58e6347