| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #24108 from gsamokovarov/web-console-console-plug | Kasper Timm Hansen | 2016-03-08 | 1 | -1/+1 |
| |\ | | | | | Advertise the console web-console feature | ||||
| | * | Advertise the console web-console feature | Genadi Samokovarov | 2016-03-08 | 1 | -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 e594000 | Genadi Samokovarov | 2016-03-08 | 1 | -2/+2 |
| |/ | |||||
| * | Drop the explicit version requirements for web-console | Genadi Samokovarov | 2016-03-08 | 2 | -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-semantics | Sean Griffin | 2016-03-07 | 1 | -2/+2 |
| |\ | | | | | Fixed semantics of couple of tests in the configuration_test.rb [ci skip] | ||||
| | * | Fixed couple of semantics in the configuration_test.rb | Akshay | 2016-02-28 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #24085 from vipulnsward/i18n-test-addition | Kasper Timm Hansen | 2016-03-06 | 1 | -1/+7 |
| |\ \ | | | | | | | i18n fallbacks test fixes | ||||
| | * | | - Added i18n test to verify assigning hash directly to fallbacks instead of ↵ | Vipul A M | 2016-03-06 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | using map - Fixed test name for setting fallbacks to config.i18n.fallbacks = [{ :ca => :'es-ES' }] | ||||
| * | | | prefer require_relative over require + File.expand_path | Xavier Noria | 2016-03-06 | 4 | -4/+5 |
| | | | | | | | | | | | | | Reads much better doesn't it. | ||||
| * | | | use __dir__ for relative paths in config/application.rb | Xavier Noria | 2016-03-06 | 2 | -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.rb | Xavier Noria | 2016-03-06 | 2 | -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.rb | Xavier Noria | 2016-03-06 | 1 | -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.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 | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |