rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Improve AR changelog [ci skip]	Carlos Antonio da Silva	2013-11-30	1	-9/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #13111 from akshay-vishnoi/typo	Carlos Antonio da Silva	2013-11-30	5	-7/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| / / \| \| \|_\|_\|/ / \| \|/\| \| \| \|	Typo fixes [ci skip]
\| * \| \| \| \|	Typo fixes [ci skip]	Akshay Vishnoi	2013-11-30	5	-7/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #13107 from chancancode/has_one_counter_cache_should_raise	Yves Senn	2013-11-30	5	-2/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise `ArgumentError` when `has_one` is used with `counter_cache`
\| * \| \| \| \| \|	Raise `ArgumentError` when `has_one` is used with `counter_cache`	Godfrey Chan	2013-11-29	5	-2/+25
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, the `has_one` macro incorrectly accepts the `counter_cache` option due to a bug, although that options was never supported nor functional on `has_one` and `has_one ... through` relationships. It now correctly raises an `ArgumentError` when passed that option. For reference, this bug was introduced in 52f8e4b9.
* \| \| \| \| \|	Merge pull request #13105 from arunagw/jruby-gen-test-fix	Rafael Mendonça França	2013-11-29	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes failing test for JRuby
\| * \| \| \| \| \|	Fixes failing test for JRuby	Arun Agrawal	2013-11-29	1	-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 Senn	2013-11-29	1	-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_delegate	Rafael Mendonça França	2013-11-29	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Module#delegate documentation.
\| * \| \| \| \| \|	Improve Module#delegate documentation to tell that delegate don't work with ↵	Lauro Caetano	2013-11-29	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	private or protected methods. [ci skip]
* \| \| \| \| \| \|	Merge pull request #13104 from christophemaximin/fix_robots_txt_link	Yves Senn	2013-11-29	2	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix URL to robots.txt documentation [ci skip]
\| * \| \| \| \| \| \|	Fix URL to robots.txt documentation	Christophe Maximin	2013-11-29	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #13097 from arunagw/jruby-test-fixes	Yves Senn	2013-11-29	1	-1/+7
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Skipping debugger inclusion test if JRuby
\| * \| \| \| \| \| \|	Checking no debugger on JRuby	Arun Agrawal	2013-11-29	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes tests for JRuby
* \| \| \| \| \| \| \|	Merge pull request #13102 from akshay-vishnoi/typo	Yves Senn	2013-11-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|	Typo fix
\| * \| \| \| \| \| \|	Typo fix	Akshay Vishnoi	2013-11-29	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove unused variable	Rafael Mendonça França	2013-11-29	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method is not using the block variable directly since it is calling yield
* \| \| \| \| \| \|	Merge pull request #13095 from kuldeepaggarwal/test-case-updation	Yves Senn	2013-11-29	2	-9/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed unnecessary test case
\| * \| \| \| \| \| \|	updating options documentation for associations	Kuldeep Aggarwal	2013-11-29	2	-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_operator	Carlos Antonio da Silva	2013-11-29	1	-4/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `DatabaseStatements#case_sensitive_equality_operator`. It has been deprecated already.
\| * \| \| \| \| \| \|	Remove `DatabaseStatements#case_sensitive_equality_operator`. It has been ↵	Ryuta Kamizono	2013-11-29	1	-4/+0
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deprecated already.
* \| \| \| \| \| \|	Merge pull request #13100 from akshay-vishnoi/f-refactor	Carlos Antonio da Silva	2013-11-29	1	-3/+8
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	#type_cast - improve performance & readability
\| * \| \| \| \| \|	#type_cast - improve performance & readability	Akshay Vishnoi	2013-11-29	1	-3/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #13093 from ccutrer/fix-mysql-version-check	Yves Senn	2013-11-28	2	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	fix mysql version check in rename_index
\| * \| \| \| \| \|	fix mysql version check in rename_index	Cody Cutrer	2013-11-28	2	-2/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also clarify native rename_index support is >= 5.7, not > 5.7
* \| \| \| \| \|	Merge pull request #13087 from bikramwp/master	Rafael Mendonça França	2013-11-28	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it prominent that after_commit and after_rollback swallow exceptions.
\| * \| \| \| \| \|	The section that mentions after_commit and after_rollback will swallow ↵	Bikram	2013-11-28	1	-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_index	Yves Senn	2013-11-28	2	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	implement rename_index natively for MySQL > 5.7
\| * \| \| \| \| \|	implement rename_index natively for MySQL > 5.7	Cody Cutrer	2013-11-28	2	-0/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #13084 from lihanli/series-singularize-fix	Yves Senn	2013-11-28	2	-4/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Fix an activesupport inflector test changing the inflector but not reverting all its changes afterwards
\| * \| \| \| \| \|	wrap test that changes inflections in with_dup	Lihan Li	2013-11-28	2	-4/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	no need to explain bundler and rails new in the release notes. [ci skip]	Yves Senn	2013-11-28	1	-35/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/cc @fxn
* \| \| \| \| \| \|	delete obsolete KINDLE.md. Closes #13037. [ci skip].	Yves Senn	2013-11-28	1	-26/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip]	Yves Senn	2013-11-28	5	-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 Senn	2013-11-28	3	-0/+148
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	3.2 to 4.0 section in upgrading guide is no longer wip. [ci skip]	Yves Senn	2013-11-28	1	-2/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	move "HTTP PATCH" paragraph into "Upgrading 3.2 -> 4.0". [ci skip]	Yves Senn	2013-11-28	1	-9/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	remove duplicate sentence from AS changelog. [ci skip].	Yves Senn	2013-11-28	1	-2/+1
\|/ / / / / /
* \| \| \| \| \|	Do not create synonym named subjects	Yasuo Honda	2013-11-27	1	-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_tests	Yves Senn	2013-11-27	1	-17/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove leftover Oracle tests.
\| * \| \| \| \| \|	the oracle adapter lives in a gem. Tests should live there as well.	Yves Senn	2013-11-26	1	-17/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #13083 from kuldeepaggarwal/typos	Rafael Mendonça França	2013-11-27	1	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed typo `destory` => `destroy` [ci skip]
\| * \| \| \| \| \| \|	fixed-case when invalid action name has passed	Kuldeep Aggarwal	2013-11-28	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed typo `destory` => `destroy` [ci skip]	Kuldeep Aggarwal	2013-11-28	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #13082 from blowmage/deprecate_describe	Aaron Patterson	2013-11-27	1	-5/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecate ActiveSupport::TestCase.describe
\| * \| \| \| \| \| \| \|	Deprecate ActiveSupport::TestCase.describe	Mike Moore	2013-11-27	1	-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_docs	Xavier Noria	2013-11-27	1	-4/+0
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	[ci skip] removed singulars section from classify doc
\| * \| \| \| \| \| \|	[ci skip] removed singulars section from classify doc	Greg Molnar	2013-11-27	1	-4/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'deprecate_numeric_since_ago' of ↵	Jeremy Kemper	2013-11-27	4	-31/+58
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/chancancode/rails Conflicts: activesupport/CHANGELOG.md
\| * \| \| \| \| \| \|	Deprecated Numeric#{ago,until,since,from_now}	Godfrey Chan	2013-11-26	4	-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.