aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix backward compatibility with stored Hash values. Wrap coders to convert ↵Jeremy Kemper2012-05-303-15/+51
| | | | serialized values to indifferent access.
* Set RACK_ENV to nil in the dbconsole testRafael Mendonça França2012-05-301-0/+1
| | | | This will fix the travis-ci build
* Fix app_generator_test with the changes introduced atRafael Mendonça França2012-05-301-1/+1
| | | | f4d7af67ffc90f2542afa50c7579fc83ea4f45f2
* Merge pull request #6560 from martinoconnor/generator_fixRafael Mendonça França2012-05-301-1/+1
|\ | | | | Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
| * Changed symbol platform to platforms for the commented out call to gem ↵Martin O'Connor2012-05-301-1/+1
|/ | | | | | 'therubyracer'. Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
* Merge pull request #6276 from samoli/fix_console_argumentsRafael Mendonça França2012-05-307-132/+182
|\ | | | | Fix various bugs with console arguments and improve test coverage
| * Remove support for rails server RAILS_ENV=env-nameSam Oliver2012-05-302-7/+2
| |
| * Fix various bugs with console arguments.Sam Oliver2012-05-305-125/+180
|/ | | | Allow hyphens in environment names again.
* Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
|\ | | | | Properly discover a connection is closed in postgresql_adapter
| * Properly discover a connection is closed in postgresql_adapterSteve Klabnik2012-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | PQstatus doesn't properly test if future operations will succeed. A PQping function is added to libpq in PostgreSQL 9.1, but if we rely on it, everyone on earlier versions of Postgres is out of luck, and the pg gem wouldn't have the 'fix' until the next release. Thanks to @cbrecabarren and @ged for handling all the dirty details. Closes #3392.
* | Merge pull request #6556 from lest/patch-1Rafael Mendonça França2012-05-304-5/+53
|\ \ | | | | | | accept a block in button_to helper
| * | accept a block in button_to helperSergey Nartimov2012-05-303-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make possible to use a block in button_to helper if button text is hard to fit into the name parameter, e.g.: <%= button_to [:make_happy, @user] do %> Make happy <strong><%= @user.name %></strong> <% end %> # => "<form method="post" action="/users/1/make_happy" class="button_to"> # <div> # <button type="submit"> # Make happy <strong>Name</strong> # </button> # </div> # </form>"
| * | no need to pass an empty block to button_to helperSergey Nartimov2012-05-301-2/+2
| | |
* | | Merge pull request #6554 from erichmenge/remove-json-variablePiotr Sarnacki2012-05-304-14/+7
|\ \ \ | |/ / |/| | Remove deprecated ActiveSupport::JSON::Variable.
| * | Remove deprecated ActiveSupport::JSON::Variable.Erich Menge2012-05-304-14/+7
| | |
* | | Merge pull request #6541 from ↵Rafael Mendonça França2012-05-301-3/+3
|\ \ \ | | | | | | | | | | | | | | | | tjouan/tj/activesupport-fix-tests-requiring-unsafe-umask Make tests pass with umask
| * | | Make File#atomic_write tests pass with umaskThibault Jouan2012-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Assertions on file permissions only pass with some combinations of file create mode and the process file mode creation mask. This mask should be applied on the file create mode before related assertions.
* | | | Merge pull request #6555 from schneems/schneems/remove-reload-codeRafael Mendonça França2012-05-301-2/+0
|\ \ \ \ | | | | | | | | | | Remove Unused Route Reloading Code
| * | | | remove unused route reloading codeschneems2012-05-301-2/+0
|/ / / / | | | | | | | | Since the environment is initialized each time rake is run, routes don't need to be re-loaded. https://github.com/rails/rails/pull/6461#r869953
* | | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-304-5/+15
|\ \ \ \ | | | | | | | | | | Fix #5797. Error calling dup method on AR model with serialized field
| * | | | Fix #5797. Error calling dup method on AR model with serialized fieldkennyj2012-05-304-5/+15
| | | | |
* | | | | Merge pull request #6386 from kennyj/fix_logs_name_consistencyAaron Patterson2012-05-307-33/+123
|\ \ \ \ \ | | | | | | | | | | | | Fix logs name consistency.
| * | | | | Fix logs name consistency.kennyj2012-05-197-33/+123
| | | | | |
* | | | | | cut down spaces [ci skip]Vijay Dev2012-05-301-3/+3
| | | | | |
* | | | | | Revert "Revert "[AR querying guide] Add examples for take(limit), ↵Vijay Dev2012-05-301-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first(limit) and last(limit)"" This reverts commit 5559a2ae98dcda6854f38890025b52edfb2836f5. Reason: These are for selecting multiple objects and there isn't a need to club them with the selecting single objects section, as discussed with the author.
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-3019-208/+328
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | copy edit the batches docs [ci skip]Vijay Dev2012-05-301-9/+7
| | | | | |
| * | | | | let's not add too much details upfront in the introduction [ci skip]Vijay Dev2012-05-301-8/+1
| | | | | |
| * | | | | Revert "[AR querying guide] Add examples for take(limit), first(limit) and ↵Vijay Dev2012-05-301-48/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | last(limit)" This reverts commit 724d6fa6bb48b61798c223b47dd27155839c40d5. Reason: This is already documented in another section, albeit without the arguments examples. Let's add them in another commit in the appropriate sections [ci skip]
| * | | | | some copy edits [ci skip]Vijay Dev2012-05-301-4/+4
| | | | | |
| * | | | | fix typo in render_template [ci skip]Brent Vatne2012-05-291-1/+1
| | | | | |
| * | | | | Revert my own commit, didnt notice that this was intentional. [ci skip]Saulius Grigaliunas2012-05-291-1/+1
| | | | | |
| * | | | | Routing guide: route constraints are anchored by default, remove ^ ↵Saulius Grigaliunas2012-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | character. [ci skip]
| * | | | | fix typo on ActiveSupport instrumentation guide [ci skip]Rafael Magana2012-05-291-1/+1
| | | | | |
| * | | | | fix example format and add markup in Module#mattr_accessor documentation [ci ↵Francesco Rodriguez2012-05-291-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | skip]
| * | | | | fix typos on migrations guide [ci skip]Francesco Rodriguez2012-05-281-4/+4
| | | | | |
| * | | | | [contributing guide] add instructions to update fork [ci skip]Rafael Magana2012-05-281-0/+36
| | | | | |
| * | | | | Added information regarding the schema_migrations table in Active Record ↵jordanstaub2012-05-281-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Migrations guide.
| * | | | | [AR querying guide] Add examples for take(limit), first(limit) and last(limit)Rafael Magana2012-05-281-0/+48
| | | | | |
| * | | | | change example on CollectionProxy#delete to accept multiple valuesFrancesco Rodriguez2012-05-281-1/+1
| | | | | |
| * | | | | Updates Array conversions method documentations and clean upsAlvaro Pereyra2012-05-281-4/+0
| | | | | |
| * | | | | Adds to Batch processing documentation [ci skip]Alvaro Pereyra2012-05-281-9/+20
| | | | | |
| * | | | | add ActiveSupport::JSON.decode documentation [ci skip]Francesco Rodriguez2012-05-281-0/+5
| | | | | |
| * | | | | add example to ActiveSupport::JSON.encode [ci skip]Francesco Rodriguez2012-05-281-1/+4
| | | | | |
| * | | | | fix typo and remove 'examples' noise [ci skip]Francesco Rodriguez2012-05-281-18/+6
| | | | | |
| * | | | | Merge branch 'master' of github.com:lifo/docrailsAlvaro Pereyra2012-05-282-2/+0
| |\ \ \ \ \
| | * | | | | fix empty lines [ci skip]Francesco Rodriguez2012-05-282-2/+0
| | | | | | |
| * | | | | | Updates examples for FinderMethods [ci skip]Alvaro Pereyra2012-05-281-2/+14
| |/ / / / /
| * | | | | Merge branch 'master' of github.com:lifo/docrailsAlvaro Pereyra2012-05-28320-683/+3195
| |\ \ \ \ \
| | * | | | | remove :nodoc: from Class#subclasses [ci skip]Francesco Rodriguez2012-05-281-4/+10
| | | | | | |