aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Expand)AuthorAgeFilesLines
* 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-301-1/+1
* | Do not use UTF8 in test SecretsCommandTest#test_edit_secretsPavel Valena2017-05-301-1/+1
* | 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-281-2/+9
|\ \ \
| * | | Correctly set user_supplied_options when there is no whitespace in option spe...yuuji.yaginuma2017-05-241-2/+9
| |/ /
* | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-283-0/+9
|\ \ \
| * | | AEAD encrypted cookies and sessionsMichael Coyne2017-05-223-0/+9
| |/ /
* | | Includes namespace in system test skelton when namespace is specifiedyuuji.yaginuma2017-05-281-1/+1
* | | Do not show --webpack option in the plugin help messageash2017-05-262-4/+5
* | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-2621-29/+29
|\ \ \
| * | | Define path with __dir__bogdanvlviv2017-05-2321-29/+29
| |/ /
* | | Merge pull request #29195 from kaspth/rails-secrets-better-edit-exceptionKasper Timm Hansen2017-05-254-29/+59
|\ \ \
| * | | Reorder first secrets edit flow.Kasper Timm Hansen2017-05-254-28/+59
| * | | 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-184-24/+21
|/
* Update system test runner docseileencodes2017-05-142-8/+10
* Merge pull request #29010 from y-yagi/fix_28988Guillermo Iguaran2017-05-131-2/+14
|\
| * Allow irb options to be passed from `rails console` commandyuuji.yaginuma2017-05-081-2/+14
* | 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
| |/
* / Allow capybara minor releasesJustin Coyne2017-05-051-1/+1
|/
* 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-011-2/+3
|\
| * CLI arg `--port` has precedence over env `PORT`.koshigoe2017-05-011-2/+3
* | 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
|/
* Merge pull request #28896 from pschambacher/load_with_sharedRafael França2017-04-261-1/+8
|\
| * Added a shared section to config/database.yml that will be loaded for all env...Pierre Schambacher2017-04-261-1/+8
* | Merge pull request #28244 from ixti/improve/action-mailer-preview-paramsRafael França2017-04-262-4/+10
|\ \ | |/ |/|
| * Pass request params to ActionMailer::PreviewAlexey Zapparov2017-03-012-4/+10
* | Merge pull request #28839 from y-yagi/fix-yarn-exit-statusRafael França2017-04-251-2/+3
|\ \
| * | Ensure bin/yarn matches the one generated by webpackeryuuji.yaginuma2017-04-231-2/+3
* | | `respond_to_missing?` should be privateRyuta Kamizono2017-04-221-4/+4
|/ /
* | Namespace CSS selectors on error pagesJan Krutisch2017-04-203-18/+18
* | Merge pull request #28708 from y-yagi/dont_generate_system_test_filesRafael França2017-04-191-0/+4
|\ \
| * | Don't generate system test files if `skip_system_test` option is specifiedyuuji.yaginuma2017-04-121-0/+4
* | | Use released sass-rails instead of master versionRafael Mendonça França2017-04-191-1/+1