diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-06-21 18:37:55 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-06-21 18:37:55 +0000 |
| commit | f6797a7683e5367046217fa85900f0288a504f84 (patch) | |
| tree | f39abeafe541fe324a4264fefdd6b0fae7f9b976 /activejob/lib | |
| parent | 29959eb59da3cedee71d29fe84e82cfa71ad4cf3 (diff) | |
| parent | 29a64f2384f53760e9133d11a0c60e0d32ed9187 (diff) | |
| download | rails-f6797a7683e5367046217fa85900f0288a504f84.tar.gz rails-f6797a7683e5367046217fa85900f0288a504f84.tar.bz2 rails-f6797a7683e5367046217fa85900f0288a504f84.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/configuring.md
Diffstat (limited to 'activejob/lib')
| -rw-r--r-- | activejob/lib/active_job/queue_name.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activejob/lib/active_job/queue_name.rb b/activejob/lib/active_job/queue_name.rb index 9ae0345120..65786a49ff 100644 --- a/activejob/lib/active_job/queue_name.rb +++ b/activejob/lib/active_job/queue_name.rb @@ -39,7 +39,7 @@ module ActiveJob self.queue_name_delimiter = '_' # set default delimiter to '_' end - # Returns the name of the queue the job will be run on + # Returns the name of the queue the job will be run on. def queue_name if @queue_name.is_a?(Proc) @queue_name = self.class.queue_name_from_part(instance_exec(&@queue_name)) |