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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Clarify i18n active[model/record] key differences	James Coleman	2015-11-11	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I spent a decent amount of time the other day trying to figure out why my active model including class wasn't generating the properly localized validation messages, and a note like this would have saved me a lot of time.
\| * \| \| \| \| \|	fast and consistent return when local_cache does not exist	Michael Grosser	2015-11-11	1	-9/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	modernizes the test definitions in the file monitors suite	Xavier Noria	2015-11-11	1	-16/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	applies code style guidelines	Xavier Noria	2015-11-11	5	-14/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	simplifies the implementation of #watching?	Xavier Noria	2015-11-11	1	-16/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	simplifies directories_to_watch	Xavier Noria	2015-11-11	1	-7/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	registers these changes in the CHANGELOGs	Xavier Noria	2015-11-11	2	-0/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	adds a comment about how does filter_out_descendants preserve order	Xavier Noria	2015-11-11	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	rewrites bare loop as until	Xavier Noria	2015-11-11	1	-3/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	simplifies the implementation of existing parent	Xavier Noria	2015-11-10	1	-13/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	indents private methods as per our guidelines	Xavier Noria	2015-11-10	1	-28/+28
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	encapsulates the logic to choose the file monitor in app config	Xavier Noria	2015-11-10	1	-1/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	renames the module with shared tests for file monitors	Xavier Noria	2015-11-10	3	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	simplifies PathHelper with a Pathname refinement	Xavier Noria	2015-11-10	1	-22/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	the evented monitor filters out descendants	Xavier Noria	2015-11-10	2	-10/+66
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	better tmp file management in the monitors suite	Xavier Noria	2015-11-10	1	-36/+88
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	adds another test case in the monitors suite	Xavier Noria	2015-11-10	1	-1/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	editorial pass over test method names	Xavier Noria	2015-11-09	1	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	improves waiting in the file monitors suite	Xavier Noria	2015-11-09	3	-23/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	adds more tests for the file monitors	Xavier Noria	2015-11-09	1	-0/+60
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	s/watcher/checker/g	Xavier Noria	2015-11-08	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"checker" is the name being used everywhere.
\| * \| \| \| \| \|	more ad-hoc sleeps	Xavier Noria	2015-11-08	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This sucks, but otherwise I get occasional Fs on Mac OS X.
\| * \| \| \| \| \|	create the tmpdir under test	Xavier Noria	2015-11-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mac OS X tries by all means to hide that /var is /private/var, and that is what FSEvents reports back.
\| * \| \| \| \| \|	encapsulate sleep margin when touching files	Xavier Noria	2015-11-08	1	-5/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	renames the monitor creation helper	Xavier Noria	2015-11-08	3	-11/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	refactors the file monitors test suite	Xavier Noria	2015-11-08	3	-57/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In particular files are no longer created in the current working directory, but in a temporary folder.
\| * \| \| \| \| \|	let listen stop all listeners on teardown	Xavier Noria	2015-11-08	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	s/@modified/@updated/g	Xavier Noria	2015-11-08	1	-6/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	stop ascending at the longest common subpath	Xavier Noria	2015-11-08	2	-33/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit also bases everything on Pathname internally.
\| * \| \| \| \| \|	remove unused constants in the file monitor suites	Xavier Noria	2015-11-08	2	-4/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	upgrade listen to 3.0.4	Xavier Noria	2015-11-08	4	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3.0.3 has a bug in OS X.
\| * \| \| \| \| \|	document the evented file system monitor opt-in in the config guide [ci skip]	Xavier Noria	2015-11-08	1	-0/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove explicit File.expand_path call	Xavier Noria	2015-11-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	no need to have access to the listener	Xavier Noria	2015-11-08	1	-4/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	move the listen gem in the Gemfile to the development group	Xavier Noria	2015-11-08	1	-3/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	revises the implementation of the evented file monitor	Xavier Noria	2015-11-08	1	-24/+65
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	initial edit pass over the evented file checker patch	Xavier Noria	2015-11-08	3	-41/+67
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	implements an evented file update checker [Puneet Agarwal]	Xavier Noria	2015-11-08	9	-104/+218
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the implementation of the file update checker written by Puneet Agarwal for GSoC 2015 (except for the tiny version of the listen gem, which was 3.0.2 in the original patch). Puneet's branch became too out of sync with upstream. This is the final work in one single clean commit. Credit goes in the first line using a convention understood by the contrib app.
* \| \| \| \| \| \|	Merge pull request #22255 from reaperhulk/key-derivation	Rafael França	2015-11-11	1	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	update docs for MessageEncryptor#new to recommend a KDF [ci skip]
\| * \| \| \| \| \|	update docs for MessageEncryptor#new to recommend a KDF [ci skip]	Paul Kehrer	2015-11-10	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #22216 from grosser/grosser/fast-ret	Rafael França	2015-11-10	1	-9/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fast and consistent return when local_cache does not exist
\| * \| \| \| \| \|	fast and consistent return when local_cache does not exist	Michael Grosser	2015-11-07	1	-9/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #22244 from pacso/time-days-in-year	Andrew White	2015-11-10	3	-0/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add days_in_year method to Time class
\| * \| \| \| \| \| \|	Add days_in_year method	Jon Pascoe	2015-11-10	3	-0/+30
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #22190 from 1st8/fix/week-field-week-number	Andrew White	2015-11-10	3	-5/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix week_field returning invalid value
\| * \| \| \| \| \| \|	Fix week_field returning invalid value	Christoph	2015-11-10	3	-5/+16
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to the W3 spec[1] the value should use a 1-based index and not a 0-based index for the week number. [1]: http://www.w3.org/TR/html-markup/datatypes.html#form.data.week
* \| \| \| \| \| \|	Merge pull request #22237 from yukas/patch-1	Kasper Timm Hansen	2015-11-09	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Minor fix in Module#mattr_reader documentation
\| * \| \| \| \| \|	Minor fix in Module#mattr_reader documentation	Yuri Kasperovich	2015-11-09	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #22155 from jcoleman/patch-1	Eileen M. Uchitelle	2015-11-09	1	-0/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Clarify i18n active[model/record] key differences
\| * \| \| \| \|	Clarify i18n active[model/record] key differences	James Coleman	2015-11-08	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I spent a decent amount of time the other day trying to figure out why my active model including class wasn't generating the properly localized validation messages, and a note like this would have saved me a lot of time.