aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24053 from mohitnatoo/rails-dev-cacheKasper Timm Hansen2016-03-041-1/+1
|\ | | | | using rails dev:cache instead of rake dev:cache in test case
| * - using rails dev:cache instead of rake dev:cache in test caseMohit Natoo2016-03-041-1/+1
| |
* | Merge pull request #24050 from mohitnatoo/rails-routes-railtiesKasper Timm Hansen2016-03-041-7/+7
|\ \ | | | | | | [ci skip] correcting test case specifying `rails routes` instead of `rake routes`
| * | making a test definition more clear.Mohit Natoo2016-03-041-1/+1
| | |
| * | [ci skip] using correcting test case names specifying `rails routes` instead ↵Mohit Natoo2016-03-041-6/+6
| |/ | | | | | | of `rake routes`
* / [ci skip] correcting sentence in description of application.rbMohit Natoo2016-03-041-2/+1
|/ | | | Adding period in the end.
* Fix CHANGELOG spacing [ci skip]Jeremy Daer2016-03-021-2/+2
|
* Add test to make sure the sprockets cache is not shared per environmentRafael Mendonça França2016-03-021-0/+20
|
* Merge pull request #24001 from 5t111111/fix-gsub-cookies_serializerRafael França2016-03-022-2/+3
|\ | | | | Fix description in cookies_serializer.rb being corrupted by gsub when updating
| * Fix description in cookies_serializer.rb being corrupted when updatingHirofumi Wakasugi2016-03-022-2/+3
| |
* | Fix typo in app_generator_test.rbHirofumi Wakasugi2016-03-021-1/+1
|/
* Merge pull request #23932 from arthurnn/arthurnn/remove_load_pathsArthur Nogueira Neves2016-03-013-16/+2
|\ | | | | Remove load_paths file
| * Remove load_paths fileArthur Neves2016-02-273-16/+2
| |
* | Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascriptRafael França2016-03-015-12/+16
|\ \ | | | | | | convert cable.coffee to cable.js
| * | convert cable.coffee to cable.jsyuuji.yaginuma2016-02-285-12/+16
| |/ | | | | | | In order to eliminate the dependecy of CoffeeScript.
* | Merge pull request #23980 from rails/deprecate-controller-action-segmentsAndrew White2016-03-011-1/+1
|\ \ | | | | | | Deprecate :controller and :action path parameters
| * | Deprecate :controller and :action path parametersAndrew White2016-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Allowing :controller and :action values to be specified via the path in config/routes.rb has been an underlying cause of a number of issues in Rails that have resulted in security releases. In light of this it's better that controllers and actions are explicitly whitelisted rather than trying to blacklist or sanitize 'bad' values.
* | | Merge pull request #23981 from y-yagi/do_not_set_action_cable_configRafael França2016-03-011-4/+3
|\ \ \ | | | | | | | | do not set Action Cable's config when specify `--skip-action-cable` option
| * | | do not set Action Cable's config when specify `--skip-action-cable` optionyuuji.yaginuma2016-03-011-4/+3
| | | | | | | | | | | | | | | | Also remove duplicated `config.action_cable.url` config.
* | | | Merge pull request #23986 from rubys/dedup-ctrlc-msgEileen M. Uchitelle2016-03-011-2/+0
|\ \ \ \ | | | | | | | | | | Delete CTRL-C message as is duplicates Puma
| * | | | Delete CTRL-C message as is duplicates PumaSam Ruby2016-03-011-2/+0
| | | | |
* | | | | Use AS::Executor / AS::Reloader to support reloading in ActionCableMatthew Draper2016-03-021-6/+0
| | | | |
* | | | | Publish AS::Executor and AS::Reloader APIsMatthew Draper2016-03-026-63/+78
|/ / / / | | | | | | | | | | | | | | | | | | | | These should allow external code to run blocks of user code to do "work", at a similar unit size to a web request, without needing to get intimate with ActionDipatch.
* / / / Mock fork twiceRafael Mendonça França2016-03-011-1/+1
|/ / /
* / / generate config/spring.rb in new applications [closes #18874]Xavier Noria2016-02-294-0/+14
|/ /
* | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-6/+6
| | | | | | | | Changed description with tests related to rails_command.
* | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-5/+5
| |
* | Address ruby warningsTeo Ljungberg2016-02-292-9/+9
| | | | | | | | | | - Ambiguous first argument - Mismatched indentation
* | Merge pull request #23929 from ↵Kasper Timm Hansen2016-02-281-2/+2
|\ \ | |/ |/| | | | | prathamesh-sonpatki/update-deprecation-message-for-app-namespace Update deprecation message shown when tasks from rails namespace are run
| * Update deprecation message shown when tasks from rails namespace are runPrathamesh Sonpatki2016-02-271-2/+2
| |
* | Merge pull request #23921 from y-yagi/remove_rack_cors_initializer_when_updatingArthur Nogueira Neves2016-02-272-0/+31
|\ \ | |/ |/| remove rack cors initializer when updating
| * remove rack cors initializer when updatingyuuji.yaginuma2016-02-272-0/+31
| | | | | | | | Rack cors initializer is only necessary to API-only applications, for when the update is unnecessary.
* | Merge pull request #23439 from ryohashimoto/160203_rake_railsKasper Timm Hansen2016-02-274-4/+23
|\ \ | | | | | | Use app namespace for framework tasks
| * | The tasks in the rails task namespace is deprecated in favor of app namespace.Ryo Hashimoto2016-02-264-4/+23
| | | | | | | | | | | | (e.g. `rails:update` and `rails:template` tasks is renamed to `app:update` and `app:template`.)
* | | :scissors:Rafael Mendonça França2016-02-261-2/+2
| | |
* | | Merge pull request #23917 from chashmeetsingh/patch-1Rafael Mendonça França2016-02-261-1/+3
|\ \ \ | | | | | | | | | | | | Create tmp folder if not present
| * | | Create tmp folder if not presentChashmeet Singh2016-02-271-1/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Apps may not have a tmp folder Update dev.rake Update dev.rake Update dev.rake Update dev.rake Update dev.rake Update dev.rake Update dev.rake
* / | Specify plaform: :mri for byebugIan Ker-Seymer2016-02-261-1/+1
|/ /
* / [close #23681] Use puma 3.0.0+ schneems2016-02-262-1/+6
|/ | | | | Puma 3.0 and up introduced compatibility to read from `config/puma.rb` when booting from the command `$ rails server`https://github.com/puma/puma/pull/856.
* Merge pull request #23852 from prathamesh-sonpatki/hsts-subdomainsRafael França2016-02-254-0/+41
|\ | | | | Enable HSTS with IncludeSubdomains header by default for new apps
| * Add CHANGELOG entryPrathamesh Sonpatki2016-02-251-0/+4
| |
| * Old applications will not get the ssl_options initializerPrathamesh Sonpatki2016-02-252-0/+33
| | | | | | | | | | - We will remove the initializer for old apps which are migrated to Rails 5 so that they are not affected by this breaking change.
| * New applications will be generated with ssl_options to enable HSTS with ↵Prathamesh Sonpatki2016-02-251-0/+4
| | | | | | | | | | | | subdomains - We will reuse config.ssl_options for setting the HSTS settings.
* | Merge pull request #23846 from ↵Rafael França2016-02-251-0/+14
|\ \ | |/ |/| | | | | y-yagi/correctly_check_ApplicationRecord_in_mountable_engine correctly check `ApplicationRecord` is exist in moutable engine
| * correctly check `ApplicationRecord` is exist in moutable engineyuuji.yaginuma2016-02-251-0/+14
| | | | | | | | Follow up to 1813b29fc7632959800252f36e4b2e6ed4ac7266
* | Merge pull request #23863 from delftswa2016/fix-readme-headingJon Moss2016-02-241-1/+1
|\ \ | | | | | | Fix README heading according to Markdown conventions
| * | Fix title of README according to Markdown conventionsAaron Ang2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The first heading in some README's are indicated using a second level heading (`##`), which in my opinion is of incorrect structure. Therefore, in this patch I changed the first heading to a first level heading (`#`) in README's where this incorrect structure occurs. [ci skip]
* | | Only open Action Cable connection if data is being sentJon Moss2016-02-241-5/+3
| | |
* | | Enable Action Cable routes by defaultJon Moss2016-02-245-10/+5
| | | | | | | | | | | | This also marks Action Cable routes as internal to Rails.
* | | Don't put config.action_mailer.perform_caching entry twice in development.rbPrathamesh Sonpatki2016-02-241-8/+2
| | |