Skip to content

Commit

Permalink
Remove deprecated methods, update change log
Browse files Browse the repository at this point in the history
  • Loading branch information
Hammadk committed May 5, 2017
1 parent 5561677 commit 27178c2
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 30 deletions.
7 changes: 0 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,3 @@ rvm:
gemfile:
- Gemfile
- Gemfile.rails50

matrix:
include:
- rvm: 2.2.2
gemfile: Gemfile.ruby22
- rvm: 2.2.2
gemfile: Gemfile.ruby22.rails50
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
7.2.7
-----
* Require `shopify_app` `>= 4.3.2`. This version relaxes the ruby version requirement from `>= 2.3.0` to `>= 2.0`
* Rails 5: ActionDispatch::Reloader#to_prepare is deprecated
[[#404]](https://github.com/Shopify/shopify_app/pull/404)

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.rails50
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
gemspec

gem 'rails', '~> 5.0'
gem 'rails', '5.0.2'
gem 'activeresource', github: 'rails/activeresource'
6 changes: 0 additions & 6 deletions Gemfile.ruby22

This file was deleted.

9 changes: 0 additions & 9 deletions Gemfile.ruby22.rails50

This file was deleted.

1 change: 0 additions & 1 deletion example/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ module Example
class Application < Rails::Application
config.action_dispatch.default_headers['P3P'] = 'CP="Not used"'
config.action_dispatch.default_headers.delete('X-Frame-Options')
config.active_record.raise_in_transactional_callbacks = true
end
end
3 changes: 0 additions & 3 deletions test/app_templates/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ class Application < Rails::Application
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de

# Do not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true
end
end
3 changes: 0 additions & 3 deletions test/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ class Application < Rails::Application
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de

# Do not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true
end
end

0 comments on commit 27178c2

Please sign in to comment.