aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19939 from artofhuman/remove-mocha-from-some-testsRafael Mendonça França2015-04-281-10/+13
|\ | | | | Remove use of mocha in the named base tests
| * Remove use of mocha in the named base testsSemyon Pupkov2015-04-281-10/+13
| |
* | mailer previews for `NullMail` instances. Closes #19849.Yves Senn2015-04-283-6/+39
| |
* | mailer previews, make sure labels and values line up.Yves Senn2015-04-281-0/+4
|/ | | | | | While this was true before when every `dd` had a value, this patch makes sure that everything keeps lining up even when the `dd` node is blank.
* Revert "Merge pull request #17920 from ↵Yves Senn2015-04-271-0/+28
| | | | | | | | | | | | | | | calebthompson/dont-rely-on-environment-task-for-schema-load" This reverts commit 08ff4ccbbb3fb143a02e6752efb974a4bcfcd3bb, reversing changes made to 6c9ed6dbc62450cdb87559afd15798305e069146. Caused by #17920. Closes #19545. This patch introduced regressions because initializers were no longer loaded. Specifically missing inflections result in broken restores of the database.
* Need to add config.assets.compile=true to access `.assets`Arthur Neves2015-04-261-0/+1
| | | | | | sprockets-rails will only add `Rails.application.assets` if compile is no false. See change on sprockets-rails https://github.com/rails/sprockets-rails/commit/d7c7ee19991c565eb77ee143be2d009ba4472122
* assets:cache:clean wont clean cache anymoreArthur Neves2015-04-261-11/+0
| | | | | See the behaviour change on sprockets-rails https://github.com/rails/sprockets-rails/commit/56725e5843662189c6701478f7598db306d5fb02
* Escape README in Plugin builder API documentationPrathamesh Sonpatki2015-04-261-1/+1
| | | | | - So that RDoc will not generate link for README. [ci skip]
* Revert "Fix multiple suggestion test"Arthur Neves2015-04-251-1/+1
| | | | This reverts commit 6a7cf515123889360d272e8ab4be045578dfc0fb.
* Fix multiple suggestion testArthur Neves2015-04-251-1/+1
|
* Add test for multiple suggested generator names.Josef Šimánek2015-04-251-0/+6
|
* Why do we add a top-level constant here?Akira Matsuda2015-04-251-4/+2
|
* Do not show --helper and --assets options in the controller generator helpAkira Matsuda2015-04-251-1/+2
| | | | | These options are not actually available. Thanks @soutaro for letting me aware of this.
* Merge pull request #19236 from sshaw/more_tagged_logging_docsYves Senn2015-04-241-0/+3
|\ | | | | More docs on tagged logging [ci skip]
| * Refer to the constructer argument in docsSkye Shaw2015-04-241-1/+1
| |
| * More docs on tagged logging [ci skip]sshaw2015-03-061-0/+3
| | | | | | | | | | Mention that tags can also come from a Proc that accepts the request object or something's to_s method
* | Fix CSS formatting in welcome#index.html.erbSean Collins2015-04-231-3/+10
| |
* | Require yaml before trying to rescue its exception classRafael Mendonça França2015-04-221-1/+1
| |
* | Remove sqlite support from `rails dbconsole`Andrew White2015-04-223-9/+4
| | | | | | | | | | | | Support for versions of SQLite less than 3 was removed in #6011 as part of the Rails 4.0 release. Therefore there is no need to have support for it in the `rails dbconsole` command anymore.
* | Don't ask something that we don't want toRafael Mendonça França2015-04-221-1/+1
| | | | | | | | | | | | We only want to support adapters that we officially support through the entire framework so it is better to not ask patches for adapters that we may not support
* | Merge pull request #19858 from cllns/fix-scaffolding-css-formattingRafael Mendonça França2015-04-221-7/+20
|\ \ | | | | | | Fix formatting of scaffold css
| * | Fix formatting of scaffold cssSean Collins2015-04-221-7/+20
| | |
* | | pass over CHANGELOGs. [ci skip]Yves Senn2015-04-221-8/+10
| | |
* | | Add blank lines between divs in form scaffoldingSean Collins2015-04-201-0/+2
|/ /
* | Implicitly skip spring for `rails new --dev`Godfrey Chan2015-04-202-1/+9
| | | | | | | | | | | | Spring seems like an obvious foot gun for the `--dev` setup, presumably you are about to make lots of changes to the codebase, so it should always reload the framework.
* | [ci skip] Document running a rake command as a rails commandNick Cox2015-04-151-0/+11
| |
* | Fix typos and improve the documentationJon Atack2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squash of the following commits, from first to last: - Fix minor, random things I’ve come across lately that individually did not seem worth making a PR for, so I saved them for one commit. One common error is using “it’s” (which is an abbreviation of “it is”) when the possessive “its” should be used for indicating possession. - Changes include the name of a test, so remove the `[skip ci]` (thanks @senny). - Line wrap the changes at 80 chars and add one more doc fix. - Add a missing line wrap in the Contributing to Ruby on Rails Guide. - Line wrap the `TIP` section in the Contributing to Ruby on Rails Guide as well. Rendering the guide locally with `bundle exec rake guides:generate` did not show any change in on-screen formatting after adding the line wrap. The HTML generated is (extra line added to illustrate where the line wrap takes place): <div class="info"><p>Please squash your commits into a single commit when appropriate. This simplifies future cherry picks and also keeps the git log clean.</p></div> - Squash commits.
* | Merge pull request #19751 from y-yagi/fix_indent_of_controllerAndrew White2015-04-142-4/+7
|\ \ | | | | | | fix indent in routes when using namespaced controllers
| * | fix indent in routes when using namespaced controllersyuuji.yaginuma2015-04-142-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: namespace :foo do namespace :bar do get 'baz/index' end end After: namespace :foo do namespace :bar do get 'baz/index' end end
* | | Merge pull request #19753 from jonatack/use-ruby-2-2-2Guillermo Iguaran2015-04-132-4/+4
|\ \ \ | |/ / |/| | Upgrade to Ruby 2.2.2
| * | Upgrade to Ruby 2.2.2Jon Atack2015-04-142-4/+4
| | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message.
* | | :scissors:Zachary Scott2015-04-121-2/+2
| | |
* | | Error message no longer tells you to set the (deprecated) secret_token.Dan2015-04-121-1/+1
| | |
* | | Speed up Levenshtein by 50% and reduce 97% of memory usageYuki Nishijima2015-04-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculating ------------------------------------- each_char 924.000 i/100ms each_codepoint 1.381k i/100ms ------------------------------------------------- each_char 9.320k (¡Þ 5.1%) i/s - 47.124k each_codepoint 13.857k (¡Þ 3.6%) i/s - 70.431k Comparison: each_codepoint: 13857.4 i/s each_char: 9319.5 i/s - 1.49x slower The full report can be found here: https://gist.github.com/yuki24/a80988f35aceac76f1d5
* | | Rename railties/bin to railties/exeIslam Wazery2015-04-115-4/+8
| | | | | | | | | | | | | | | | | | That will match the new Bundler executables convention. Bundler Blog Post: http://bundler.io/blog/2015/03/20/moving-bins-to-exe.html Also updated the necessary tests.
* | | bugfix CodeStatics#calculate_directory_statics when dir has source extensionPablo Vizcay2015-04-092-4/+22
| | |
* | | Avoid to define an initializer after the load_config_initializersRafael Mendonça França2015-04-071-1/+1
| | | | | | | | | | | | | | | This make the config/initializers run before the railties are loaded what can break some configurations.
* | | Merge pull request #19429 from mxhold/print_bundle_install_output_line_by_lineMatthew Draper2015-04-032-6/+13
|\ \ \ | | | | | | | | | | | | Print `bundle install` output in `rails new` as soon as it's available
| * | | Print `bundle install` output in `rails new` as soon as it's availableMax Holder2015-03-282-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, running `rails new` would not print any of the output from `bundle install` until all the gems had finished installing. This made it look like the generator was hanging at the `bundle install` step. This commit switches to using `system` so that the bundle command can output as it needs to. This has the added benefit of including output bundler produces on standard error, which the previous code ignored since backticks only capture standard out. This is not a big deal right now since bundler does not currently print errors to standard error, but that may change in the future (see: bundler/bundler/issues/3353).
* | | | remove extra newline from ApplicationJob templateyuuji.yaginuma2015-03-311-1/+0
| |/ / |/| |
* | | Merge pull request #19034 from jvanbaarsen/explicit-job-base-classMatthew Draper2015-03-304-4/+13
|\ \ \ | | | | | | | | | | | | Add explicit base class for ActiveJob jobs
| * | | Add explicit base class for ActiveJob jobsJeroen van Baarsen2015-03-234-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Jobs generated now inherent from ApplicationJob * ApplicationJob inherents from ActiveJob::Base * Added entry to changelog Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | Test using sprockets 3Rafael Mendonça França2015-03-293-11/+11
| | | |
* | | | Replace `in Rails 4` with `in Rails %version%` in deprecation messageKir Shatrov2015-03-291-1/+2
| | | |
* | | | Improve CHANGELOG for fix for respecting pluralize_table_names [ci skip]Prathamesh Sonpatki2015-03-271-1/+1
| | | |
* | | | respect `pluralize_table_names` when generate fixture file. fixes #19519yuuji.yaginuma2015-03-274-1/+21
| | | |
* | | | Fix typo in belongs_to_required_by_default config's CHANGELOG entry [ci skip]Prathamesh Sonpatki2015-03-221-1/+1
| | | |
* | | | Actually rename to `rake initializers`Godfrey Chan2015-03-211-1/+1
| |/ / |/| |
* | | Merge pull request #19441 from y-yagi/use_existArthur Nogueira Neves2015-03-211-1/+1
|\ \ \ | | | | | | | | use `Dir.exist?` instead of deprecated `Dir.exists?`
| * | | use `Dir.exist?` instead of deprecated `Dir.exists?`yuuji.yaginuma2015-03-211-1/+1
| | | |