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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into unlock-minitest	Rafael Mendonça França	2017-06-02	68	-338/+459
\|\
\| *	Merge pull request #29303 from Empact/bin-pathname	Rafael França	2017-06-01	2	-4/+2
\| \|\
\| \| *	Remove the pathname dependency from bin/update and bin/setup	Ben Woosley	2017-05-31	2	-4/+2
\| * \|	Merge pull request #29314 from dskecse/replace-jquery_ujs-mention-with-rails-ujs	Kasper Timm Hansen	2017-06-01	1	-2/+2
\| \|\ \
\| \| * \|	Replace an outdated mention of `jquery_ujs` with `rails-ujs` [ci skip]	Dzianis Dashkevich	2017-06-01	1	-2/+2
\| \|/ /
\| * \|	Merge pull request #29312 from dskecse/fix-articles-layout-in-guides	Ryuta Kamizono	2017-06-02	1	-0/+1
\| \|\ \
\| \| * \|	Fix articles layout in guides by eliminating W3C validator warnings [ci skip]	Dzianis Dashkevich	2017-06-01	1	-0/+1
\| \|/ /
\| * \|	Merge pull request #29308 from koic/correct_a_has_many_association_test	Matthew Draper	2017-06-02	2	-1/+2
\| \|\ \
\| \| * \|	Correct a has_many association test	Koichi ITO	2017-06-01	2	-1/+2
\| \| \|/
\| * \|	Merge pull request #27413 from kamipo/simplify_assert_no_match_regex	Matthew Draper	2017-06-02	1	-14/+4
\| \|\ \
\| \| * \|	Simplify `assert_no_match %r{colname.*limit:}` regex	Ryuta Kamizono	2017-06-01	1	-14/+4
\| \|/ /
\| * \|	Merge pull request #29220 from kamipo/consolidate_database_specific_json_types	Matthew Draper	2017-06-01	11	-101/+122
\| \|\ \
\| \| * \|	Consolidate database specific JSON types to `Type::Json`	Ryuta Kamizono	2017-05-30	11	-101/+122
\| * \| \|	Merge pull request #29293 from kamipo/fix_sti_with_default_scope	Matthew Draper	2017-06-01	2	-2/+11
\| \|\ \ \
\| \| * \| \|	Fix `default_scoped` with defined `default_scope` on STI model	Ryuta Kamizono	2017-05-31	2	-2/+11
\| * \| \| \|	Merge pull request #29304 from kamipo/should_use_quote_for_string_literal	Matthew Draper	2017-06-01	1	-1/+1
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| \| * \| \|	Should use `quote` for a string literal	Ryuta Kamizono	2017-06-01	1	-1/+1
\| \|/ / /
\| * \| \|	Merge pull request #26634 from kamipo/extract_numeric_data	Rafael França	2017-05-31	5	-86/+81
\| \|\ \ \
\| \| * \| \|	Restore the override of numeric attributes properly	Ryuta Kamizono	2016-12-22	1	-0/+5
\| \| * \| \|	Extract `NumericDataTest` to `test/cases/numeric_data_test.rb`	Ryuta Kamizono	2016-12-22	2	-68/+71
\| \| * \| \|	Extract `NumericData` model for tests	Ryuta Kamizono	2016-09-27	4	-19/+6
\| * \| \| \|	Merge pull request #29296 from kamipo/delegate_extending_to_relation	Kasper Timm Hansen	2017-05-31	3	-1/+9
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Add missing `delegate :extending, to: :all`	Ryuta Kamizono	2017-06-01	3	-1/+9
\| \|/ / /
\| * \| \|	Merge pull request #29290 from koic/remove_redundant_habtm_associations_test	Matthew Draper	2017-05-31	1	-13/+0
\| \|\ \ \
\| \| * \| \|	Remove a redundant test case of HABTM_associations_test	Koichi ITO	2017-05-31	1	-13/+0
\| * \| \| \|	Merge pull request #29292 from vfonic/patch-1	Ryuta Kamizono	2017-05-31	1	-2/+2
\| \|\ \ \ \
\| \| * \| \| \|	Docs: Fix output representation [ci skip]	Viktor Fonic	2017-05-31	1	-2/+2
\| \|/ / / /
\| * \| \| \|	Merge pull request #29088 from greysteil/better-spacing-in-production-environ...	Matthew Draper	2017-05-31	1	-3/+4
\| \|\ \ \ \
\| \| * \| \| \|	Better spacing in environments/production.rb file	Grey Baker	2017-05-15	1	-3/+4
\| * \| \| \| \|	Merge pull request #29261 from kamipo/dont_expose_methods_and_attrs_for_inter...	Matthew Draper	2017-05-31	7	-29/+39
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| \| * \| \| \|	Don't expose methods and attrs for internal usage	Ryuta Kamizono	2017-05-30	7	-29/+39
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge pull request #28864 from yahonda/pg10_pg_sequences	Matthew Draper	2017-05-31	1	-1/+9
\| \|\ \ \ \
\| \| * \| \| \|	Support PostgreSQL 10 `pg_sequence`	Yasuo Honda	2017-05-30	1	-1/+9
\| \|/ / / /
\| * \| \| \|	Merge pull request #29187 from robin850/remove-mathn	Rafael França	2017-05-30	3	-9/+11
\| \|\ \ \ \
\| \| * \| \| \|	Remove requirement on mathn	Robin Dupret	2017-05-30	3	-9/+11
\| * \| \| \| \|	Merge pull request #29285 from SamSaffron/remove_therubyracer	Guillermo Iguaran	2017-05-30	4	-4/+4
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Replace therubyracer with mini_racer	Sam	2017-05-30	4	-4/+4
\| \|/ / / / /
\| * \| / / /	Add next occur and previous occurred day of week API (#26600)	Shota Iguchi	2017-05-30	3	-0/+42
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Add an extra test showing why collections are cached	Matthew Draper	2017-05-30	1	-0/+7
\| * \| \| \|	Merge pull request #29098 from kamipo/fix_association_with_extension_issues	Matthew Draper	2017-05-30	12	-34/+64
\| \|\ \ \ \
\| \| * \| \| \|	Extract `default_extensions` to avoid `klass.all`	Ryuta Kamizono	2017-05-30	2	-1/+9
\| \| * \| \| \|	Refactor `default_scoped` to avoid creating extra relation and merging	Ryuta Kamizono	2017-05-28	1	-7/+2
\| \| * \| \| \|	Cache the association proxy object	Ryuta Kamizono	2017-05-28	3	-4/+13
\| \| * \| \| \|	Fix association with extension issues	Ryuta Kamizono	2017-05-28	9	-26/+44
\| * \| \| \| \|	Merge pull request #29273 from kamipo/deserialize_raw_value_from_database_for...	Rafael França	2017-05-29	4	-15/+15
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Deserialize a raw value from the database in `changed_in_place?` for `Abstrac...	Ryuta Kamizono	2017-05-30	4	-15/+15
\| * \| \| \| \| \|	Merge pull request #29278 from kamipo/fix_uuid_column_with_null_true_and_defa...	Rafael França	2017-05-29	2	-1/+11
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Fix UUID column with `null: true` and `default: nil`	Ryuta Kamizono	2017-05-30	2	-1/+11
\| * \| \| \| \| \| \|	Merge pull request #29279 from pvalena/utf8_in_Secrets_test	Rafael França	2017-05-29	2	-2/+2
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Do not use UTF8 in test SecretsCommandTest#test_edit_secrets	Pavel Valena	2017-05-30	2	-2/+2