aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Make sure that no extra spaces are created with a non-polymorphicRafael Mendonça França2012-12-101-2/+6
| | | | | | | | | | | | attributes
* | | Merge branch 'scaffold_fixes'Rafael Mendonça França2012-12-105-14/+22
|\ \ \
| * | | Add GeneratedAttribute#column_name to get the name of the column in theRafael Mendonça França2012-12-103-6/+10
| | | | | | | | | | | | | | | | database
| * | | Extract a attributes_names method to avoid duplicationRafael Mendonça França2012-12-104-22/+12
| | | |
| * | | Deal with polymorphic attributes correctly in the generatorsRafael Mendonça França2012-12-104-7/+24
| | | |
| * | | Make references and belongs_to attributes to generate the _id column inRafael Mendonça França2012-12-101-2/+2
| | | | | | | | | | | | | | | | fixtures
| * | | Put the reference and belongs_to attributes in the scaffold tests.Rafael Mendonça França2012-12-101-6/+3
| | | |
| * | | Use the references and belongs_id ids in the scaffold_controllerRafael Mendonça França2012-12-091-1/+1
| |/ / | | | | | | | | | generator
* | | Merge pull request #8472 from schneems/schneems/expand_pathRafael Mendonça França2012-12-091-1/+1
|\ \ \ | |/ / |/| | Use `File.expand_path` instead of `File.join`
| * | Use `File.expand_path` instead of `File.join`schneems2012-12-091-1/+1
| | | | | | | | | cc/ @carlosantoniodasilva
* | | Remove the spaces after the open bracket and before the close bracket.Rafael Mendonça França2012-12-091-1/+1
| | | | | | | | | | | | All our generated code follow this rule
* | | Make code statistics rake task handle new test locations properlyGeorge Claghorn2012-12-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of 2a68f68aead9fd65ecac8062ca8efc15f5bab418: - Unit tests are now in test/models, instead of test/units - Functional tests are now in test/controllers, instead of test/functional - Helper tests are now in test/helpers, instead of test/units/helpers - Mailer tests are now in test/mailers, instead of test/functional Update the rake task for code statistics (`rake stats`) so that it recognizes files in the above locations as tests, and accurately calculates statistics such as "Test LOC" and "Code to Test Ratio." Safely handle Rails apps that still have tests in the old locations.
* | | Fix method assertion ensuring it will match "end" with the same indentationCarlos Antonio da Silva2012-12-081-2/+2
| |/ |/| | | | | | | Otherwise it was matching "end" lines from blocks within the method body, making tests such as the migration ones fail.
* | Merge pull request #8461 from frodsan/fix_assert_method_generatorsCarlos Antonio da Silva2012-12-081-1/+1
|\ \ | | | | | | Fix #assert_instance_method to also assert indented methods
| * | Fix #assert_instance_method to also assert indented methodsFrancesco Rodriguez2012-12-081-1/+1
| | |
* | | use :only instead of :except callback option in the controller templateFrancesco Rodriguez2012-12-071-3/+2
|/ / | | | | | | | | | | As [Security Guide](http://edgeguides.rubyonrails.org/security.html#whitelists-versus-blacklists) says, it's better to use `before_filter only: []` instead of `except: []` so we don't forget to turn the filter off for newly added actions.
* / Let the scaffold example use the "set shared record" pattern to explain ↵David Heinemeier Hansson2012-12-071-6/+7
|/ | | | callbacks
* Revert turbolinks load order requirementNick Reed2012-12-051-3/+1
|
* Add ENV['RACK_ENV'] support to rake runner/console/server.kennyj2012-12-063-3/+3
|
* Merge pull request #8404 from freegenie/filter_redirectsAndrew White2012-12-052-1/+4
|\
| * Adding filter capability to ActionController logsFabrizio Regini2012-12-052-1/+4
| |
* | Replace comments' non-breaking spaces with spacesclaudiob2012-12-042-2/+2
|/ | | | | | | | | | Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code.
* Track the default application.css/js files for turbolinks as per version 0.6.0David Heinemeier Hansson2012-12-041-2/+2
|
* Locate `=require turbolinks` at the bottom of application.jsYasuharu Ozaki2012-12-041-1/+3
| | | | | Turbolinks should be located at the bottom of application.js to detect assets change properly.
* Fix wrong doc and message about rails profiler.kennyj2012-12-041-1/+1
|
* Merge pull request #8394 from acangiano/add_db_folder_to_annotationsRafael Mendonça França2012-12-011-1/+1
|\ | | | | Add db to the list of default annotation folders
| * Add db to the list of default annotation foldersAntonio Cangiano2012-12-011-1/+1
| |
* | Quote ~ in git config global excludes command.Matthew M. Boedicker2012-12-011-1/+1
|/ | | | | This will put ~/ in .gitconfig so it will not be hardcoded to the home directory where the command was run.
* Gemfile source url for plugins updatedAmparo Luna2012-11-291-1/+1
|
* Remove observers and sweepersRafael Mendonça França2012-11-288-47/+4
| | | | | | | | They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik]
* Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems"Rafael Mendonça França2012-11-272-2/+2
| | | | | | | | | This reverts commit 33b29e0112db62d3a8c798bb58f51c0a839d9e26, reversing changes made to ac8c729342e6b020a57d0d6887c8a8d5b39f96e0. Reason: https://github.com/rails/rails/pull/4684#commitcomment-920313
* default source in Gemfiles to :rubygems rather than hardcoding the URLAkira Matsuda2012-11-282-2/+2
| | | | | | * I guess this would be the preferrable default for Bundler * current version of Bundler converts :rubygems into 'http://rubygems.org', not https://, and that will help those who are working on a very poor network environment that doesn't allow SSL
* Initialize accessors to remove some warnings in Ruby 2.0Arun Agrawal2012-11-211-0/+2
|
* Better Error handling when parsing database.yamlGaurish Sharma2012-11-201-0/+4
| | | | | Provides a better error message incase the database.yaml has some errors.
* Merge pull request #8262 from senny/8229_correct_bundler_require_in_enginesRafael Mendonça França2012-11-191-1/+1
|\ | | | | require bundler groups to include rake-tasks in engines
| * require bundler groups to include rake-tasks in enginesYves Senn2012-11-181-1/+1
| | | | | | | | | | | | | | | | If you generate a full engine, this will include rake tasks from your gem under the `app` namespace. For example if you have a dependency on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec` Closes #8229
* | Refactor config abort message a bit for dbconsoleCarlos Antonio da Silva2012-11-182-8/+4
| | | | | | | | | | | | Remove not used variable. Remove config attr_reader causing warning. Fix indent in runner file.
* | Fix rails db command with sqlite3 databaseCarlos Antonio da Silva2012-11-181-5/+5
|/ | | | | | | | | | | | | | | | | | | | | | | | When using sqlite3 it was attempting to find the database file based on Rails.root, the problem is that Rails.root is not always present because we try to first manually load "config/database.yml" instead of loading the entire app, to make "rails db" faster. This means that when we're in the root path of the app, calling "rails db" won't allow us to use Rails.root, making the command fail for sqlite3 with the error: ./rails/commands/dbconsole.rb:62:in `start': undefined method `root' for Rails:Module (NoMethodError) The fix is to simply not pass any dir string to File.expand_path, which will make it use the current directory of the process as base, or the root path of the app, which is what we want. When we are in any other subdirectory, calling "rails db" should work just fine, because "config/database.yml" won't be found, thus "rails db" will fallback to loading the app, making Rails.root available. Closes #8257.
* Adding sqlserver.yml template to satisfy "-d sqlserver" being givenRobert Nesius2012-11-161-0/+57
| | | | invocations of "rails new".
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-171-1/+2
|\ | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * Update production.rb: Split long comment in two linesGuillermo Iguaran2012-11-121-1/+2
| |
| * Update production.rb documentation: only files in app/assets are in ↵Guillermo Iguaran2012-11-121-1/+1
| | | | | | | | config.assets.precompile
* | Add UpgradeSignatureToEncryptionCookieStoreSantiago Pastorino2012-11-161-0/+2
| | | | | | | | | | | | This allows easy upgrading from the old signed Cookie Store <= 3.2 or the deprecated one in 4.0 (the ones that doesn't use key derivation) to the new one that signs using key derivation
* | Remove config.threadsafe! from production env templateCarlos Antonio da Silva2012-11-161-3/+0
| | | | | | | | Closes #8232 [ci skip]
* | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-154-20/+49
|\ \ | | | | | | Encrypted cookies
| * | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-033-10/+10
| | |
| * | Cache generated keys per KeyGenerator instance using salt + key_sizeSantiago Pastorino2012-11-031-5/+8
| | |
| * | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-031-7/+15
| | |
| * | Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-032-8/+5
| | |
| * | Add encrypted cookie storeSantiago Pastorino2012-11-031-1/+1
| | |