Andrew White
17a886b275
Add failing test case for #9654
2013-04-10 08:11:43 +01:00
Steve Klabnik
fa3ef8e82a
Merge pull request #10158 from steveklabnik/issue_10125
...
Fix inflector to respect default locale.
2013-04-09 21:43:00 -07:00
Jeremy Kemper
e0af93dd3a
Merge pull request #10156 from wangjohn/grouping_thread_locals
...
Grouping thread locals in ActiveRecord
2013-04-09 21:27:48 -07:00
Nick Cox
8cf88cc75a
Fix inflector to respect default locale.
...
The inflector was made aware of locales in 7db0b073fec6bc3e6f213b58c76e7f43fcc2ab97,
but it defaulted to :en. That should actually be our default
locale instead.
Fixes #10125
2013-04-10 04:22:34 +00:00
wangjohn
e12901e423
Changed the ScopeRegistry and the InstrumentationRegistry to use the
...
PerThreadRegistry module.
2013-04-09 22:27:32 -04:00
wangjohn
95ac3913ee
Created a runtime registry for thread local variables in active record.
2013-04-09 22:27:32 -04:00
wangjohn
e94f024e14
Creating a module so that per thread registries can be easily created as
...
thread local variables.
2013-04-09 22:27:21 -04:00
Jeremy Kemper
9039c50388
Explain how to upgrade bin/ for Rails 4
2013-04-09 16:49:24 -07:00
Carlos Antonio da Silva
74be6bba9e
Merge pull request #10154 from killthekitten/fix_template_error_header
...
Use camelize instead of capitalize on template error screen
2013-04-09 16:11:30 -07:00
Steve Klabnik
f4e4ba828d
Merge pull request #10103 from senny/get_action_mailer_guide_ready_for_prime_time
...
Get Action Mailer guide ready for prime time [ci skip]
2013-04-09 15:41:51 -07:00
Nikolay Shebanov
908ee27b8e
Use camelize instead of capitalize on error screen
2013-04-10 02:26:02 +04:00
Xavier Noria
e79d2c8aa6
copy-edit pass in AM changelog [ci skip]
2013-04-09 22:41:03 +02:00
Yves Senn
d4ae49b058
get the Action Mailer guide ready. [ci skip]
2013-04-09 20:06:46 +02:00
Rafael Mendonça França
ee889510f8
Merge pull request #9843 from indirect/rails_bin
...
Rails 4 prints help for "rails new" when running "rails console"
2013-04-09 09:24:48 -07:00
Rafael Mendonça França
5654b0a27e
Fix typo
2013-04-09 13:00:45 -03:00
Rafael Mendonça França
d6d69f863f
Merge pull request #10153 from choudhuryanupam/master
...
Removed unused setup
2013-04-09 08:49:52 -07:00
Anupam Choudhury
e000aa92dd
Removed unused setup
2013-04-09 20:57:55 +05:30
Rafael Mendonça França
a74d84bb29
Merge pull request #10142 from wangjohn/grouping_thread_locals
...
Delegating the value getter and setters in the ScopeRegistry
2013-04-09 07:19:29 -07:00
Rafael Mendonça França
821d7bd847
Merge pull request #10151 from neerajdotname/ar-to-klass
...
changed variable name active_record => base_klass
2013-04-09 06:50:14 -07:00
Neeraj Singh
d87966c1c4
changed variable name active_record => base_klass
...
Current code stores the klass name in active_record and this
is used throughout. While reviewing the code time and again
I had the mental picture of active_record being an instance of
a klass. However here the actual klass is being stored in
@active_record.
Secondly at two different places while referring to @active_record
the comment refers to it as base klass. All this points to
active_record being not the best variable name.
So I thought it is better to replace active_record with base_klass.
This change is confined to JoinDependency, JoinBase, JoinPart and
JoinAssociation - all joining related work.
2013-04-09 08:53:10 -04:00
Rafael Mendonça França
9c7bf25e0c
Merge pull request #10138 from hbakhtiyor/test-dirs-environment
...
Add TEST_DIRS enviroment for constrain test directories in rakefile
2013-04-09 05:46:50 -07:00
Carlos Antonio da Silva
d20c3204bf
Merge pull request #10148 from vipulnsward/traces_change
...
change array of array to hash
2013-04-09 05:24:53 -07:00
Vipul A M
a7e77c553d
change array of array to hash
2013-04-09 11:17:08 +05:30
Carlos Antonio da Silva
817e8fad5a
Merge pull request #10147 from vipulnsward/fix_AP_live_warning
...
fix AP warning; remove unused variable
2013-04-08 22:28:52 -07:00
Vipul A M
f6fd38f1ea
fix AP warning; remove unused variable
2013-04-09 10:43:24 +05:30
Rafael Mendonça França
fb6c661fe9
Merge pull request #10145 from wangjohn/instrumentation_registry_creation
...
Consolidating thread locals in AS::Notifications
2013-04-08 14:41:45 -07:00
wangjohn
b62c197a22
Creating an object to consolidate thread locals which hold the
...
instrumenters for the AS::Notifications module.
2013-04-08 17:39:44 -04:00
Rafael Mendonça França
5afaf4e2ba
Merge pull request #10143 from Agis-/mark_unused_vars
...
Mark unused variables and make some style fixes
2013-04-08 13:46:30 -07:00
Agis Anastasopoulos
a779ea9d57
Mark unused variables and make some style fixes
...
It'd be a nice convention to mark the unused variables like this, now that Ruby 2 will issue no warnings for such vars being unused.
2013-04-08 22:52:32 +03:00
wangjohn
a332712503
Delegating the value getter and setters in the ScopeRegistry to the
...
current ScopeRegister object.
2013-04-08 15:18:14 -04:00
Rafael Mendonça França
e2e9eed3dc
Merge pull request #10135 from wangjohn/grouping_thread_locals
...
Grouping thread locals in the ActiveRecord scopes
2013-04-08 10:23:39 -07:00
wangjohn
5b945f2685
Grouping thread locals in the ActiveRecord scopes so that the
...
current_scope and ignore_default_scope locals are brought together under
a registry object.
2013-04-08 13:21:13 -04:00
Rafael Mendonça França
63f7356b3a
Merge pull request #9604 from sgrif/live_streaming_exceptions
...
Exceptions raised when using ActionController::Live cause server crash
2013-04-08 09:53:20 -07:00
Rafael Mendonça França
436d91869b
Merge pull request #10122 from wangjohn/adding_documentation_to_form_builder
...
Added documentation to the FormBuilder class
Closes #10115
2013-04-08 07:49:04 -07:00
Carlos Antonio da Silva
0d8a76d8d4
Merge pull request #10130 from Agis-/patch-2
...
Mark unused block parameters.
2013-04-08 05:24:56 -07:00
Carlos Antonio da Silva
d69510000b
Merge pull request #10131 from Agis-/metal_helper
...
Remove unecessary variable call since `sort!` always returns the sorted array
2013-04-08 05:23:35 -07:00
Abd ar-Rahman Hamidi
b28e5c3695
Add TEST_DIRS enviroment for constrain test directories in rakefile
2013-04-08 15:16:33 +05:00
Agis Anastasopoulos
1e784cb386
Remove unused block parameters
2013-04-07 22:35:25 +03:00
Agis Anastasopoulos
6d10688bbe
Remove unecessary variable call, #sort!
always returns an array
2013-04-07 21:55:35 +03:00
Carlos Antonio da Silva
a92814b001
Minor AR changelog improvements [ci skip]
2013-04-07 13:56:58 -03:00
Carlos Antonio da Silva
492e6b57d4
Avoid iterating over records hash when not necessary
...
If the reflection scope is not flagged with distinct value, there is no
need to iterate over the records, so we avoid that by doing the check
before iterating rather than inside the iteration block.
2013-04-07 12:14:53 -03:00
Carlos Antonio da Silva
1eee48144b
Merge pull request #10127 from vipulnsward/each_to_each_value
...
each to each_value; remove unused vars
2013-04-07 08:04:47 -07:00
Vipul A M
4f5e8af993
each to each_value; remove unused vars
2013-04-07 19:59:07 +05:30
Carlos Antonio da Silva
136e3a46e1
Merge pull request #10123 from wangjohn/added_bang_to_raise_nested_attributes_method
...
Added a bang to the raise_nested_attributes_record_not_found method
2013-04-06 18:55:00 -07:00
wangjohn
3552760157
Added a bang to the end of +raise_nested_attributes_record_not_found+
...
method to signify an exception possibly being raised.
2013-04-06 21:36:58 -04:00
wangjohn
fb24f41905
Added documentation to the FormBuilder class, should help
...
clarify issue #10115 . Also made the field_helpers an explicit list of
methods.
2013-04-06 20:56:03 -04:00
Andrew White
4d8e23463f
Merge pull request #10101 from wangjohn/refactoring_routing_mapper
...
Refactoring some reused code into a method (inside of the routes mapper)
2013-04-06 11:38:33 -07:00
Rafael Mendonça França
16b4c3f1fa
Forgot to lock the uglifier version in our Gemfile
...
Related with 575838795019f7402992e3bfa83a0c5048cf143d
2013-04-06 15:31:30 -03:00
Rafael Mendonça França
be612eb919
Merge pull request #10121 from Agis-/patch-2
...
Fix markdown formatting
2013-04-06 11:15:00 -07:00
Rafael Mendonça França
d4269db86a
Merge pull request #10120 from vipulnsward/change_merge_on_new_hash
...
change some more merge to merge! on new hashes
2013-04-06 11:14:03 -07:00