diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-09-21 11:42:51 +0200 | 
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-09-21 11:45:54 +0200 | 
| commit | fac25eb7b03a5db44d53b204cbaab6582d91d526 (patch) | |
| tree | 7adc0c30f3216ee217ae41f98c7a33e32cc77b69 | |
| parent | cdbb20618669055c6bbed6c414e467e579681231 (diff) | |
| parent | 994d3ebe9bea5164a4383d408f9a0b6733ae2bc7 (diff) | |
| download | rails-fac25eb7b03a5db44d53b204cbaab6582d91d526.tar.gz rails-fac25eb7b03a5db44d53b204cbaab6582d91d526.tar.bz2 rails-fac25eb7b03a5db44d53b204cbaab6582d91d526.zip  | |
Merge pull request #16979 from square/standardize-call-style
Standardize on `Rails.application` [ci skip]
| -rw-r--r-- | guides/source/4_2_release_notes.md | 2 | ||||
| -rw-r--r-- | guides/source/active_job_basics.md | 2 | ||||
| -rw-r--r-- | railties/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | railties/lib/rails/application.rb | 2 | 
4 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md index 5aed0c9358..f3f6942135 100644 --- a/guides/source/4_2_release_notes.md +++ b/guides/source/4_2_release_notes.md @@ -322,7 +322,7 @@ Please refer to the [Changelog][railties] for detailed changes.        namespace: my_app_development      # config/production.rb -    MyApp::Application.configure do +    Rails.application.configure do        config.middleware.use ExceptionNotifier, config_for(:exception_notification)      end      ``` diff --git a/guides/source/active_job_basics.md b/guides/source/active_job_basics.md index 7b3081993d..f2831defe6 100644 --- a/guides/source/active_job_basics.md +++ b/guides/source/active_job_basics.md @@ -138,7 +138,7 @@ You can easily change your adapter:  ```ruby  # be sure to have the adapter gem in your Gemfile and follow the adapter specific  # installation and deployment instructions -YourApp::Application.config.active_job.queue_adapter = :sidekiq +Rails.application.config.active_job.queue_adapter = :sidekiq  ``` diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 0543b57ad4..2e7f134101 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -73,7 +73,7 @@            namespace: my_app_development          # config/production.rb -        MyApp::Application.configure do +        Rails.application.configure do            config.middleware.use ExceptionNotifier, config_for(:exception_notification)          end diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 67d5bac700..bc966e87c6 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -217,7 +217,7 @@ module Rails      #       namespace: my_app_development      #      #     # config/production.rb -    #     MyApp::Application.configure do +    #     Rails.application.configure do      #       config.middleware.use ExceptionNotifier, config_for(:exception_notification)      #     end      def config_for(name)  | 
