aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26224 from jonatack/consistent-asset-precompile-examplesEileen M. Uchitelle2016-08-191-2/+3
|\ | | | | Consistent examples and template for assets#precompile
| * Consistent examples and template for assets#precompileJon Atack2016-08-191-2/+3
| | | | | | | | | | | | | | | | Listening to a few developers today discussing their troubles in understanding how to use the asset pipeline, it turns out that the precompile examples in the guides and assets.rb template have over time become a bit inconsistent. This PR makes the examples consistent in code style, spacing, and asset names, removes the old 'swfObject.js' example, and in a couple of places wraps lines at 80 characters including in the assets.rb template. Re-add spaces inside array parentheses.
* | run `before_configuration` callbacks as soon as application constant ↵yuuji.yaginuma2016-08-193-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | inherits from Rails::Application Until Rails 4.1, `before_configuration` run as soon as the application constant inherits from `Rails::Application`. However, in d25fe31c40928712b5e08fe0afb567c3bc88eddf, it has been modified to run at instantiation process. This modify to `before_configuration` is run at same timing as to Rails 4.1. Fixes #19880
* | refactor `CommandsTasks`yuuji.yaginuma2016-08-174-164/+132
| | | | | | | | | | Extract a common method of `Rails::CommandsTasks` and `Rails::Engine::CommandsTasks` to the module.
* | Merge pull request #26157 from ↵Rafael França2016-08-162-0/+2
|\ \ | | | | | | | | | | | | y-yagi/remove_test_mailers_when_skipping_action-mailer remove "test/mailers" directory when skipping action-mailer
| * | remove "test/mailers" directory when skipping action-maileryuuji.yaginuma2016-08-142-0/+2
| |/ | | | | | | Related to #26146
* | Merge pull request #26130 from yui-knk/drop_tableRafael França2016-08-161-1/+3
|\ \ | | | | | | Drop a temporary table before end of a test case
| * | Drop a temporary table before end of a test caseyui-knk2016-08-141-1/+3
| | |
* | | Add three new rubocop rulesRafael Mendonça França2016-08-1637-108/+108
| |/ |/| | | | | | | | | | | | | Style/SpaceBeforeBlockBraces Style/SpaceInsideBlockBraces Style/SpaceInsideHashLiteralBraces Fix all violations in the repository.
* | Ensure app/mailers is removed when skipping action-mailerBrian Cardarella2016-08-122-0/+2
| | | | | | | | Closes #26145
* | Make cache max-age durations self-explanatoryNathan Long2016-08-122-2/+2
|/
* Integration test to prevent regression for the 5th timeAaron Patterson2016-08-111-0/+47
| | | | | | | | Fix unsafe query generation risk. Redo of CVE-2012-2660, CVE-2012-2694 and CVE-2013-0155 CVE-2016-6317
* add missing require rakeyuuji.yaginuma2016-08-112-0/+26
| | | | | In ff8035dfeed8c86594c32ef8e9204806e190cb58, require rake is deferred. Therefore, it is necessary to require rake even `Engine::CommandsTasks.
* Fix broken alignments caused by auto-correct commit 411ccbdRyuta Kamizono2016-08-101-1/+2
| | | | Hash syntax auto-correcting breaks alignments. 411ccbdab2608c62aabdb320d52cb02d446bb39c
* code gardening: removes redundant selfsXavier Noria2016-08-0813-19/+19
| | | | | | | | | A few have been left for aesthetic reasons, but have made a pass and removed most of them. Note that if the method `foo` returns an array, `foo << 1` is a regular push, nothing to do with assignments, so no self required.
* revises most Lint/EndAlignment offensesXavier Noria2016-08-073-9/+10
| | | | Some case expressions remain, need to think about those ones.
* applies project convention for string literalsXavier Noria2016-08-071-1/+1
|
* Merge pull request #24260 from ↵Kasper Timm Hansen2016-08-072-5/+9
|\ | | | | | | | | y-yagi/show_error_message_when_error_raised_in_rails_runner show error message when error raised in rails runner
| * show error message when error raised in rails runneryuuji.yaginuma2016-08-032-5/+9
| |
* | Defer requiring Rake until it's needed.Kasper Timm Hansen2016-08-071-1/+8
| | | | | | | | | | | | | | | | Eagerly requiring Rake could put 100ms on to the Rails boot time. Shimmy that down to 0 by requiring Rake when no native Rails command exists and we try to run a Rake task. Or when printing all the Rake commands through `rails help`. Fixes #25029
* | Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty linesRyuta Kamizono2016-08-076-8/+0
| |
* | Merge pull request #26060 from siong1987/minor/puma-configGuillermo Iguaran2016-08-061-1/+1
|\ \ | | | | | | .to_i is unnecessary for puma threads.
| * | .to_i is unnecessary.Teng Siong Ong2016-08-041-1/+1
| |/
* | applies remaining conventions across the projectXavier Noria2016-08-0620-46/+29
| |
* | normalizes indentation and whitespace across the projectXavier Noria2016-08-0637-417/+417
| |
* | remove redundant curlies from hash argumentsXavier Noria2016-08-068-25/+23
| |
* | modernizes hash syntax in railtiesXavier Noria2016-08-068-29/+29
| |
* | applies new string literal convention to the rest of the projectXavier Noria2016-08-062-9/+9
| | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | applies new string literal convention in the gemspecsXavier Noria2016-08-061-20/+20
| | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | applies new string literal convention in railties/testXavier Noria2016-08-0695-1595/+1595
| | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | applies new string literal convention in railties/libXavier Noria2016-08-06105-628/+628
|/ | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* Show supported DBs first in `rails new --help`Akira Matsuda2016-08-031-5/+5
|
* Merge pull request #26004 from y-yagi/remove_unnecessary_require_and_extendSantiago Pastorino2016-08-011-8/+0
|\ | | | | remove unnecessary require and extend
| * remove unnecessary require and extendyuuji.yaginuma2016-07-311-8/+0
| | | | | | | | | | | | | | | | `rack/test` is require at the top of file. https://github.com/rails/rails/blob/master/railties/test/railties/engine_test.rb#L3 In addtion, `Rack::Test::Methods` is include in class, extend is unnecessary. https://github.com/rails/rails/blob/master/railties/test/railties/engine_test.rb#L9
* | Suppress warningsyui-knk2016-07-311-0/+1
|/ | | | | | | This commit suppressed `warning: instance variable @session_store not initialized`. e5a6f7ee9e951dbe0e4e9ea2c0743b4dfb135c57 introduced these warnings.
* There are some cases where @@app is not definedSantiago Pastorino2016-07-261-0/+28
|
* A generated app should not include Uglifier with `--skip-javascript` option.Ben Pickles2016-07-264-3/+18
|
* Enforce minimal web-console version for Rails 5Genadi Samokovarov2016-07-212-3/+3
| | | | | | | | | | | | | | | I dropped the version constraint in web-console with the idea it will be easier to upgrade the console between Rails releases. However, issues like #25899 started popping up. I'm reintroducing the constraint, but this time, I don't set an upper limit to the major version. This will keep the web-console in a version that always works for the current Rails version and can be easily upgraded to the last one with `bundle update`. We may need to backport this for Rails 5.0.1. Fixes #25899.
* Merge pull request #25438 from prathamesh-sonpatki/rm-session-store-initializerRafael Mendonça França2016-07-208-26/+46
|\ | | | | | | Setup default session store internally, no longer through an initializer
| * Setup default session store internally, no longer through an application ↵Prathamesh Sonpatki2016-07-178-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | initializer - By default the session store will be set to cookie store with application name as session key. - Older apps are not affected as they will have the session store initializer generated by Rails in older versions, and Rails will not overwrite the session store if it is already set or disabled. - But new apps will not have the initializer, instead the session store will be set to cookie store by default. - Based on comment by DHH here - https://github.com/rails/rails/issues/25181#issuecomment-222312764.
| * Refactor the existing session_store to use keyword args and raise early when ↵Prathamesh Sonpatki2016-07-171-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set to activerecord session store - Use keyword args as it is possible to use them now. - The error message for activerecord-session_store gem was added in 1807384. - But it was added for a code path which gets called when we try to **access** the session store, not when we **set** it. - So the test expecting the exception started failing because now the session store is set via railtie again **after** setting it first with :active_record_store in the test. - As the error is not raised while setting the store to :active_record_store, the store gets overwritten by railtie and when we access it via `session_store` while building the default middleware stack, the exception is not raised. - This commit moves the code for raising the exception to the path where we try to set the store.
| * Introduce a new method for checking whether session_store is set by user or ↵Prathamesh Sonpatki2016-07-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | by Rails - We need to ability to check whether the session store it is set or not so that we can set it ourselves in an internal initializer. - We can't rely on return value of `config.session_store` as it can return `nil` when set to `disabled` and we will accidentally override it and set to default cookie store. - So introduced new method which just tells us whether it is set or not.
* | Fix CHANGELOG grammar [ci skip]Vipul A M2016-07-161-2/+2
| |
* | CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]Prathamesh Sonpatki2016-07-171-0/+11
| | | | | | | | - Also minor weekly CHANGELOG cleanup.
* | Fix typo in mailer previews test description [ci skip]Gale Shafer2016-07-141-1/+1
| | | | | | | | | | A mailer preview test description misspelled the word configuration. This commit updates the test description to spell the word correctly.
* | Merge pull request #25795 from mechanicles/command-importanceGuillermo Iguaran2016-07-131-1/+1
|\ \ | | | | | | Give importance to rails command [ci skip]
| * | Give importance to rails command in the comment section.Santosh Wadghule2016-07-131-1/+1
| | |
* | | Merge pull request #25690 from robin850/speed-up-rdocXavier Noria2016-07-121-0/+13
|\ \ \ | | | | | | | | Speed up RDoc generation when it's already been done once
| * | | Speed up RDoc generation when it's already been done onceRobin Dupret2016-07-111-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only include files that contain changes since the last generation of the API documentation. Thus, only modified files are re-generated instead of the whole API. The `created.rid` file won't contain the whole list of files anymore if we generate several times the API but we don't really care about it, only the generation date and time is important. It is possible to fall back to the previous behavior by defining the ALL environment variable running the `rake rdoc` task.
* | | | rails -> Rails [ci skip]Santosh Wadghule2016-07-124-6/+6
| |/ / |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:10:49 +0000