aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23420 from y-yagi/move_api_test_to_appropriate_fileRafael França2016-02-022-11/+10
|\
| * move `test_generator_if_skip_action_cable_is_given_for_an_api_app` to the app...yuuji.yaginuma2016-02-022-11/+10
* | Generated engines should protect from forgeryAaron Patterson2016-02-012-3/+4
|/
* :warning: assigned but unused variable - errAkira Matsuda2016-02-021-2/+2
* Add some Action Cable CHANGELOG entriesRafael Mendonça França2016-02-011-3/+1
* Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-012-1/+6
* Add spaces in the braces.Kasper Timm Hansen2016-02-011-1/+1
* Merge pull request #23225 from vipulnsward/20420-rake-routes-optionsKasper Timm Hansen2016-02-012-4/+91
|\
| * Add options for rake routes taskVipul A M2016-02-022-4/+91
* | Merge pull request #23398 from matthewd/interlockMatthew Draper2016-02-021-1/+1
|\ \
| * | Always obtain the lock and do the unloadMatthew Draper2016-02-021-1/+1
* | | Merge pull request #23025 from yahonda/shorten_internal_metadata_table_name_l...Sean Griffin2016-02-012-3/+3
|\ \ \ | |_|/ |/| |
| * | Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadataYasuo Honda2016-02-012-3/+3
* | | Merge pull request #23057 from schneems/schneems/default-puma-configRichard Schneeman2016-02-015-3/+64
|\ \ \
| * | | Add Default Puma Configschneems2016-01-295-3/+64
* | | | Merge pull request #23385 from matthewd/default-subscription-adapterMatthew Draper2016-02-021-4/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use the in-process subscription adapter for development & testMatthew Draper2016-02-011-4/+2
* | | | Merge pull request #23381 from matthewd/uneventful-redisMatthew Draper2016-02-022-4/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Switch the default redis adapter to a single-stream modelMatthew Draper2016-02-012-4/+0
* | | | Merge pull request #23169 from y-yagi/rake_proxy_in_engineKasper Timm Hansen2016-01-315-39/+126
|\ \ \ \ | |_|/ / |/| | |
| * | | make rake proxy work in rails enginesyuuji.yaginuma2016-01-315-39/+126
* | | | Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-011-0/+3
|/ / /
* / / remove unnecessary gsub for `action_cable_meta_tag`yuuji.yaginuma2016-01-301-1/+0
|/ /
* | Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-templateRafael França2016-01-294-2/+42
|\ \
| * | Implemented pull request changes.Ryan Manuel2016-01-291-7/+5
| * | Update doc with appropriate issue and pull request versionsRyan Manuel2016-01-281-1/+1
| * | Add an after_bundle callback in Rails plugin templatesRyan Manuel2016-01-284-2/+44
* | | Revert "Revert "Eliminate the EventMachine dependency""Matthew Draper2016-01-301-2/+1
* | | Merge pull request #23220 from maclover7/fix-23215Richard Schneeman2016-01-281-6/+0
|\ \ \ | |/ / |/| |
| * | Remove empty lines in Rails development loggerJon Moss2016-01-241-6/+0
* | | Merge pull request #23237 from gsamokovarov/new-welcome-pageDavid Heinemeier Hansson2016-01-283-268/+65
|\ \ \
| * | | Introduce new welcome page for new projectsGenadi Samokovarov2016-01-263-268/+65
* | | | Revert "Eliminate the EventMachine dependency"David Heinemeier Hansson2016-01-271-1/+2
* | | | [ci skip] Don’t explicitly mention EventMachineclaudiob2016-01-252-2/+2
|/ / /
* | | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-251-1/+1
|\ \ \
| * | | bumping versionAaron Patterson2016-01-251-1/+1
* | | | Merge pull request #23212 from vipulnsward/bin-railsKasper Timm Hansen2016-01-249-95/+96
|\ \ \ \
| * | | | Be consistent in testing outputs from railties test and use /bin/rails everyw...Vipul A M2016-01-249-95/+96
| | |/ / | |/| |
* | | | Merge pull request #23152 from matthewd/actioncable-concurrentDavid Heinemeier Hansson2016-01-241-2/+1
|\ \ \ \
| * | | | Ditch the EM error logging helperMatthew Draper2016-01-241-2/+1
* | | | | Pare back default `index` option for the migration generatorPrathamesh Sonpatki2016-01-244-32/+13
|/ / / /
* / / / Rails::Generators::Actions#gem should work even if frozen string is passed as...Prathamesh Sonpatki2016-01-242-1/+9
|/ / /
* | / prevent --skip-action-cable from erroring when --api option is usedDave Riddle2016-01-222-1/+13
| |/ |/|
* | remove `per_form_csrf_tokens` initializer from Rails APIyuuji.yaginuma2016-01-222-0/+2
* | Merge pull request #23174 from JuanitoFatas/followup-skip-action-cableKasper Timm Hansen2016-01-222-0/+4
|\ \
| * | Remove action_cable_meta_tag when skip action_cableJuanitoFatas2016-01-222-0/+4
* | | Add `config/cable.yml` to list of default files in Rails generatorJon Moss2016-01-211-0/+1
|/ /
* | Merge pull request #23078 from y-yagi/add_application_mailer_rb_to_mountable_...Rafael França2016-01-214-1/+12
|\ \
| * | allow symbol to end of string in `wrap_in_modules`yuuji.yaginuma2016-01-162-5/+5
| * | add application_mailer.rb to template of mountable engineyuuji.yaginuma2016-01-153-0/+11