Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: aratak/rails
...
head fork: aratak/rails
This comparison is big! We’re only showing the most recent 250 commits
Commits on Apr 17, 2012
@josevalim josevalim Merge pull request #5871 from rafaelfranca/patch-1
Remove unused test code.
7169882
@tenderlove tenderlove Revert "Merge pull request #5864 from vatrai/remove_ordered_hash_auto…
…load"

This reverts commit 86c640a, reversing
changes made to a0c2cfd.
1d26fcb
@oscardelben oscardelben Warn about do end syntax in redirect option 5bdf50d
@Thibaut Thibaut Fix confusing example in ActiveModel::Errors 0c948a5
@vijaydev vijaydev let's keep the slash in the return value instead of the path variable…
… [ci skip]
b7e3c8e
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 5b336ff
@vijaydev vijaydev let's not use `and` in place of `&&` 3b0ffb1
@asanghi asanghi review changes for #5875 6f80ea2
@vijaydev vijaydev the index option is always created if the type is one of references o…
…r belongs_to. Refactoring it to a simpler form and fixing the build
938464d
@spastorino spastorino Merge pull request #5882 from vijaydev/fix_generated_attribute_build
Fixing the build
e3a3a14
@asanghi asanghi another attempt at the language 67ede88
@drogus drogus Merge pull request #5869 from LachyGroom/patch-1
Changes b tag to strong
e9f778a
Commits on Apr 18, 2012
@mcrowe mcrowe Add documentation to the SpawnMethods#merge method. 43946ee
@oscardelben oscardelben Fix formatting 3333fe2
@oscardelben oscardelben Improve observers documentation 7536731
@juanazam juanazam Add missing dependency for active_record_deprecated_finders c90b43f
@jmbejar jmbejar Define array methods in ActiveRecord::Associations::CollectionProxy
if they are not defined or delegated.
In this way, we have a performance boost invoking some array methods
which are not defined in CollectionAssociation.
7dc03cf
@spastorino spastorino Merge pull request #5889 from juanazam/juan-master
Add missing dependency for active_record_deprecated_finders
595e14e
@kennyj kennyj Remove unused code. We should use 'active_support/time'. 8f1a0af
@jeremy jeremy Merge pull request #5891 from kennyj/remove_time_directory
Remove dead code: active_support/time/autoload.rb was moved to active_support/time.rb
96cfadc
@spastorino spastorino Add hook for add_resource_route 17b8fd5
@spastorino spastorino Remove unused generator options. This was added for the removed rails…
… new --http
66ea296
Commits on Apr 19, 2012
@evtuhovich evtuhovich Add to guides info how to disable prepared statements c666323
@oscardelben oscardelben Update guide for rails 3.2.3, fix code download link. 6ece2ee
@oscardelben oscardelben Regenerate Gemfile for getting started guide e44b845
@oscardelben oscardelben Add "Using the change method" title back to make it stand out b4d13ed
@oscardelben oscardelben Put warning on getting started guide back 57a995b
@oscardelben oscardelben Add Ruby 1.9.3 recommendation 6f76bf1
@oscardelben oscardelben Fix broken images links e2575b6
@oscardelben oscardelben Add model creation step to getting started guide a4508ed
@amatsuda amatsuda be sure to currectly fetch PK name from MySQL even if the PK has some…
… custom option
851b816
@jeremy jeremy Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_option
current MySQL driver fails to fetch PK name when the PK has USING option
99eae3f
Kevin Musiorski removed extra "you" 6054e36
Commits on Apr 20, 2012
@oscardelben oscardelben Add "Saving data in the controller" section 0d5a7ad
@Thibaut Thibaut Fix example in ActionView::Helpers::FormHelper 09a22db
@oscardelben oscardelben Adapt "Getting started guide" code sample f6d5036
@oscardelben oscardelben New Getting started guide wont have tags dbb4c4d
@oscardelben oscardelben Add show action in getting started guide 2e2afc0
@oscardelben oscardelben Add index and links section to Getting started guide e7e72aa
@oscardelben oscardelben Merge branch 'master' of github.com:lifo/docrails d717468
@roryokane roryokane in feedback solicitation text, correct that docrails is fork, not branch 7b7cc13
@jeremy jeremy Freeze the middleware stack after it's built
So apps that accidentally add middlewares later aren't unwittingly dumping them in a black hole.

Closes #5911
42f6e9f
@tenderlove tenderlove Merge pull request #5865 from tiegz/minor_fixes
Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
ed81083
Commits on Apr 21, 2012
@avakhov avakhov Comma missed 63b4a00
@oscardelben oscardelben Remove circular require of time/zones f98d929
@oscardelben oscardelben Add model validation section to Getting Started guide 504ba12
@oscardelben oscardelben Add validation code to getting started guide and improve validation
section
3da2b53
@oscardelben oscardelben Merge branch 'master' of github.com:lifo/docrails c06c842
@vijaydev vijaydev Revert "in feedback solicitation text, correct that docrails is fork,…
… not branch"

This reverts commit 7b7cc13.

Reason: docrails isn't a rails fork. See 5444ed5

[ci skip]
c670b57
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails a719843
@bernardkroes bernardkroes Fixed expected value in comment. Removed duplicate lines in example. be4a44f
@drogus drogus Merge pull request #5917 from oscardelben/master
Remove circular require warning
9026980
Commits on Apr 22, 2012
@avakhov avakhov Add distance_of_time_in_words example for seconds 594997f
@geetarista geetarista Adds favicon to guides layout 9e60cc2
@vijaydev vijaydev Merge pull request #92 from geetarista/add-favicon
Adds favicon to guides layout
023cfd3
@siong1987 siong1987 `rake notes` and `rake notes:custom` now support
css, scss and css.
55ceced
Commits on Apr 23, 2012
@carlosantoniodasilva carlosantoniodasilva Refactor GeneratedAttributes
* Move reference? method to class to remove duplicated code
* Move to_sym typecast from #initialize to .parse method (make it
  easier to refactor reference?), remove AS object/blank require
* Use []= instead of merge!({})
* Remove in? in favor of include?, remove AS object/inclusion require
a4c4fa3
@dnagir dnagir Make it explicit that Symbol-s are not officially supported.
This will remove a lot of controversy.
As an example, see activerecord-hackery/squeel#67 (comment)
50c5005
@dnagir dnagir Fix markdown in textile. 50f79da
@josevalim josevalim Merge pull request #5930 from carlosantoniodasilva/generated-attribut…
…e-refactor

Refactor GeneratedAttributes
5b80667
@vijaydev vijaydev Merge pull request #5887 from mcrowe/document-relation-merge
Add documentation to the SpawnMethods#merge method.
5f6ef50
@bogdan bogdan Add missing requires in routes ef7815b
@joevandyk joevandyk Only include Rake::DSL if it's defined.
rake < 0.9 doesn't define Rake::DSL.
82c3aca
Commits on Apr 24, 2012
@avakhov avakhov Missed checked in Form Helper example e6de208
@josevalim josevalim Merge pull request #5954 from bogdan/routes
Add missing requires in routes
242f4d1
@bogdan bogdan RouteSet: simplify routes helpers generation code 15c5060
@oscardelben oscardelben Fix some code in getting started guide 5acb345
@arunagw arunagw Upgrading mocha 0.11.2 42b8bd5
@josevalim josevalim Merge pull request #5955 from bogdan/routes
RouteSet: simplify routes helpers generation code
0b05380
@bogdan bogdan RouteSet: decomplecting a way to handle positional args 65ec1e9
@avakhov avakhov Distance of time in words should work correct if from time > to_time ff5b0d6
@marceloeloelo marceloeloelo fixed non matching documentation behaviour with method semantics on d…
…istance_of_time_in_words
5fdd4cd
@avakhov avakhov Use leap years trick in distance_of_time_in_words only for distances …
…between real date points
7322bd4
@josevalim josevalim Merge pull request #5957 from bogdan/routes
RouteSet: decomplecting a way to handle positional args
afcae34
@oscardelben oscardelben Add update post section to getting started guide f0de717
@oscardelben oscardelben make sample code more compact f92814e
@carlosantoniodasilva carlosantoniodasilva Refactor hash creation in routeset 2658d97
@tenderlove tenderlove Merge pull request #5959 from carlosantoniodasilva/refactor-route_set
Refactor hash creation in routeset
481ed89
@homakov homakov Deleting insecure and "bad practice" code. related: http://homakov.bl… f70d95e
@josevalim josevalim Merge pull request #5960 from homakov/patch-3
Delete insecure and "bad practice" code.
10540e2
@jeremy jeremy Merge pull request #5956 from arunagw/mocha_upgrade
Upgrading to Mocha 0.11.2 to fix Object#method override
f7ddbaa
@jeremy jeremy Merge pull request #5927 from avakhov/distance_of_time_in_words-swap
Distance of time in words should work correctly if from_time > to_time
4afdd97
@bogdan bogdan ActionDispatch::HTTP::Url#url_for refactor method
Separated right side url generation(before query string)
from left side url generation(after query string)
0129499
@jeremy jeremy Merge pull request #5961 from bogdan/routes
Refactor ActionDispatch::HTTP::Url#url_for
71bd509
@kennyj kennyj Fix build. It seems that the Mocha's behavior were changed. 2aa7c6d
@jeremy jeremy Merge pull request #5963 from kennyj/fix_build_20120425
Fix build. It seems that the Mocha's behavior was changed.
dbef5a0
@oscardelben oscardelben Refactor SecurePassword#authenticate ffa974d
@josevalim josevalim Merge pull request #5965 from oscardelben/refactor_secure_password_au…
…thenticate

Refactor SecurePassword#authenticate
c873167
@oscardelben oscardelben Correct documentation of SecurePassword 52188c7
@jeremy jeremy Merge pull request #5929 from FLOChip/notes
`rake notes` and `rake notes:custom` now support css, scss, and css.
f822024
@oscardelben oscardelben Fix secure_password setter 692b3b6
@josevalim josevalim Merge pull request #5966 from oscardelben/fix_secure_password_setter
Fix secure_password setter
0cc32c5
@jstrocel jstrocel Added some useful methods to the generators.textile f45f1ba
@gaurish gaurish Added warning that require_tree includes files in unspecified order. …
…So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production.
9dbd511
@jrochkind jrochkind Remove references to 'vendored plugins' except to note they used to e…
…xist but are deprecated. 'gemified plugin' is the only supported option now.
cdc9031
@gaurish gaurish Added notice on how to enable gzip compression in rails app using Rac…
…k::Deflater. it is disabled & commented out by default.
ccd0b51
@gaurish gaurish Added notice on how to enable gzip compression.
(Fixed typo from previous commit: ccd0b51)
189a172
Commits on Apr 25, 2012
@asanghi asanghi and one more time d6c831c
@rf- rf- Always quote hstore keys and values
escape_hstore uses quotation marks around keys and values only if it
seems necessary. However, it currently breaks in the presence of some
non-ASCII characters. Instead of trying to guess exactly which
characters are safe, it seems better to always use quotes.
0c46dbb
@wycats wycats Remove default match without specified method
In the current router DSL, using the +match+ DSL
method will match all verbs for the path to the
specified endpoint.

In the vast majority of cases, people are
currently using +match+ when they actually mean
+get+. This introduces security implications.

This commit disallows calling +match+ without
an HTTP verb constraint by default. To explicitly
match all verbs, this commit also adds a
:via => :all option to +match+.

Closes #5964
56cdc81
@rf- rf- Restore .to_s to escape_hstore 1a05e15
@wycats wycats Clean up some straggling build failures a837b30
@ugisozols ugisozols for get -> forget 1533853
@josevalim josevalim Merge pull request #5841 from oscardelben/rename_count_observers
Rename Observing#count_observers to Observing#observers_count
cd556c9
@avakhov avakhov Remove lonely number sign 93bcb0c
@avakhov avakhov Don't indent blank lines in named base generators 6ac9e49
@aderyabin aderyabin already defined in quoting d6b3dbe
@oscardelben oscardelben improve serialization doc e34a401
@oscardelben oscardelben Minor refactor of serializable hash a631dd9
@aderyabin aderyabin cleanliness in method parameters 53362fc
@oscardelben oscardelben Add include documentation to serialization d089ee8
@oscardelben oscardelben fix code syntax f9f5243
@oscardelben oscardelben Add screenshot to updating post section 6f09291
@josevalim josevalim Remove unnecessary empty line 2aabf8c
@gazay gazay Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR hea…
…der and tests.
6da2bc5
@oscardelben oscardelben Add partials explanation to getting started guide ccbd32c
@josevalim josevalim Merge pull request #5977 from oscardelben/refactor_serializable_hash
Minor refactor of serializable hash
217e9c0
@jeremy jeremy Merge pull request #5880 from asanghi/master
Stamp out ruby-debug with debugger everywhere else in the code base
bd6203f
@jeremy jeremy Merge pull request #5978 from aderyabin/fix2
cleanliness in method parameters
6d095b4
@jeremy jeremy Merge pull request #5976 from aderyabin/fix1
Duplicate quote_table_name method
5cfb0ae
@jeremy jeremy Merge pull request #5980 from gazay/valid_ips
Remote ip logic and validation. IPv6 support.
bb0906e
@oscardelben oscardelben Refactor Observer.observed_class 9072a08
@vijaydev vijaydev removing changes made in ccd0b51 and 189a172 [ci skip] dca1cd4
@vijaydev vijaydev Revert "Added warning that require_tree includes files in unspecified…
… order. So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production. "

This reverts commit 9dbd511.

Reason: Sounds like something for the guide, not the template.
9e962ff
@vijaydev vijaydev copy edits [ci skip] 8189536
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 4a3ce15
@vijaydev vijaydev Merge pull request #5878 from oscardelben/refactor_observed_class
Refactor Observer.observed_class
cd65682
@josevalim josevalim Merge pull request #5902 from avakhov/generator-no-indent-blank-lines
Don't indent blank lines in named base generators
33d8091
@oscardelben oscardelben Add partials section to getting started guide ee4e712
@oscardelben oscardelben Merge branch 'master' of github.com:lifo/docrails 4179141
@jeremy jeremy Remove blank line at the end of routes.rb 2970e3f
@jonleighton jonleighton giving a hash to default scope should not be deprecated (well, not fo…
…r this reason)
4084373
@jonleighton jonleighton extract to active_record_deprecated_finders f3fce59
@jonleighton jonleighton allow merging a single where value e8cdb3d
@jonleighton jonleighton fix interpolation for hash merging ef1d1e1
@jonleighton jonleighton Extract deprecated code 618c5fc
@jonleighton jonleighton extract deprecated code af27c8b
@jonleighton jonleighton extract #with_scope and #with_exclusive_scope to active_record_deprec…
…ated_finders
d242e46
@jonleighton jonleighton add missing test 98de70e
@jonleighton jonleighton Merge remote-tracking branch 'kennyj/fix_5563'
Conflicts:
	activerecord/test/cases/associations/belongs_to_associations_test.rb
8b941e9
@jonleighton jonleighton Merge remote-tracking branch 'jmbejar/define_array_methods_collection…
…_proxy'
2a97636
@jstrocel jstrocel Copy Edit 7f04235
@tenderlove tenderlove Merge pull request #5973 from academia-edu/master
Always quote hstore keys and values
bc7309c
@lazylester lazylester adds a mention of the fact that an engine's lib/assets directory is a…
…lso on the load path
0476001
@lazylester lazylester Merge branch 'master' of github.com:lifo/docrails a2fac64
@jonleighton jonleighton remove tests for #with_scope (it's now deprecated) 40a711c
@jonleighton jonleighton remove unused method 3c100cf
@wycats wycats Allow loading external route files from the router
This feature enables the ability to load an
external routes file from the router via:
  draw :filename

External routes files go in +config/routes+. This
feature works in both engines and applications.
6acebb3
@wycats wycats Make files in paths consistent fe6573e
@wycats wycats Fix the build 47be2f1
@wycats wycats Fix missing Rails.env in route inspect tests 568ae22
Commits on Apr 26, 2012
@wycats wycats Routes reloader knows how to reload external files 363a06f
@arunagw arunagw Shadowing variable warning removed 68aadbc
@oscardelben oscardelben Enhance validations documentation b2ccae4
@oscardelben oscardelben Add documentation for validate options 26353b9
@oscardelben oscardelben minor docs improvements 8c16333
@vijaydev vijaydev fix number_to_human docs [ci skip] 848276d
@kennyj kennyj Fix #5847 and #4045. Load AR::Base before loading an application model. 627f89b
@jonleighton jonleighton default_scope with a hash is deprecated 519001d
@jonleighton jonleighton remove deprecated scope stuff e1a8369
@jonleighton jonleighton fix #scoped deprecations 1606bee
@jonleighton jonleighton remove deprecate #update_all usage 2f0c8c5
@jonleighton jonleighton Merge pull request #5995 from kennyj/fix_5847-3
Fix #5847 and #4045. Load AR::Base before loading an application model.
8cd14c0
@avakhov avakhov Namedspaced generator indent method test refactoring 5decf83
@avakhov avakhov Fix misprints in assert_file & assert_instance_method docs 2497fd9
@aderyabin aderyabin EXPLAIN only for sqlite3 9fd6403
@fxn fxn Merge pull request #5998 from aderyabin/fix7
EXPLAIN only for sqlite3
9a3d579
@fxn fxn Merge pull request #5997 from avakhov/test_namespaced_controller_dont…
…_indent_blank_lines-refac

Namedspaced generator indent method test refactoring
bd91f70
@jonleighton jonleighton remove deprecated #find_in_batches calls f6ddb13
@jonleighton jonleighton remove deprecate #calculate calls 759d302
@jonleighton jonleighton remove deprecated #first calls 5866321
@jonleighton jonleighton remove deprecate #all usage b309963
@jonleighton jonleighton remove calls to find(:first), find(:last) and find(:all) 75f03ec
@nashby nashby remove unnecessary else statement 7554e5c
@jeremy jeremy Merge pull request #6001 from nashby/patch-2
remove unnecessary else statement
14d1e55
@jonleighton jonleighton don't need this test cf1a83c
@lest lest use safe_join in number helper 0f848dd
@lest lest refactor content_tag_for helper
- do not use merge! just for 2 values
- there is no need to check block arity
10f90bd
@jeremy jeremy Merge pull request #6002 from lest/patch-1
Tiny refactoring in NumberHelper and RecordTagHelper
8b0489c
@jroes jroes Minor typo. 8bf97d1
@lest lest remove calls to deprecated find(:first) in actionpack test suite 67e8004
@jonleighton jonleighton Merge pull request #6004 from lest/patch-1
remove calls to deprecated find(:first) in actionpack test suite
770c809
@roryokane roryokane Active Support Core Extensions guide: reworded "on one hand" and simi…
…lar to "for one thing"
504e539
Commits on Apr 27, 2012
@wycats wycats Initial queue implementation adff4a7
@wycats wycats Missing git add :trollface: 602000b
@aderyabin aderyabin merged sqlite and sqlite3 adapters 7572efc
@aderyabin aderyabin fix tests for sqlite3 27dea76
@aderyabin aderyabin Upgrade sqlite3 version to 1.3.6 fc1bf36
@aderyabin aderyabin fix SQLite3Adapter doc 1a3d4f7
@aderyabin aderyabin removed tail of old sqlite versions 3cc9b5f
@aderyabin aderyabin renamed class SQLiteColumn to SQLite3Column dd05a49
@aderyabin aderyabin fix tests for SQLite3Adapter d42b60a
@mark-rushakoff mark-rushakoff Use <tt>Foo::Bar</tt> instead of +Foo::Bar+
The latter doesn't render as code in HTML output.

Regex used in Rubymine to locate the latter form:

    (\+)(:*\w+:(?::|\w)+)(\+)
8cc4159
@mark-rushakoff mark-rushakoff Fix it's -> its ff44c33
@jonleighton jonleighton Merge pull request #6011 from aderyabin/nosqlite
Remove old sqlite adapter
7d1a42a
@bfcapell bfcapell find_by_sql actually triggers after_find 39574aa
@jonleighton jonleighton Merge branch 'master' of github.com:rails/rails 4ed6167
@jonleighton jonleighton remove unnecessary test code a57b784
@jonleighton jonleighton %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst …
…other things
df6f971
@jonleighton jonleighton allow AssociationProxy#scoped to take options so that API is the same…
… as Base#scoped
61555a0
@jonleighton jonleighton find and replace deprecated keys 0ed05b0
@jonleighton jonleighton more deprecations manually fixed 20ea8df
@oscardelben oscardelben Add delete post section to Getting Started guide f444760
@oscardelben oscardelben Merge branch 'master' of github.com:lifo/docrails fc3d15d
@jonleighton jonleighton Merge pull request #5989 from arunagw/warning_removed_master_ap
Shadowing variable warning removed
a6e47b2
@josevalim josevalim Revert "Merge pull request #5995 from kennyj/fix_5847-3"
Active Record should be lazy loaded and this pull request
forced Active Record to always be loaded after initialization.

This reverts commit 8cd14c0, reversing
changes made to 2f0c8c5.
0a8aec2
@jonleighton jonleighton remove deprecated calls 3981a68
@tenderlove tenderlove Merge pull request #5698 from dougcole/support_postgresql_partitioning
Support postgresql partitioning by making INSERT RETURNING optional
8de4d71
@tenderlove tenderlove add a factory method for queue construction so that apps can have mul…
…tiple queues
cd50b60
@vijaydev vijaydev update docs - disabling prepared statements is not connected to manag…
…ing connections externally [ci skip]
50b1399
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 43af34c
@vijaydev vijaydev made a few changes and fixes in getting started guide [ci skip] 4dcaffb
@7even 7even fixes run order in Rails::Queueing::TestQueue 9d630d4
@7even 7even clean up empty lines 804db94
@tenderlove tenderlove Merge pull request #6020 from 7even/test_queue_order
Rails::Queueing::TestQueue run order
3ca7b13
@tenderlove tenderlove do not depend on time 673fe05
@tenderlove tenderlove Extend stdlib queue for the test queue 2187b5f
@tenderlove tenderlove oops! 90e90d6
@tenderlove tenderlove adding the `jobs` method to the test queue for getting a list of test
jobs.
0c076c0
@tenderlove tenderlove ensure that draining the queue will raise exceptions 3fc16a9
@sikachu sikachu Log the exception from the ThreadConsumer
This will make sure you know when there's an exception occur.
4531ba7
@josevalim josevalim Merge pull request #6021 from sikachu/log_exception
Log the exception from the ThreadConsumer
d8c3ad7
@carlosantoniodasilva carlosantoniodasilva Fix failing test, TestQueue#contents is not #jobs ff4eba9
@tenderlove tenderlove Merge pull request #6023 from carlosantoniodasilva/fix-queue-test
Fix failing test related to TestQueue
3e8d88f
@carlosantoniodasilva carlosantoniodasilva Return earlier if attribute already changed in *_will_change! methods
Avoid obtaining the value and duplicating it when possible.
9d1f6ed
Commits on Apr 28, 2012
@carlosantoniodasilva carlosantoniodasilva Refactor AMo::Errors
* Use merge!, remove reverse_merge
* Use case statement instead of is_a? checks
709b748
@sikachu sikachu Add parentheses to hide Ruby warning 6d8ec0b
@spastorino spastorino Merge pull request #6026 from sikachu/master-fix_warning
Add parentheses to hide Ruby warning
47a87fb
@sikachu sikachu Create plpgsql language if not available
This should fix the problem in Travis CI server.
(http://travis-ci.org/#!/rails/rails/jobs/1194988)
5156110
@aderyabin aderyabin removed deprecation warnings 3aec521
@josevalim josevalim Merge pull request #6029 from aderyabin/fix_depr
removed deprecation warnings
dd5524a
@josevalim josevalim Merge pull request #6024 from carlosantoniodasilva/amo-dirty-refactor
Improve AMo::Dirty *_will_change! method
d0e1c69
@josevalim josevalim Merge pull request #6025 from carlosantoniodasilva/amo-errors-refactor
Refactor AMo::Errors
fc6b115
@josevalim josevalim Use Rails::Queueing::Queue instead of Queue so people can build their…
… own consumers around stdlib's Queue
9fc9e89
@carlosantoniodasilva carlosantoniodasilva Do not modify options hash in human_attribute_name, remove reverse_merge cafe6a3
@carlosantoniodasilva carlosantoniodasilva Refactor human attribute name f48d83b
@josevalim josevalim Merge pull request #6035 from carlosantoniodasilva/amo-translation-re…
…factor

Refactor AMo::Translation, avoid changing options in human attr name
71cf6ef
@tenderlove tenderlove Merge pull request #6028 from sikachu/master-fix_plpgsql
Create plpgsql language if not available
e4c48ff
@pixeltrix pixeltrix Merge session arg with existing session instead of overwriting
This may break existing tests that are asserting the whole session contents
but should not break existing tests that are asserting individual keys - e.g:

class SomeControllerTest < ActionController::TestCase
  setup do
    session['user_id'] = 1
  end

  test "some test" do
    get :some_action, nil, { 'another_var' => 2 }

    # This assertion will now fail
    assert_equal({ 'another_var' => 2 }, session)

    # This assertion will still pass
    assert_equal 2, session['another_var]
  end
end

Fixes #1529.
5c18bdc
@drogus drogus Add a failing test for #5764 28844ae
@romanvbabenko romanvbabenko Engine#routes? method has been fixed d9239fd
@drogus drogus Fix Engine#routes to not call draw_paths multiple times 5a2fdaa
@drogus drogus Don't create new directory for tests 1823d53
tomhuda Allow Thor 0.15 and 1.0, to be released shortly ad2c5ea
@gazay gazay AS core_ext refactoring 1946d7b
@gazay gazay AS core_ext refactoring pt.2 9257224
@gazay gazay Indentation for private methods f122051
@gazay gazay String quotes and trailing spaces 432a65f
Commits on Apr 29, 2012
@jeremy jeremy Merge pull request #5996 from gazay/remove_excess_selfs
Active Support housekeeping and polish
1a4e27f
@drogus drogus Lazy load `default_form_builder` if it's passed as a string
closes #3341
e6ab0d5