aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29187 from robin850/remove-mathnRafael França2017-05-303-9/+11
|\
| * Remove requirement on mathnRobin Dupret2017-05-303-9/+11
* | Merge pull request #29285 from SamSaffron/remove_therubyracerGuillermo Iguaran2017-05-304-4/+4
|\ \
| * | Replace therubyracer with mini_racerSam2017-05-304-4/+4
|/ /
* | Add next occur and previous occurred day of week API (#26600)Shota Iguchi2017-05-303-0/+42
* | Add an extra test showing why collections are cachedMatthew Draper2017-05-301-0/+7
* | Merge pull request #29098 from kamipo/fix_association_with_extension_issuesMatthew Draper2017-05-3012-34/+64
|\ \
| * | Extract `default_extensions` to avoid `klass.all`Ryuta Kamizono2017-05-302-1/+9
| * | Refactor `default_scoped` to avoid creating extra relation and mergingRyuta Kamizono2017-05-281-7/+2
| * | Cache the association proxy objectRyuta Kamizono2017-05-283-4/+13
| * | Fix association with extension issuesRyuta Kamizono2017-05-289-26/+44
* | | Merge pull request #29273 from kamipo/deserialize_raw_value_from_database_for...Rafael França2017-05-294-15/+15
|\ \ \
| * | | Deserialize a raw value from the database in `changed_in_place?` for `Abstrac...Ryuta Kamizono2017-05-304-15/+15
* | | | Merge pull request #29278 from kamipo/fix_uuid_column_with_null_true_and_defa...Rafael França2017-05-292-1/+11
|\ \ \ \
| * | | | Fix UUID column with `null: true` and `default: nil`Ryuta Kamizono2017-05-302-1/+11
* | | | | Merge pull request #29279 from pvalena/utf8_in_Secrets_testRafael França2017-05-292-2/+2
|\ \ \ \ \
| * | | | | Do not use UTF8 in test SecretsCommandTest#test_edit_secretsPavel Valena2017-05-302-2/+2
* | | | | | Merge pull request #29275 from koic/bump_rubocop_0_49_1Rafael França2017-05-291-1/+1
|\ \ \ \ \ \
| * | | | | | Bump RuboCop to 0.49.1Koichi ITO2017-05-301-1/+1
| | |/ / / / | |/| | | |
* | | | | | Grammar fixesJon Moss2017-05-291-2/+2
* | | | | | Fix indentation + remove blank lineJon Moss2017-05-291-4/+4
| |/ / / / |/| | | |
* | | | | Add backticksJon Moss2017-05-291-1/+1
* | | | | Grammar fixesJon Moss2017-05-291-2/+3
|/ / / /
* | | | Add missing "not" in the doc for `assert_no_changes` [ci skip]Ryuta Kamizono2017-05-301-1/+1
* | | | Remove extra block for `assert_changes` [ci skip]Ryuta Kamizono2017-05-301-1/+1
* | | | Merge pull request #29191 from bogdanvlviv/pass_params_filename_lineno_to_cla...Kasper Timm Hansen2017-05-292-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Pass params __FILE__ and __LINE__ + 1 if class_eval with <<bogdanvlviv2017-05-292-6/+6
| | |/ | |/|
* | | Merge pull request #29151 from onemanstartup/jquery_slim_fixGuillermo Iguaran2017-05-291-1/+1
|\ \ \
| * | | Check for jQuery ajaxDmitriy Plekhanov2017-05-191-1/+1
* | | | Merge pull request #29248 from yawboakye/rename-should-rename-table-pkeyGuillermo Iguaran2017-05-292-4/+28
|\ \ \ \
| * | | | `rename_table` renames primary key index nameYaw Boakye2017-05-292-4/+28
* | | | | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-2947-161/+111
* | | | | Merge pull request #26628 from mjhoy/fix-number-to-human-25742Eileen M. Uchitelle2017-05-295-30/+79
|\ \ \ \ \
| * | | | | number_to_human_converter: round before calculating exponentMichael Hoy2017-03-162-4/+8
| * | | | | number_to_rounded_converter: extract rounding logicMichael Hoy2017-03-163-26/+71
* | | | | | Doh. We are doing this on secrets:setup. Revert "Ignore the encrypted secrets...David Heinemeier Hansson2017-05-291-3/+0
* | | | | | Merge pull request #29266 from ojiry/add-elm-option-to-generator-descEileen M. Uchitelle2017-05-291-1/+1
|\ \ \ \ \ \
| * | | | | | Add elm option of webpack to generator descriptionRyoji Yoshioka2017-05-291-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #29264 from gsamokovarov/assert-changes-listingMatthew Draper2017-05-291-0/+2
|\ \ \ \ \ \
| * | | | | | List assert_{,no_}changes in the testing guideGenadi Samokovarov2017-05-291-0/+2
| |/ / / / /
* | | | | | Merge pull request #29265 from koic/remove_redundant_test_assertionMatthew Draper2017-05-291-6/+0
|\ \ \ \ \ \
| * | | | | | Remove a redundant test assertionKoichi ITO2017-05-291-6/+0
| |/ / / / /
* / / / / / Ignore the encrypted secrets key file that is created by rails secrets:setupDavid Heinemeier Hansson2017-05-291-0/+3
|/ / / / /
* | | | | Merge pull request #29208 from kamipo/default_env_fall_back_to_default_env_wh...Guillermo Iguaran2017-05-283-2/+13
|\ \ \ \ \
| * | | | | `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is a...Ryuta Kamizono2017-05-253-2/+13
* | | | | | Merge pull request #29262 from kamipo/deprecate_passing_arguments_with_block_...Guillermo Iguaran2017-05-283-2/+36
|\ \ \ \ \ \
| * | | | | | Deprecate passing arguments and block at the same time to `count` and `sum` i...Ryuta Kamizono2017-05-293-2/+36
|/ / / / / /
* | | | | | Merge pull request #29258 from koic/remove_redundant_command_recorder_testMatthew Draper2017-05-291-5/+0
|\ \ \ \ \ \
| * | | | | | Remove a redundant test case of command_recorder_testKoichi ITO2017-05-291-5/+0
* | | | | | | Merge pull request #29257 from clupprich/remove-action-dispatch-callbacks-to-...Kasper Timm Hansen2017-05-281-3/+1
|\ \ \ \ \ \ \