Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use __dir__ to load the environment in config.ru | Xavier Noria | 2016-03-06 | 1 | -1/+1 |
| | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c. | ||||
* | Merge pull request #24070 from ↵ | Rafael França | 2016-03-05 | 2 | -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 3 | yuuji.yaginuma | 2016-03-05 | 2 | -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 Noria | 2016-03-05 | 1 | -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 Kamizono | 2016-03-05 | 1 | -1/+1 |
| | | | | Follow up to #24050. | ||||
* | Merge pull request #24053 from mohitnatoo/rails-dev-cache | Kasper Timm Hansen | 2016-03-04 | 1 | -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 case | Mohit Natoo | 2016-03-04 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #24050 from mohitnatoo/rails-routes-railties | Kasper Timm Hansen | 2016-03-04 | 1 | -7/+7 |
|\ \ | | | | | | | [ci skip] correcting test case specifying `rails routes` instead of `rake routes` | ||||
| * | | making a test definition more clear. | Mohit Natoo | 2016-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | [ci skip] using correcting test case names specifying `rails routes` instead ↵ | Mohit Natoo | 2016-03-04 | 1 | -6/+6 |
| |/ | | | | | | | of `rake routes` | ||||
* / | [ci skip] correcting sentence in description of application.rb | Mohit Natoo | 2016-03-04 | 1 | -2/+1 |
|/ | | | | Adding period in the end. | ||||
* | Fix CHANGELOG spacing [ci skip] | Jeremy Daer | 2016-03-02 | 1 | -2/+2 |
| | |||||
* | Add test to make sure the sprockets cache is not shared per environment | Rafael Mendonça França | 2016-03-02 | 1 | -0/+20 |
| | |||||
* | Merge pull request #24001 from 5t111111/fix-gsub-cookies_serializer | Rafael França | 2016-03-02 | 2 | -2/+3 |
|\ | | | | | Fix description in cookies_serializer.rb being corrupted by gsub when updating | ||||
| * | Fix description in cookies_serializer.rb being corrupted when updating | Hirofumi Wakasugi | 2016-03-02 | 2 | -2/+3 |
| | | |||||
* | | Fix typo in app_generator_test.rb | Hirofumi Wakasugi | 2016-03-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #23932 from arthurnn/arthurnn/remove_load_paths | Arthur Nogueira Neves | 2016-03-01 | 3 | -16/+2 |
|\ | | | | | Remove load_paths file | ||||
| * | Remove load_paths file | Arthur Neves | 2016-02-27 | 3 | -16/+2 |
| | | |||||
* | | Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascript | Rafael França | 2016-03-01 | 5 | -12/+16 |
|\ \ | | | | | | | convert cable.coffee to cable.js | ||||
| * | | convert cable.coffee to cable.js | yuuji.yaginuma | 2016-02-28 | 5 | -12/+16 |
| |/ | | | | | | | In order to eliminate the dependecy of CoffeeScript. | ||||
* | | Merge pull request #23980 from rails/deprecate-controller-action-segments | Andrew White | 2016-03-01 | 1 | -1/+1 |
|\ \ | | | | | | | Deprecate :controller and :action path parameters | ||||
| * | | Deprecate :controller and :action path parameters | Andrew White | 2016-03-01 | 1 | -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_config | Rafael França | 2016-03-01 | 1 | -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` option | yuuji.yaginuma | 2016-03-01 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | Also remove duplicated `config.action_cable.url` config. | ||||
* | | | | Merge pull request #23986 from rubys/dedup-ctrlc-msg | Eileen M. Uchitelle | 2016-03-01 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | Delete CTRL-C message as is duplicates Puma | ||||
| * | | | | Delete CTRL-C message as is duplicates Puma | Sam Ruby | 2016-03-01 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Use AS::Executor / AS::Reloader to support reloading in ActionCable | Matthew Draper | 2016-03-02 | 1 | -6/+0 |
| | | | | | |||||
* | | | | | Publish AS::Executor and AS::Reloader APIs | Matthew Draper | 2016-03-02 | 6 | -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 twice | Rafael Mendonça França | 2016-03-01 | 1 | -1/+1 |
|/ / / | |||||
* / / | generate config/spring.rb in new applications [closes #18874] | Xavier Noria | 2016-02-29 | 4 | -0/+14 |
|/ / | |||||
* | | - Made changes to have test cases in actions_test more readable. | Mohit Natoo | 2016-02-29 | 1 | -6/+6 |
| | | | | | | | | Changed description with tests related to rails_command. | ||||
* | | - Made changes to have test cases in actions_test more readable. | Mohit Natoo | 2016-02-29 | 1 | -5/+5 |
| | | |||||
* | | Address ruby warnings | Teo Ljungberg | 2016-02-29 | 2 | -9/+9 |
| | | | | | | | | | | - Ambiguous first argument - Mismatched indentation | ||||
* | | Merge pull request #23929 from ↵ | Kasper Timm Hansen | 2016-02-28 | 1 | -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 run | Prathamesh Sonpatki | 2016-02-27 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #23921 from y-yagi/remove_rack_cors_initializer_when_updating | Arthur Nogueira Neves | 2016-02-27 | 2 | -0/+31 |
|\ \ | |/ |/| | remove rack cors initializer when updating | ||||
| * | remove rack cors initializer when updating | yuuji.yaginuma | 2016-02-27 | 2 | -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_rails | Kasper Timm Hansen | 2016-02-27 | 4 | -4/+23 |
|\ \ | | | | | | | Use app namespace for framework tasks | ||||
| * | | The tasks in the rails task namespace is deprecated in favor of app namespace. | Ryo Hashimoto | 2016-02-26 | 4 | -4/+23 |
| | | | | | | | | | | | | (e.g. `rails:update` and `rails:template` tasks is renamed to `app:update` and `app:template`.) | ||||
* | | | :scissors: | Rafael Mendonça França | 2016-02-26 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #23917 from chashmeetsingh/patch-1 | Rafael Mendonça França | 2016-02-26 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | | | | | Create tmp folder if not present | ||||
| * | | | Create tmp folder if not present | Chashmeet Singh | 2016-02-27 | 1 | -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 byebug | Ian Ker-Seymer | 2016-02-26 | 1 | -1/+1 |
|/ / | |||||
* / | [close #23681] Use puma 3.0.0+ | schneems | 2016-02-26 | 2 | -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-subdomains | Rafael França | 2016-02-25 | 4 | -0/+41 |
|\ | | | | | Enable HSTS with IncludeSubdomains header by default for new apps | ||||
| * | Add CHANGELOG entry | Prathamesh Sonpatki | 2016-02-25 | 1 | -0/+4 |
| | | |||||
| * | Old applications will not get the ssl_options initializer | Prathamesh Sonpatki | 2016-02-25 | 2 | -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 Sonpatki | 2016-02-25 | 1 | -0/+4 |
| | | | | | | | | | | | | subdomains - We will reuse config.ssl_options for setting the HSTS settings. | ||||
* | | Merge pull request #23846 from ↵ | Rafael França | 2016-02-25 | 1 | -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 engine | yuuji.yaginuma | 2016-02-25 | 1 | -0/+14 |
| | | | | | | | | Follow up to 1813b29fc7632959800252f36e4b2e6ed4ac7266 |