aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Add CHANGELOG entry for #10634 [ci skip]Andrew White2014-01-051-0/+17
| |
* | Merge pull request #10634 from teleological/time_advance_gregorianAndrew White2014-01-052-4/+13
|\ \ | | | | | | Maintain proleptic gregorian in Time#advance
| * | Maintain proleptic gregorian in Time#advanceRiley Lynch2013-05-152-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time#advance uses Time#to_date and Date#advance to calculate a new date. The Date object returned by Time#to_date is constructed with the assumption that the Time object represents a proleptic gregorian date, but it is configured to observe the default julian calendar reform date (2299161j) for purposes of calculating month, date and year: Time.new(1582, 10, 4).to_date.to_s # => "1582-09-24" Time.new(1582, 10, 4).to_date.gregorian.to_s # => "1582-10-04" This patch ensures that when the intermediate Date object is advanced to yield a new Date object, that the Time object for return is contructed with a proleptic gregorian month, date and year.
* | | Merge pull request #13598 from zirni/remove_ar_warningsRafael Mendonça França2014-01-052-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Remove method redefined warnings for test suite Closes #13526
| * | | Remove method redefined warnings for test suiteMatthias Zirnstein2014-01-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has_many definitions with "name" as singular and as plural e.g. has_many :welcome_posts_with_comment has_many :welcome_posts_with_comments Ruby mentions it with: lib/active_record/associations/builder/collection_association.rb:65: warning: method redefined; discarding old welcome_posts_with_comment_ids lib/active_record/associations/builder/collection_association.rb:65: warning: previous definition of welcome_posts_with_comment_ids was here lib/active_record/associations/builder/collection_association.rb:75: warning: method redefined; discarding old welcome_posts_with_comment_ids= lib/active_record/associations/builder/collection_association.rb:75: warning: previous definition of welcome_posts_with_comment_ids= was here
* | | | Switched to use `display:none` in extra_tags_for_form method.Gaelian Ditchburn2014-01-056-8/+14
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of `display:inline` with the content_tag call in the extra_tags_for_form method potentially causes display issues with some browsers, namely Internet Explorer. IE's behaviour of not collapsing the line height on divs with ostensibly no content means that the automatically added div containing the hidden authenticity_token, utf8 and _method form input tags may interfere with other visible form elements in certain circumstances. The use of `display:none` rather than `display:inline` fixes this problem. Fixes #6403