aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove mentions of deprecated callbacks on ActionDispatch::CallbacksChristoph Lupprich2017-05-281-3/+1
* | | | | | | | | | | | | Merge pull request #29146 from y-yagi/fix_29138Kasper Timm Hansen2017-05-282-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Correctly set user_supplied_options when there is no whitespace in option spe...yuuji.yaginuma2017-05-242-2/+15
* | | | | | | | | | | | | | Merge pull request #29108 from inopinatus/ujs-sgjs-ie9-supportKasper Timm Hansen2017-05-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix server-generated JS response processing on IE9 when using rails-ujs and r...Josh Goodall2017-05-171-1/+1
* | | | | | | | | | | | | | | Merge pull request #29074 from kamipo/remove_returning_true_in_internal_callb...Kasper Timm Hansen2017-05-283-13/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove returning true in internal callbacksRyuta Kamizono2017-05-143-13/+1
* | | | | | | | | | | | | | | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-2810-108/+295
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | AEAD encrypted cookies and sessionsMichael Coyne2017-05-2210-108/+295
* | | | | | | | | | | | | | | | | Merge pull request #29253 from kamipo/prevent_extra_queryMatthew Draper2017-05-292-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Prevent extra `current_database` query for `encoding`/`collation`/`ctype`Ryuta Kamizono2017-05-282-6/+12
* | | | | | | | | | | | | | | | | Merge pull request #28969 from kamipo/refactor_enum_to_use_value_instead_of_l...Matthew Draper2017-05-284-14/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Refactor enum to use `value` instead of `label` in the scopeRyuta Kamizono2017-05-074-14/+16
* | | | | | | | | | | | | | | | | | Merge pull request #29003 from kamipo/delegate_ast_and_locked_to_arel_explicitlyMatthew Draper2017-05-284-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Delegate `ast` and `locked` to `arel` explicitlyRyuta Kamizono2017-05-064-1/+13
* | | | | | | | | | | | | | | | | | Merge pull request #29097 from EilisHamilton/fix_uncountable_pluralization_lo...Matthew Draper2017-05-283-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \