aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update changelogJoão Britto2014-01-091-0/+7
|
* Avoid scanning multiple render calls as a single match.João Britto2014-01-092-21/+45
| | | | Each chunk of text coming after `render` is now handled individually as a possible list of arguments.
* Improve ERB dependency detection.João Britto2014-01-092-21/+145
| | | | | | | | | | | The current implementation can't handle some special cases of oddly-formatted Ruby. Now we are able to detect them: * Multi-line arguments on the `render` call * Strings containing quotes, e.g. `"something's wrong"` * Multiple kinds of identifiers - instance variables, class variables and globals * Method chains as arguments for the `render` call Also, this fix reduces the rate of "false positives" which showed up when we had calls/access to identifiers containing `render`, like `surrender` and `rendering`.
* Revert "ask the fixture set for the sql statements"Aaron Patterson2014-01-092-17/+11
| | | | | | | | | This reverts commit 026d0555685087845b74dd87a0417b5a164b1c13. Conflicts: activerecord/lib/active_record/fixtures.rb Fixes #13383
* Merge pull request #13632 from tinogomes/masterRafael Mendonça França2014-01-095-0/+63
|\ | | | | Adding Hash#compact and Hash#compact! methods
| * Adding Hash#compact and Hash#compact! methodstinogomes2014-01-095-0/+63
| | | | | | | | | | | | | | | | | | | | | | * Adding Hash#compact and Hash#compact! methods * Using Ruby 1.9 syntax on documentation * Updating guides for `Hash#compact` and `Hash#compact!` methods * Updating CHANGELOG for ActiveSupport * Removing unecessary protected method and lambda for `Hash#compact` implementations * Performing `Hash#compact` implementation - https://gist.github.com/tinogomes/8332883 * fixing order position * Fixing typo
* | Merge pull request #13644 from zzak/doc_mysql_config_templateGuillermo Iguaran2014-01-081-1/+1
|\ \ | | | | | | MySQL version 4.1 was EOL on December 31, 2009 [ci-skip]
| * | MySQL version 4.1 was EOL on December 31, 2009Zachary Scott2014-01-081-1/+1
|/ / | | | | | | We should at least recommend modern versions of MySQL to users.
* | clear cache on body close so that cache remains during renderingAaron Patterson2014-01-082-2/+45
| | | | | | | | | | | | | | | | fixes #13547 The body may use the local cache during rendering. `call`ing the app doesn't mean that rendering is finished, so we need to wait until `close` is called on the body.
* | add a more restricted codepath for templates fixes #13390Aaron Patterson2014-01-082-12/+51
| |
* | Merge pull request #13637 from craftsmen/app-generator-minor-fixRafael Mendonça França2014-01-081-4/+4
|\ \ | | | | | | Move finish_template as the last public method defined in the generator
| * | Move finish_template as the last public method in the generatorMehdi Lahmam2014-01-081-4/+4
| |/
* | refactor generator tests to use block form of TempfileAaron Patterson2014-01-081-36/+30
| |
* | Merge pull request #13634 from jwworth/masterCarlos Antonio da Silva2014-01-081-1/+1
|\ \ | |/ |/| Fix typo [ci skip]
| * Fix typo [ci skip]Jake Worth2014-01-081-1/+1
|/
* Minor typos fix [ci skip]Robin Dupret2014-01-081-3/+3
|
* make `change_column_null` reversible. Closes #13576.Yves Senn2014-01-083-1/+26
| | | | Closes #13623.
* Merge pull request #13629 from dmathieu/drop_testYves Senn2014-01-085-5/+40
|\ | | | | Be more explicit about the default of db:drop and db:create
| * create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-085-5/+40
|/ | | | Closes #13625
* Revert "Speedup String#to"Yves Senn2014-01-082-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ef1fb2c455ca53a0c1e1768f50824926ce28bd3. As described in PR #13627 this commit broke functionality when passing a negative Fixnum to the `String#to` method: ```ruby assert_equal "hell", s.to(-2) ``` Before the revert, this failed with: ``` 1) Failure: StringAccessTest#test_#to_with_negative_Fixnum,_position_is_counted_from_the_end [test/core_ext/string_ext_test.rb:275]: Expected: "hell" Actual: nil ``` This revert is to keep the functionality on `master` working. If there is another way to get the performance benefit and keep the documented functionality we can add that. /cc @amatsuda @carlosantoniodasilva
* typo fix in test name. [ci skip].Yves Senn2014-01-081-1/+1
|
* `core_ext/string/access.rb` test what we are documenting.Yves Senn2014-01-081-50/+89
| | | | | | | | | | | | | I also extracted the tests from a single bulk method into a separate test-case. The new tests cover the API described in the docs. There are two skipped tests, which are broken as of 2ef1fb2c455ca53a0c1e1768f50824926ce28bd3 * #to with negative Fixnum, position is counted from the end * #from and #to can be combined This was brought to my attention by #13627. Closes #13627.
* Merge pull request #13355 from dylanahsmith/migration-versionRafael Mendonça França2014-01-074-1/+19
|\ | | | | | | | | | | | | activerecord: Initialize Migration with version from MigrationProxy. Conflicts: activerecord/CHANGELOG.md
| * activerecord: Initialize Migration with version from MigrationProxy.Dylan Thacker-Smith2014-01-064-1/+18
| |
* | Merge pull request #13621 from Intrepidd/patch-1Xavier Noria2014-01-071-1/+1
|\ \ | | | | | | Fix typo in image_tag documentation [ci skip]
| * | Fix typo in image_tag documentationAdrien2014-01-071-1/+1
|/ / | | | | image_tag only supports :alt and :size as additional keys, not three.
* | Merge pull request #13597 from prathamesh-sonpatki/hstore_migrationYves Senn2014-01-076-15/+43
|\ \ | | | | | | Make change_table use object of current database adapter
| * | Make change_table use object of current database adapterNishant Modak2014-01-076-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Earlier, change_table was creating database-agnostic object. - After this change, it will create correct object based on current database adapter. - This will ensure that create_table and change_table will get same objects. - This makes update_table_definition method public and nodoc. - Fixes #13577 and #13503
* | | Use a better method name to check the requirement of password confirmationCarlos Antonio da Silva2014-01-072-8/+8
|/ / | | | | | | | | Also improve changelog entries related to secure password to proper highlight.
* | Merge pull request #13617 from arthurnn/error_varRafael Mendonça França2014-01-061-2/+2
|\ \ | | | | | | Add 'e' var on rescue DalliError, in order to log it
| * | Add 'e' var on rescue DalliError, in order to log itArthur Neves2014-01-061-2/+2
|/ /
* | Merge pull request #13616 from zirni/remove_warningsRafael Mendonça França2014-01-061-1/+1
|\ \ | |/ |/| Remove warnings in test suite
| * Remove warnings in test suiteMatthias Zirnstein2014-01-061-1/+1
|/ | | | | | | lib/active_record/store.rb:79: warning: method redefined; discarding old color= lib/active_record/store.rb:79: warning: previous definition of color= was here lib/active_record/store.rb:83: warning: method redefined; discarding old color lib/active_record/store.rb:83: warning: previous definition of color was here
* Merge pull request #13593 from oliveiraethales/store_yaml_coderYves Senn2014-01-065-1/+14
|\ | | | | Fix: ActiveRecord::Store TypeError conversion when using YAML coder
| * Fix: ActiveRecord::Store TypeError conversion when using YAML coderThales Oliveira2014-01-065-1/+14
| | | | | | | | | | | | | | | | | | | | Renaming the test accordingly to its behaviour Adding 'Fixes' statement to changelog Improving tests legibility & changelog Undoing mistakenly removed empty line & further improving changelog
* | add example to the CHANGELOG entry from 3a48b83e5 [ci skip].Yves Senn2014-01-061-2/+8
| | | | | | | | /cc @pixeltrix
* | Fix typo in AS changelog, improve highlight [ci skip]Carlos Antonio da Silva2014-01-061-2/+2
| |
* | Fix AR connection resolver docs to return a hash with string keys [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| |
* | Fix typo [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| |
* | Fix rdoc markup [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| | | | | | | | Wrapping symbols with + does not work, we must use <tt> instead.
* | Merge pull request #13611 from robinboening/plugin_generator_testsYves Senn2014-01-061-0/+6
|\ \ | | | | | | Add missing tests for invalid names in `rails plugin new` generator
| * | Add missing tests for invalid names in `rails plugin new`Robin Böning2014-01-061-0/+6
| | | | | | | | | | | | | | | * Test for: Invalid plugin name, because of reserved rails word. * Test for: Invalid plugin name because of constant name that is already in use.
* | | Fix typo in AMo docs [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| | |
* | | quick formatting pass through CHANGELOGS. [ci skip].Yves Senn2014-01-064-17/+24
| | |
* | | update 4.1 release notes with deprecation commit link. [ci skip]Yves Senn2014-01-061-1/+2
| | |
* | | Merge pull request #13607 from huoxito/actionview-versionGuillermo Iguaran2014-01-051-0/+1
|\ \ \ | | | | | | | | Require actionview/version
| * | | Require actionview/versionWashington Luiz2014-01-061-0/+1
|/ / / | | | | | | | | | just like all the other modules do require their version file
* | | Merge pull request #13604 from randomecho/docs-getting-startedRafael Mendonça França2014-01-051-3/+3
|\ \ \ | |_|/ |/| | Ruby is a proper noun here, not part of code fragment [ci skip]
| * | Ruby is a proper noun here, not part of code fragment [ci skip]Soon Van2014-01-051-3/+3
|/ / | | | | | | | | Last line of note also relates heavily to first part and parenthesis broke reading flow.
* | Allow an absolute controller path inside a module scopeAndrew White2014-01-054-2/+24
| | | | | | | | Fixes #12777