aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | extract path into variablebuddhamagnet2013-04-211-1/+3
| | |
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-04-191-2/+2
|\ \ \
| * | | Unindent attributes iteration in scaffold index templateCarlos Antonio da Silva2013-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we get extra indent for the <td> elements due to the extra spaces at the beginning of the lines, like this: <tr> <td><%= author.name %></td> <td><%= link_to 'Show', author %></td> <td><%= link_to 'Edit', edit_author_path(author) %></td>
* | | | AlignmentDavid Heinemeier Hansson2013-04-181-1/+1
|/ / /
* | | Indent around the scaffold loopDavid Heinemeier Hansson2013-04-181-8/+8
| | |
* | | HTML5 breaksDavid Heinemeier Hansson2013-04-182-4/+4
| | |
* | | Better orderingDavid Heinemeier Hansson2013-04-181-3/+3
| | |
* | | Use sass-rails 4.0.0.rc1Rafael Mendonça França2013-04-181-1/+1
| | |
* | | Use latest coffee-rails releaseRafael Mendonça França2013-04-181-1/+1
| | |
* | | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."Rafael Mendonça França2013-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue
* | | Use secure source for rubygems in engine testsPrathamesh Sonpatki2013-04-181-1/+1
| | |
* | | adding a test for root path in the appAaron Patterson2013-04-171-0/+24
| | |
* | | Don't need to add activerecord-deprecated_finders on edge and devRafael Mendonça França2013-04-171-3/+1
| | | | | | | | | | | | | | | | | | | | | applications This gem will not change often to explain it be included in the application Gemfile
* | | Merge pull request #10178 from rubys/app_base_strip_heredocRafael Mendonça França2013-04-151-14/+12
|\ \ \ | |/ / |/| | Use strip_heredoc where possible
| * | Use strip_heredoc where possibleSam Ruby2013-04-111-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following up on an observation by @rafaelfranca https://github.com/rails/rails/pull/10170/files#r3753963 Reduce the number of gsub calls to the two cases where inputs are concatenated from various sources and with inconsistent indentation. Also zap extraneous spacing from the sass-rails line... presumably this is a holdover from a previous time where this aligned the version string with an adjacent line.
* | | Revert "Merge pull request #10194 from ↵Carlos Antonio da Silva2013-04-121-3/+1
| | | | | | | | | | | | | | | | | | | | | pabloh/extract_regexp_at_generators_testing_assertion" This reverts commit 81f243375b9d3cfd431c1ca904c5c1efc9a41ae8, reversing changes made to c7673b0981d961e5510c85d958c944876d543314.
* | | Merge pull request #10194 from ↵Carlos Antonio da Silva2013-04-121-1/+3
|\ \ \ | | | | | | | | | | | | | | | | pabloh/extract_regexp_at_generators_testing_assertion Extract method declaration regexp for assert_method into a constant
| * | | Extract method declaration regexp into a constantPablo Herrero2013-04-121-1/+3
| | | |
* | | | Added tests for `eager_load` config option to do not eager load for rake ↵Paul Nikitochkin2013-04-121-0/+17
| | | | | | | | | | | | | | | | tasks if `eager_load` is `true`
* | | | use unified and clean formatting in CHANGELOGS. [ci skip]Yves Senn2013-04-121-1/+1
| | | |
* | | | replaces Pathname#(dirname|realpath) with File.$1Xavier Noria2013-04-121-7/+2
| | | | | | | | | | | | | | | | Simpler, thanks to @rubys for the hint.
* | | | Merge pull request #10175 from vipulnsward/initialize_fixRafael Mendonça França2013-04-111-0/+1
|\ \ \ \ | |_|/ / |/| | | initialize instead of assert to fix warning
| * | | initialize instead of assert to fix warningVipul A M2013-04-111-0/+1
| | | |
* | | | fixes app_rails_loader_test.rb in Mac OS XXavier Noria2013-04-111-1/+12
| | | |
* | | | fixes remaining lowercase "rails"Xavier Noria2013-04-111-1/+1
|/ / /
* | | application loader refactor and test suite complete rewriteXavier Noria2013-04-112-58/+71
| | |
* | | Editorial pass over generated GemfileSam Ruby2013-04-102-7/+11
| | | | | | | | | | | | | | | | | | * When run with default options, no repeated blank lines * Every gem has a comment, perhaps a generic one, but a comment nonetheless * Most comments used to start with "Use", some with "To use" => made consistent
* | | code review of 22e5ab3Xavier Noria2013-04-101-8/+7
| | |
* | | Searching for rails executable correctlyPrathamesh Sonpatki2013-04-102-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Current logic of finding Rails executable in parent directory is not returning full path of executable if it is found in one of the parent directories * To compensate for this, we have to call exec_app_rails recursively until the executable is found or we cant do 'chdir' anymore * This solution finds the correct executable path from parent directory(s) recursively
* | | Add failing test case for #9654Andrew White2013-04-101-0/+45
| | |
* | | Explain how to upgrade bin/ for Rails 4Jeremy Kemper2013-04-091-8/+29
| | |
* | | Merge pull request #9843 from indirect/rails_binRafael Mendonça França2013-04-091-10/+20
|\ \ \ | | | | | | | | Rails 4 prints help for "rails new" when running "rails console"
| * | | fix binstub typoAndre Arko2013-03-301-1/+1
| | | |
| * | | need to delete bin, not binstub, update wordingAndre Arko2013-03-271-4/+4
| | | |
| * | | script/rails could never be from bundlerAndre Arko2013-03-271-1/+1
| | | |
| * | | rails commands even if bin/rails is a gem stubAndre Arko2013-03-201-10/+20
| | | |
* | | | Add TEST_DIRS enviroment for constrain test directories in rakefileAbd ar-Rahman Hamidi2013-04-081-2/+3
| |/ / |/| |
* | | sprockets 2.9.x doesn't work with uglifier 2.0 yet.Rafael Mendonça França2013-04-061-2/+2
| | | | | | | | | | | | | | | | | | See https://travis-ci.org/rails/rails/jobs/6110543#L1285 for the failure cc @josh
* | | remove unused variablesVipul A M2013-04-062-2/+1
| | |
* | | add integration test for shorthand rake testsAaron Patterson2013-04-051-0/+7
| | |
* | | rake test app/model/foo.rb and rake test models/foo worksAaron Patterson2013-04-052-3/+47
| | |
* | | extract test info from the command line and set up the test taskAaron Patterson2013-04-052-5/+28
| | |
* | | add a class for splitting up rake commandsAaron Patterson2013-04-052-0/+70
| | |
* | | removing `rails test`, updating docs to show how to use `rake test`Aaron Patterson2013-04-054-180/+5
| | |
* | | Update Rake tasks to call `rails test` insteadPrem Sichanugrist2013-04-051-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also, print out deprecation warning for other rake tasks except `rake test` and `rake` (default) Conflicts: railties/lib/rails/test_unit/testing.rake railties/test/application/rake_test.rb
* | | Merge branch 'master' into railstestAaron Patterson2013-04-058-16/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) Improve the changelog entry [ci skip] Fix explicit names on multiple file fields Correctly parse bigint defaults in PostgreSQL Move changelog to the top [ci skip] Fix indent and remove extra white spaces Fix scope chaining + STI failing test for #9869 Improve `belongs_to touch: true` timestamp test Sort modules in alphabetical order. Avoid an attempt to fetch old record when id was not present in touch callback Use the correct pk field from the reflected class to find the old record Refactor mail_to to not generate intermediate hashes when adding href Ensure mail_to helper does not modify the given html options hash Use inspect when writing the foreign key from the reflection Use a space after the comment sign when showing the result of commands Exclude template files for rdoc API [ci skip] template should have generic name use | to have more intent revealing code Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters" stop depending on callbacks ... Conflicts: railties/test/application/rake_test.rb
| * \ \ Merge pull request #10092 from amco/masterCarlos Antonio da Silva2013-04-041-10/+16
| |\ \ \ | | | | | | | | | | Model generator USAGE doc improvement
| | * | | Model generator USAGE doc improvedJason King2013-04-041-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added information about syntax for precision/scale of decimals * Removed incorrect information about being able to set `default` * Added more examples of usage
| * | | | Exclude template files for rdoc API [ci skip]Francesco Rodriguez2013-04-041-1/+2
| | | | |
| * | | | fix private attribute warningVipul A M2013-04-042-3/+6
| |/ / /