aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | AppGenerator: allow both 'rake' and 'rails'claudiob2016-03-092-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit comes from the comments made by @matthewd at https://github.com/rails/rails/pull/23795/files#r54469637 and by @rafaelfranca at https://github.com/rails/rails/pull/23795/files#r54609364 The idea is that if you type (for example) "rake db:migrate" in an AppGenerator, then this should actually invoke `rake db:migrate` on the command line, whereas if you type "rails_command db:migrate", this should invoke `rails db:migrate`.
* | | Merge pull request #24062 from resure/redundant-escapesRafael França2016-03-082-2/+2
|\ \ \ | | | | | | | | Remove redundant regexp escapes in generators
| * | | Remove redundant regexp escapes in generatorsGadzhi Gadzhiev2016-03-082-2/+2
| | | |
* | | | Merge pull request #24108 from gsamokovarov/web-console-console-plugKasper Timm Hansen2016-03-081-1/+1
|\ \ \ \ | | | | | | | | | | Advertise the console web-console feature
| * | | | Advertise the console web-console featureGenadi Samokovarov2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the latest version of Web Console, you can call `console` anywhere in your application and get a console with that binding in it. I think this is worth advertising, as it may be useful to do outside of controllers and views. [ci skip]
* | | | | Fix the tests after e594000Genadi Samokovarov2016-03-081-2/+2
|/ / / /
* / / / Drop the explicit version requirements for web-consoleGenadi Samokovarov2016-03-082-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between major versions 2 and 3, we hit a bug. It's fixed in version 3, however, the explicit 2.x requirement of `~> '2.0'` will prevent people from getting the fix with `bundle update` and they would have to explicitly set the constraint to `~> '3.0'`. For more information see: rails/web-console#178. I propose we drop the explicit version constraints in the Gemfile. Web Console has been relatively stable for the past couple of years, and I don't anticipate any major alterations, like we saw between major versions 1 and 2.
* | | Merge pull request #23939 from akshaymohite/fix-configuration-tests-semanticsSean Griffin2016-03-071-2/+2
|\ \ \ | | | | | | | | Fixed semantics of couple of tests in the configuration_test.rb [ci skip]
| * | | Fixed couple of semantics in the configuration_test.rbAkshay2016-02-281-2/+2
| |/ /
* | | Merge pull request #24085 from vipulnsward/i18n-test-additionKasper Timm Hansen2016-03-061-1/+7
|\ \ \ | | | | | | | | i18n fallbacks test fixes
| * | | - Added i18n test to verify assigning hash directly to fallbacks instead of ↵Vipul A M2016-03-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | using map - Fixed test name for setting fallbacks to config.i18n.fallbacks = [{ :ca => :'es-ES' }]
* | | | prefer require_relative over require + File.expand_pathXavier Noria2016-03-064-4/+5
| | | | | | | | | | | | | | | | Reads much better doesn't it.
* | | | use __dir__ for relative paths in config/application.rbXavier Noria2016-03-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | use __dir__ for relative paths in config/boot.rbXavier Noria2016-03-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | use __dir__ to load the application in environment.rbXavier Noria2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | use __dir__ to load the environment in config.ruXavier Noria2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | Merge pull request #24070 from ↵Rafael França2016-03-052-13/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/remove_unnecessary_config_in_sprockets-rails-3 remove config that are no longer needed in sprockets-rails 3
| * | | | remove config that are no longer needed in sprockets-rails 3yuuji.yaginuma2016-03-052-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | `config.assets.raise_runtime_errors` and `config.assets.digest` are enabled by default in sprockets-rails 3.
* | | | | define APP_PATH with __dir__Xavier Noria2016-03-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | Defining paths relative to a file name has always hurt my soul, with __dir__ we can restore order in the Universe.
* | | | Fix indentation [ci skip]Ryuta Kamizono2016-03-051-1/+1
| | | | | | | | | | | | | | | | Follow up to #24050.
* | | | 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
| | |