aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13105 from arunagw/jruby-gen-test-fixRafael Mendonça França2013-11-291-0/+3
|\ | | | | Fixes failing test for JRuby
| * Fixes failing test for JRubyArun Agrawal2013-11-291-0/+3
| | | | | | | | | | in JRuby FileUtils do not change current dir when moving files
* | add missing arel dependency to `active_record_master` bug report script.Yves Senn2013-11-291-0/+1
|/ | | | | | | | | | [ci skip]. This solves: ``` Could not find gem 'arel (~> 5.0.0) ruby', which is required by gem 'rails (>= 0) ruby', in any of the sources. ```
* Merge pull request #13092 from laurocaetano/improve_documentation_for_delegateRafael Mendonça França2013-11-291-0/+2
|\ | | | | Improve Module#delegate documentation.
| * Improve Module#delegate documentation to tell that delegate don't work with ↵Lauro Caetano2013-11-291-0/+2
| | | | | | | | private or protected methods. [ci skip]
* | Merge pull request #13104 from christophemaximin/fix_robots_txt_linkYves Senn2013-11-292-2/+2
|\ \ | | | | | | Fix URL to robots.txt documentation [ci skip]
| * | Fix URL to robots.txt documentationChristophe Maximin2013-11-292-2/+2
| | |
* | | Merge pull request #13097 from arunagw/jruby-test-fixesYves Senn2013-11-291-1/+7
|\ \ \ | |/ / |/| | Skipping debugger inclusion test if JRuby
| * | Checking no debugger on JRubyArun Agrawal2013-11-291-1/+7
| | | | | | | | | | | | fixes tests for JRuby
* | | Merge pull request #13102 from akshay-vishnoi/typoYves Senn2013-11-291-1/+1
|\ \ \ | | | | | | | | Typo fix
| * | | Typo fixAkshay Vishnoi2013-11-291-1/+1
| | | |
* | | | Remove unused variableRafael Mendonça França2013-11-291-1/+1
|/ / / | | | | | | | | | | | | This method is not using the block variable directly since it is calling yield
* | | Merge pull request #13095 from kuldeepaggarwal/test-case-updationYves Senn2013-11-292-9/+8
|\ \ \ | | | | | | | | removed unnecessary test case
| * | | updating options documentation for associationsKuldeep Aggarwal2013-11-292-9/+8
| | |/ | |/| | | | | | | removed unnecessary test case and improved test case for belongs_to having invalid options
* | | Merge pull request #13099 from kamipo/remove_case_sensitive_equality_operatorCarlos Antonio da Silva2013-11-291-4/+0
|\ \ \ | | | | | | | | Remove `DatabaseStatements#case_sensitive_equality_operator`. It has been deprecated already.
| * | | Remove `DatabaseStatements#case_sensitive_equality_operator`. It has been ↵Ryuta Kamizono2013-11-291-4/+0
| | |/ | |/| | | | | | | deprecated already.
* | | Merge pull request #13100 from akshay-vishnoi/f-refactorCarlos Antonio da Silva2013-11-291-3/+8
|\ \ \ | |/ / |/| | #type_cast - improve performance & readability
| * | #type_cast - improve performance & readabilityAkshay Vishnoi2013-11-291-3/+8
| | |
* | | Merge pull request #13093 from ccutrer/fix-mysql-version-checkYves Senn2013-11-282-2/+2
|\ \ \ | |_|/ |/| | fix mysql version check in rename_index
| * | fix mysql version check in rename_indexCody Cutrer2013-11-282-2/+2
|/ / | | | | | | also clarify native rename_index support is >= 5.7, not > 5.7
* | Merge pull request #13087 from bikramwp/masterRafael Mendonça França2013-11-281-1/+1
|\ \ | | | | | | Make it prominent that after_commit and after_rollback swallow exceptions.
| * | The section that mentions after_commit and after_rollback will swallow ↵Bikram2013-11-281-1/+1
|/ / | | | | | | exceptions should me made clear. Made that section to be a instead of a regular paragraph.
* | Merge pull request #13038 from ccutrer/mysql_rename_indexYves Senn2013-11-282-0/+12
|\ \ | | | | | | implement rename_index natively for MySQL > 5.7
| * | implement rename_index natively for MySQL > 5.7Cody Cutrer2013-11-282-0/+12
| | |
* | | Merge pull request #13084 from lihanli/series-singularize-fixYves Senn2013-11-282-4/+6
|\ \ \ | |/ / |/| | Fix an activesupport inflector test changing the inflector but not reverting all its changes afterwards
| * | wrap test that changes inflections in with_dupLihan Li2013-11-282-4/+6
| | |
* | | no need to explain bundler and rails new in the release notes. [ci skip]Yves Senn2013-11-281-35/+0
| | | | | | | | | | | | /cc @fxn
* | | delete obsolete KINDLE.md. Closes #13037. [ci skip].Yves Senn2013-11-281-26/+0
| | |
* | | first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip]Yves Senn2013-11-285-21/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract **notable changes**, **deprecations** and **removals** from each CHANGELOG. I tried to reference the commits and pull requests for new features and deprecations. In the process I also made some minor changes to the CHANGELOGS. The 4_1_release_notes guide is declared WIP.
* | | create 4.1 release notes guide scaffold. [ci skip]Yves Senn2013-11-283-0/+148
| | |
* | | 3.2 to 4.0 section in upgrading guide is no longer wip. [ci skip]Yves Senn2013-11-281-2/+0
| | |
* | | move "HTTP PATCH" paragraph into "Upgrading 3.2 -> 4.0". [ci skip]Yves Senn2013-11-281-9/+9
| | |
* | | remove duplicate sentence from AS changelog. [ci skip].Yves Senn2013-11-281-2/+1
|/ /
* | Do not create synonym named subjectsYasuo Honda2013-11-271-3/+0
| | | | | | | | | | | | | | because it is only used in `activerecord/test/cases/adapters/oracle/synonym_test.rb` See rails/rails#13054
* | Merge pull request #13054 from senny/remove_oracle_testsYves Senn2013-11-271-17/+0
|\ \ | | | | | | Remove leftover Oracle tests.
| * | the oracle adapter lives in a gem. Tests should live there as well.Yves Senn2013-11-261-17/+0
| | |
* | | Merge pull request #13083 from kuldeepaggarwal/typosRafael Mendonça França2013-11-271-1/+4
|\ \ \ | | | | | | | | fixed typo `destory` => `destroy` [ci skip]
| * | | fixed-case when invalid action name has passedKuldeep Aggarwal2013-11-281-0/+3
| | | |
| * | | fixed typo `destory` => `destroy` [ci skip]Kuldeep Aggarwal2013-11-281-1/+1
| | | |
* | | | Merge pull request #13082 from blowmage/deprecate_describeAaron Patterson2013-11-271-5/+12
|\ \ \ \ | | | | | | | | | | Deprecate ActiveSupport::TestCase.describe
| * | | | Deprecate ActiveSupport::TestCase.describeMike Moore2013-11-271-5/+12
|/ / / / | | | | | | | | | | | | | | | | Provide message to define ActiveSupport::TestCase.name instead. Allow calling describe with a block, which Minitest::Spec does.
* | | | Merge pull request #13079 from gregmolnar/inflector_docsXavier Noria2013-11-271-4/+0
|\ \ \ \ | |/ / / |/| | | [ci skip] removed singulars section from classify doc
| * | | [ci skip] removed singulars section from classify docGreg Molnar2013-11-271-4/+0
|/ / /
* | | Merge branch 'deprecate_numeric_since_ago' of ↵Jeremy Kemper2013-11-274-31/+58
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/chancancode/rails Conflicts: activesupport/CHANGELOG.md
| * | | Deprecated Numeric#{ago,until,since,from_now}Godfrey Chan2013-11-264-31/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user is expected to explicitly convert the value into an AS::Duration, i.e. `5.ago` => `5.seconds.ago` This will help to catch subtle bugs like: def recent?(days = 3) self.created_at >= days.ago end The above code would check if the model is created within the last 3 **seconds**. In the future, `Numeric#{ago,until,since,from_now}` should be removed completely, or throw some sort of errors to indicate there are no implicit conversion from `Numeric` to `AS::Duration`. Also fixed & refactor the test cases for Numeric#{ago,since} and AS::Duration#{ago,since}. The original test case had the assertion flipped and the purpose of the test wasn't very clear.
* | | | Merge pull request #13072 from kuldeepaggarwal/unwanted-codeXavier Noria2013-11-271-2/+5
|\ \ \ \ | | | | | | | | | | unnecessary checking of `size` with `second regex` if matched with former regex
| * | | | unnecessary checking of `size` with `second regex` if matched with first oneKuldeep Aggarwal2013-11-271-2/+5
| | | | |
* | | | | Merge pull request #13067 from sagarjunnarkar/getting_startedCarlos Antonio da Silva2013-11-271-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Link for "New Post" is added in Getting Started guide [ci skip]
| * | | | | Link for "New Post" is added in Getting Started guide [ci skip]Sagar Junnarkar2013-11-271-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | - Earlier(line number 862) it is said to add <%= link_to 'New post', new_post_path %> on posts index page before table tag. But when posts index page html is shown, "New Post" link is missing. So aaded "New Post" link in this commit
* | | | | Merge pull request #13068 from chancancode/drop_yajl_from_gemfileCarlos Antonio da Silva2013-11-271-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Dropped yajl from Gemfile