aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into unlock-minitestRafael Mendonça França2017-06-027-11/+10
|\
| * Remove the pathname dependency from bin/update and bin/setupBen Woosley2017-05-312-4/+2
| * Merge pull request #29088 from greysteil/better-spacing-in-production-environ...Matthew Draper2017-05-311-3/+4
| |\
| | * Better spacing in environments/production.rb fileGrey Baker2017-05-151-3/+4
| * | Replace therubyracer with mini_racerSam2017-05-302-2/+2
| * | Do not use UTF8 in test SecretsCommandTest#test_edit_secretsPavel Valena2017-05-302-2/+2
* | | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-05-2975-254/+549
|\| |
| * | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-292-6/+5
| * | 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
| * | | 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-281-1/+1
| |\ \
| | * | `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is a...Ryuta Kamizono2017-05-251-1/+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 #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-284-9/+93
| |\ \ \
| | * | | AEAD encrypted cookies and sessionsMichael Coyne2017-05-224-9/+93
| | |/ /
| * | | Make reset execution assertions easier to read.Kasper Timm Hansen2017-05-281-15/+11
| * | | Includes namespace in system test skelton when namespace is specifiedyuuji.yaginuma2017-05-282-1/+6
| * | | Use models to match the docs.Kasper Timm Hansen2017-05-271-1/+1
| * | | Merge pull request #29238 from ashishg-qburst/generatorRafael França2017-05-262-4/+5
| |\ \ \
| | * | | Do not show --webpack option in the plugin help messageash2017-05-262-4/+5
| * | | | ActiveSupport::CurrentAttributes provides a thread-isolated attributes single...David Heinemeier Hansson2017-05-261-0/+88
| |/ / /
| * | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-2634-53/+53
| |\ \ \
| | * | | Define path with __dir__bogdanvlviv2017-05-2334-53/+53
| | |/ /
| * | | Remove redundant test methodAndy Atkinson2017-05-251-7/+1
| * | | Merge pull request #29195 from kaspth/rails-secrets-better-edit-exceptionKasper Timm Hansen2017-05-255-34/+61
| |\ \ \
| | * | | Reorder first secrets edit flow.Kasper Timm Hansen2017-05-255-33/+61
| | * | | Remove needless waiting message.Kasper Timm Hansen2017-05-231-1/+0
| | |/ /
| * | | We dont actually use the ultra short-hand, so no need to complicate things wi...David Heinemeier Hansson2017-05-241-1/+1
| * | | Slim down the source definitionDavid Heinemeier Hansson2017-05-241-5/+1
| |/ /
| * | Unused variableDavid Heinemeier Hansson2017-05-201-1/+0
| * | Use recyclable cache keys (#29092)David Heinemeier Hansson2017-05-187-28/+28
| |/
| * Update system test runner docseileencodes2017-05-142-8/+10
| * Merge pull request #29010 from y-yagi/fix_28988Guillermo Iguaran2017-05-133-6/+32
| |\
| | * Allow irb options to be passed from `rails console` commandyuuji.yaginuma2017-05-083-6/+32
| * | rake -T should load development env by default, not testTimo Kilpilehto2017-05-101-1/+1
| * | Merge pull request #29022 from y-yagi/allow_to_receive_arbitrary_arguments_in...Matthew Draper2017-05-101-1/+1
| |\ \
| | * | Allow to receive arbitrary arguments in `aggregated_results`yuuji.yaginuma2017-05-101-1/+1
| | |/
| * | Merge pull request #28995 from jcoyne/update_capybaraMatthew Draper2017-05-091-1/+1
| |\ \ | | |/ | |/|
| | * Allow capybara minor releasesJustin Coyne2017-05-051-1/+1
| * | Should escape meta characters in regexpRyuta Kamizono2017-05-0711-75/+75
| |/
| * Move `package.json` creation to `create_root_files`yuuji.yaginuma2017-05-041-4/+5
| * Merge pull request #28943 from koshigoe/port-arg-has-precedence-over-env-varRafael França2017-05-012-2/+15
| |\
| | * CLI arg `--port` has precedence over env `PORT`.koshigoe2017-05-012-2/+15
| * | Merge pull request #28939 from kirs/maintain_test_schema_friendlyAndrew White2017-05-011-1/+6
| |\ \
| | * | Friendly maintain schema failureKir Shatrov2017-04-301-1/+6
| | |/
| * / Remove unnecessary `package.json` deletionyuuji.yaginuma2017-05-011-4/+0
| |/
| * Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-04-301-1/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:08:17 +0000